Index: bfd/ChangeLog

2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
	    Richard Henderson  <rth@redhat.com>
	    Corinna Vinschen  <vinschen@redhat.com>

	* Makefile.am: Add support for xstormy16.
	* archures.c: Add support for xstormy16.
	* config.bfd: Add support for xstormy16.
	* configure.in: Add support for xstormy16.
	* reloc.c: Add support for xstormy16.
	* targets.c: Add support for xstormy16.
	* cpu-xstormy16.c: New file.
	* elf32-xstormy16.c: New file.
	* Makefile.in: Regenerated.
	* bfd-in2.h: Regenerated.
	* configure: Regenerated.
	* libbfd.h: Regenerated.

Index: binutils/ChangeLog
2001-12-07  Geoffrey Keating  <geoffk@redhat.com>

	* readelf.c (guess_is_rela): Add support for stormy16.
	(dump_relocations): Likewise.
	(get_machine_name): Likewise.

Index: gas/ChangeLog
2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
	    Richard Henderson  <rth@redhat.com>

	* configure.in: Add support for xstormy16.
	* configure: Regenerated.
	* Makefile.am: Add support for xstormy16.
	* Makefile.in: Regenerated.
	* config/tc-xstormy16.c: New file.
	* config/tc-xstormy16.h: New file.

Index: gas/testsuite/ChangeLog
2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
	    matthew green  <mrg@redhat.com>

	* gas/xstormy16/allinsn.d: New file.
	* gas/xstormy16/allinsn.exp: New file.
	* gas/xstormy16/allinsn.s: New file.
	* gas/xstormy16/allinsn.sh: New file.
	* gas/xstormy16/gcc.d: New file.
	* gas/xstormy16/gcc.s: New file.
	* gas/xstormy16/gcc.sh: New file.
	* gas/xstormy16/reloc-1.d: New file.
	* gas/xstormy16/reloc-1.s: New file.
	* gas/xstormy16/reloc-2.d: New file.
	* gas/xstormy16/reloc-2.s: New file.

Index: ld/ChangeLog
2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
	    Richard Henderson  <rth@redhat.com>

	* Makefile.am: Add support for xstormy16.
	* configure.tgt: Add support for xstormy16.
	* Makefile.in: Regenerate.
	* emulparams/elf32xstormy16.sh: New file.
	* scripttempl/xstormy16.sc: New file.

Index: opcodes/ChangeLog
2001-12-07  Geoffrey Keating  <geoffk@redhat.com>

	* Makefile.am: Add support for xstormy16.
	* Makefile.in: Regenerate.
	* configure.in: Add support for xstormy16.
	* configure: Regenerate.
	* disassemble.c: Add support for xstormy16.
	* xstormy16-asm.c: New generated file.
	* xstormy16-desc.c: New generated file.
	* xstormy16-desc.h: New generated file.
	* xstormy16-dis.c: New generated file.
	* xstormy16-ibld.c: New generated file.
	* xstormy16-opc.c: New generated file.
	* xstormy16-opc.h: New generated file.

Index: include/ChangeLog
2001-12-07  Geoffrey Keating  <geoffk@redhat.com>

	* dis-asm.h (print_insn_xstormy16): Declare.

Index: include/elf/ChangeLog
2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
	    Richard Henderson  <rth@redhat.com>

	* common.h (EM_XSTORMY16): Define.
	* xstormy16.h: New file.

20 files changed, 5197 insertions, 254 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 75009c2..fc5204c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-07  Geoffrey Keating  <geoffk@redhat.com>
+	    Richard Henderson  <rth@redhat.com>
+
+	* configure.in: Add support for xstormy16.
+	* configure: Regenerated.
+	* Makefile.am: Add support for xstormy16.
+	* Makefile.in: Regenerated.
+	* config/tc-xstormy16.c: New file.
+	* config/tc-xstormy16.h: New file.
+
 2001-12-06  Richard Earnshaw (rearnsha@arm.com)
 
 	* tc-arm.c (do_arit, do_cmp, do_mov, do_ldst, do_ldstt, do_ldmstm)
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 14ead2f..3ecf6d2 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -78,6 +78,7 @@ CPU_TYPES = \
 	vax \
 	w65 \
 	v850 \
+	xstormy16 \
 	z8k
 
 # Object format types.  This is only used for dependency information.
@@ -263,6 +264,7 @@ TARGET_CPU_CFILES = \
 	config/tc-vax.c \
 	config/tc-w65.c \
 	config/tc-v850.c \
+	config/tc-xstormy16.c \
 	config/tc-z8k.c
 
 TARGET_CPU_HFILES = \
@@ -307,6 +309,7 @@ TARGET_CPU_HFILES = \
 	config/tc-vax.h \
 	config/tc-w65.h \
 	config/tc-v850.h \
+	config/tc-xstormy16.h \
 	config/tc-z8k.h
 
 # OBJ files in config
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 7a510ea..f2112cc 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -189,6 +189,7 @@ CPU_TYPES = \
 	vax \
 	w65 \
 	v850 \
+	xstormy16 \
 	z8k
 
 
@@ -380,6 +381,7 @@ TARGET_CPU_CFILES = \
 	config/tc-vax.c \
 	config/tc-w65.c \
 	config/tc-v850.c \
+	config/tc-xstormy16.c \
 	config/tc-z8k.c
 
 
@@ -425,6 +427,7 @@ TARGET_CPU_HFILES = \
 	config/tc-vax.h \
 	config/tc-w65.h \
 	config/tc-v850.h \
+	config/tc-xstormy16.h \
 	config/tc-z8k.h
 
 
@@ -2354,7 +2357,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
diff --git a/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c
new file mode 100644
index 0000000..7ef10e5
--- /dev/null
+++ b/gas/config/tc-xstormy16.c
@@ -0,0 +1,650 @@
+/* tc-xstormy16.c -- Assembler for the Sanyo XSTORMY16.
+   Copyright (C) 2000, 2001 Free Software Foundation.
+
+   This file is part of GAS, the GNU Assembler.
+
+   GAS is free software; you can redistribute 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.
+
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdio.h>
+#include "as.h"
+#include "subsegs.h"     
+#include "symcat.h"
+#include "opcodes/xstormy16-desc.h"
+#include "opcodes/xstormy16-opc.h"
+#include "cgen.h"
+
+/* Structure to hold all of the different components describing
+   an individual instruction.  */
+typedef struct
+{
+  const CGEN_INSN *	insn;
+  const CGEN_INSN *	orig_insn;
+  CGEN_FIELDS		fields;
+#if CGEN_INT_INSN_P
+  CGEN_INSN_INT         buffer [1];
+#define INSN_VALUE(buf) (*(buf))
+#else
+  unsigned char         buffer [CGEN_MAX_INSN_SIZE];
+#define INSN_VALUE(buf) (buf)
+#endif
+  char *		addr;
+  fragS *		frag;
+  int                   num_fixups;
+  fixS *                fixups [GAS_CGEN_MAX_FIXUPS];
+  int                   indices [MAX_OPERAND_INSTANCES];
+}
+xstormy16_insn;
+
+const char comment_chars[]        = ";";
+const char line_comment_chars[]   = "#";
+const char line_separator_chars[] = "|";
+const char EXP_CHARS[]            = "eE";
+const char FLT_CHARS[]            = "dD";
+
+#define O_fptr_symbol	(O_max + 1)
+
+#define XSTORMY16_SHORTOPTS ""
+const char * md_shortopts = XSTORMY16_SHORTOPTS;
+
+struct option md_longopts[] =
+{
+  {NULL, no_argument, NULL, 0}
+};
+size_t md_longopts_size = sizeof (md_longopts);
+
+int
+md_parse_option (c, arg)
+     int    c ATTRIBUTE_UNUSED;
+     char * arg ATTRIBUTE_UNUSED;
+{
+  return 0;
+}
+
+void
+md_show_usage (stream)
+  FILE * stream;
+{
+  fprintf (stream, _(" XSTORMY16 specific command line options:\n"));
+} 
+
+/* The target specific pseudo-ops which we support.  */
+const pseudo_typeS md_pseudo_table[] =
+{
+  { "word",	cons,		4 },
+  { NULL, 	NULL, 		0 }
+};
+
+
+void
+md_begin ()
+{
+  /* Initialize the `cgen' interface.  */
+  
+  /* Set the machine number and endian.  */
+  gas_cgen_cpu_desc = xstormy16_cgen_cpu_open (CGEN_CPU_OPEN_MACHS, 0,
+					  CGEN_CPU_OPEN_ENDIAN,
+					  CGEN_ENDIAN_LITTLE,
+					  CGEN_CPU_OPEN_END);
+  xstormy16_cgen_init_asm (gas_cgen_cpu_desc);
+
+  /* This is a callback from cgen to gas to parse operands.  */
+  cgen_set_parse_operand_fn (gas_cgen_cpu_desc, gas_cgen_parse_operand);
+}
+
+void
+md_assemble (str)
+     char * str;
+{
+  xstormy16_insn insn;
+  char *    errmsg;
+
+  /* Initialize GAS's cgen interface for a new instruction.  */
+  gas_cgen_init_parse ();
+
+  insn.insn = xstormy16_cgen_assemble_insn
+    (gas_cgen_cpu_desc, str, & insn.fields, insn.buffer, & errmsg);
+  
+  if (!insn.insn)
+    {
+      as_bad (errmsg);
+      return;
+    }
+
+  /* Doesn't really matter what we pass for RELAX_P here.  */
+  gas_cgen_finish_insn (insn.insn, insn.buffer,
+			CGEN_FIELDS_BITSIZE (& insn.fields), 0, NULL);
+}
+
+void 
+md_operand (e)
+     expressionS * e;
+{
+  if (*input_line_pointer != '@')
+    return;
+
+  if (strncmp (input_line_pointer+1, "fptr", 4) == 0)
+    {
+      input_line_pointer += 5;
+      SKIP_WHITESPACE ();
+      if (*input_line_pointer != '(')
+	{
+	  as_bad ("Expected '('");
+	  goto err;
+	}
+      input_line_pointer++;
+
+      expression (e);
+
+      if (*input_line_pointer != ')')
+	{
+	  as_bad ("Missing ')'");
+	  goto err;
+	}
+      input_line_pointer++;
+
+      if (e->X_op != O_symbol)
+	as_bad ("Not a symbolic expression");
+      else
+        e->X_op = O_fptr_symbol;
+    }
+
+  return;
+ err:
+  ignore_rest_of_line ();
+}
+
+/* Called while parsing data to create a fixup.
+   Create BFD_RELOC_XSTORMY16_FPTR16 relocations.  */
+
+void
+xstormy16_cons_fix_new (f, where, nbytes, exp)
+     fragS *f;
+     int where;
+     int nbytes;
+     expressionS *exp;
+{
+  bfd_reloc_code_real_type code;
+  fixS *fix;
+
+  if (exp->X_op == O_fptr_symbol)
+    {
+      if (nbytes != 2)
+	{
+	  as_bad ("unsupported fptr fixup size %d", nbytes);
+	  return;
+	}
+      exp->X_op = O_symbol;
+      code = BFD_RELOC_XSTORMY16_FPTR16;
+    }
+  else if (nbytes == 1)
+    code = BFD_RELOC_8;
+  else if (nbytes == 2)
+    code = BFD_RELOC_16;
+  else if (nbytes == 4)
+    code = BFD_RELOC_32;
+  else
+    {
+      as_bad ("unsupported fixup size %d", nbytes);
+      return;
+    }
+
+  fix = fix_new_exp (f, where, nbytes, exp, 0, code);
+}
+
+/* Called while parsing an instruction to create a fixup. 
+   Create BFD_RELOC_XSTORMY16_FPTR16 relocations.  */
+
+fixS *
+xstormy16_cgen_record_fixup_exp (frag, where, insn, length, operand, opinfo, exp)
+     fragS *              frag;
+     int                  where;
+     const CGEN_INSN *    insn;
+     int                  length;
+     const CGEN_OPERAND * operand;
+     int                  opinfo;
+     expressionS *        exp;
+{
+  fixS *fixP;
+  operatorT op = exp->X_op;
+  
+  if (op == O_fptr_symbol)
+    exp->X_op = O_symbol;
+
+  fixP = gas_cgen_record_fixup_exp (frag, where, insn, length,
+				    operand, opinfo, exp);
+
+  if (op == O_fptr_symbol)
+    {
+      if (operand->type != XSTORMY16_OPERAND_IMM16)
+	as_bad ("unsupported fptr fixup");
+      else
+	{
+	  fixP->fx_r_type = BFD_RELOC_XSTORMY16_FPTR16;
+	  fixP->fx_where += 2;
+	}
+    }
+
+  return fixP;
+}
+
+valueT
+md_section_align (segment, size)
+     segT   segment;
+     valueT size;
+{
+  int align = bfd_get_section_alignment (stdoutput, segment);
+  return ((size + (1 << align) - 1) & (-1 << align));
+}
+
+symbolS *
+md_undefined_symbol (name)
+  char * name ATTRIBUTE_UNUSED;
+{
+  return 0;
+}
+
+/* Return an initial guess of the length by which a fragment must grow to
+   hold a branch to reach its destination.
+   Also updates fr_type/fr_subtype as necessary.
+
+   Called just before doing relaxation.
+   Any symbol that is now undefined will not become defined.
+   The guess for fr_var is ACTUALLY the growth beyond fr_fix.
+   Whatever we do to grow fr_fix or fr_var contributes to our returned value.
+   Although it may not be explicit in the frag, pretend fr_var starts with a
+   0 value.  */
+
+int
+md_estimate_size_before_relax (fragP, segment)
+     fragS * fragP ATTRIBUTE_UNUSED;
+     segT    segment ATTRIBUTE_UNUSED;
+{
+  /* No assembler relaxation is defined (or necessary) for this port.  */
+  abort ();
+} 
+
+/* *fragP has been relaxed to its final size, and now needs to have
+   the bytes inside it modified to conform to the new size.
+
+   Called after relaxation is finished.
+   fragP->fr_type == rs_machine_dependent.
+   fragP->fr_subtype is the subtype of what the address relaxed to.  */
+
+void
+md_convert_frag (abfd, sec, fragP)
+  bfd *   abfd ATTRIBUTE_UNUSED;
+  segT    sec ATTRIBUTE_UNUSED;
+  fragS * fragP ATTRIBUTE_UNUSED;
+{
+  /* No assembler relaxation is defined (or necessary) for this port.  */
+  abort ();
+}
+
+/* Functions concerning relocs.  */
+
+/* The location from which a PC relative jump should be calculated,
+   given a PC relative reloc.  */
+
+long
+md_pcrel_from_section (fixP, sec)
+     fixS * fixP;
+     segT   sec;
+{
+  if (fixP->fx_addsy != (symbolS *) NULL
+      && (! S_IS_DEFINED (fixP->fx_addsy)
+	  || S_GET_SEGMENT (fixP->fx_addsy) != sec))
+    {
+      /* The symbol is undefined (or is defined but not in this section).
+	 Let the linker figure it out.  */
+      return 0;
+    }
+
+  return fixP->fx_frag->fr_address + fixP->fx_where;
+}
+
+/* Return the bfd reloc type for OPERAND of INSN at fixup FIXP.
+   Returns BFD_RELOC_NONE if no reloc type can be found.
+   *FIXP may be modified if desired.  */
+
+bfd_reloc_code_real_type
+md_cgen_lookup_reloc (insn, operand, fixP)
+     const CGEN_INSN *    insn ATTRIBUTE_UNUSED;
+     const CGEN_OPERAND * operand;
+     fixS *               fixP;
+{
+  switch (operand->type)
+    {
+    case XSTORMY16_OPERAND_IMM2:
+    case XSTORMY16_OPERAND_IMM3:
+    case XSTORMY16_OPERAND_IMM3B:
+    case XSTORMY16_OPERAND_IMM4:
+    case XSTORMY16_OPERAND_IMM12:
+    case XSTORMY16_OPERAND_HMEM8:
+      return BFD_RELOC_NONE;
+      
+    case XSTORMY16_OPERAND_IMM8:
+    case XSTORMY16_OPERAND_LMEM8:
+      return fixP->fx_pcrel ? BFD_RELOC_8_PCREL : BFD_RELOC_8;
+      
+    case XSTORMY16_OPERAND_IMM16:
+      fixP->fx_where += 2;
+      return fixP->fx_pcrel ? BFD_RELOC_16_PCREL : BFD_RELOC_16;
+
+    case XSTORMY16_OPERAND_ABS24:
+      return BFD_RELOC_XSTORMY16_24;
+
+    case XSTORMY16_OPERAND_REL8_2:
+    case XSTORMY16_OPERAND_REL8_4:
+      fixP->fx_pcrel = 1;
+      return BFD_RELOC_8_PCREL;
+
+    case XSTORMY16_OPERAND_REL12:
+      fixP->fx_where += 2;
+      /* Fall through... */
+    case XSTORMY16_OPERAND_REL12A:
+      fixP->fx_pcrel = 1;
+      return BFD_RELOC_XSTORMY16_REL_12;
+
+    default : /* avoid -Wall warning */
+      abort ();
+    }
+}
+
+/* See whether we need to force a relocation into the output file.
+   This is used to force out switch and PC relative relocations when
+   relaxing.  */
+
+int
+xstormy16_force_relocation (fix)
+     fixS * fix;
+{
+  switch (fix->fx_r_type)
+    {
+    case BFD_RELOC_XSTORMY16_FPTR16:
+    case BFD_RELOC_VTABLE_INHERIT:
+    case BFD_RELOC_VTABLE_ENTRY:
+      return 1;
+
+    default:
+      return 0;
+    }
+}
+
+/* Return true if a relocation against a symbol may be replaced with
+   a relocation against section+offset.  */
+
+boolean
+xstormy16_fix_adjustable (fixP)
+   fixS * fixP;
+{
+  if (fixP->fx_addsy == NULL)
+    return 1;
+  
+  /* Prevent all adjustments to global symbols. */
+  if (S_IS_EXTERN (fixP->fx_addsy))
+    return 0;
+  
+  if (S_IS_WEAK (fixP->fx_addsy))
+    return 0;
+  
+  return ! xstormy16_force_relocation (fixP);
+}
+
+/* This is a copy of gas_cgen_md_apply_fix3, with some enhancements to
+   do various things that would not be valid for all ports.  */
+
+void
+xstormy16_md_apply_fix3 (fixP, valueP, seg)
+     fixS *   fixP;
+     valueT * valueP;
+     segT     seg ATTRIBUTE_UNUSED;
+{
+  char *where = fixP->fx_frag->fr_literal + fixP->fx_where;
+  valueT value;
+  /* Canonical name, since used a lot.  */
+  CGEN_CPU_DESC cd = gas_cgen_cpu_desc;
+
+  /* This port has pc-relative relocs and DIFF_EXPR_OK defined, so
+     it must deal with turning a BFD_RELOC_{8,16,32,64} into a
+     BFD_RELOC_*_PCREL for the case of
+
+	.word something-.
+  */
+  if (fixP->fx_pcrel)
+    switch (fixP->fx_r_type)
+      {
+      case BFD_RELOC_8:
+	fixP->fx_r_type = BFD_RELOC_8_PCREL;
+	break;
+      case BFD_RELOC_16:
+	fixP->fx_r_type = BFD_RELOC_16_PCREL;
+	break;
+      case BFD_RELOC_32:
+	fixP->fx_r_type = BFD_RELOC_32_PCREL;
+	break;
+      case BFD_RELOC_64:
+	fixP->fx_r_type = BFD_RELOC_64_PCREL;
+	break;
+      default:
+	break;
+      }
+  
+  /* FIXME FIXME FIXME: The value we are passed in *valuep includes
+     the symbol values.  Since we are using BFD_ASSEMBLER, if we are
+     doing this relocation the code in write.c is going to call
+     bfd_install_relocation, which is also going to use the symbol
+     value.  That means that if the reloc is fully resolved we want to
+     use *valuep since bfd_install_relocation is not being used.
+     However, if the reloc is not fully resolved we do not want to use
+     *valuep, and must use fx_offset instead.  However, if the reloc
+     is PC relative, we do want to use *valuep since it includes the
+     result of md_pcrel_from.  This is confusing.  */
+
+  if (fixP->fx_addsy == (symbolS *) NULL)
+    {
+      value = *valueP;
+      fixP->fx_done = 1;
+    }
+  else if (fixP->fx_pcrel)
+    value = *valueP;
+  else
+    {
+      value = fixP->fx_offset;
+      if (fixP->fx_subsy != (symbolS *) NULL)
+	{
+	  if (S_GET_SEGMENT (fixP->fx_subsy) == absolute_section)
+	    value -= S_GET_VALUE (fixP->fx_subsy);
+	  else
+	    {
+	      /* We don't actually support subtracting a symbol.  */
+	      as_bad_where (fixP->fx_file, fixP->fx_line,
+			    _("expression too complex"));
+	    }
+	}
+    }
+
+  if ((int) fixP->fx_r_type >= (int) BFD_RELOC_UNUSED)
+    {
+      int opindex = (int) fixP->fx_r_type - (int) BFD_RELOC_UNUSED;
+      const CGEN_OPERAND *operand = cgen_operand_lookup_by_num (cd, opindex);
+      const char *errmsg;
+      bfd_reloc_code_real_type reloc_type;
+      CGEN_FIELDS *fields = alloca (CGEN_CPU_SIZEOF_FIELDS (cd));
+      const CGEN_INSN *insn = fixP->fx_cgen.insn;
+
+      /* If the reloc has been fully resolved finish the operand here.  */
+      /* FIXME: This duplicates the capabilities of code in BFD.  */
+      if (fixP->fx_done)
+	{
+	  CGEN_CPU_SET_FIELDS_BITSIZE (cd) (fields, CGEN_INSN_BITSIZE (insn));
+	  CGEN_CPU_SET_VMA_OPERAND (cd) (cd, opindex, fields, (bfd_vma) value);
+
+#if CGEN_INT_INSN_P
+	  {
+	    CGEN_INSN_INT insn_value =
+	      cgen_get_insn_value (cd, where, CGEN_INSN_BITSIZE (insn));
+
+	    /* ??? 0 is passed for `pc'.  */
+	    errmsg = CGEN_CPU_INSERT_OPERAND (cd) (cd, opindex, fields,
+						   &insn_value, (bfd_vma) 0);
+	    cgen_put_insn_value (cd, where, CGEN_INSN_BITSIZE (insn),
+				 insn_value);
+	  }
+#else
+	  /* ??? 0 is passed for `pc'.  */
+	  errmsg = CGEN_CPU_INSERT_OPERAND (cd) (cd, opindex, fields, where,
+						 (bfd_vma) 0);
+#endif
+	  if (errmsg)
+	    as_bad_where (fixP->fx_file, fixP->fx_line, "%s", errmsg);
+	}
+
+      if (fixP->fx_done)
+	return 1;
+
+      /* The operand isn't fully resolved.  Determine a BFD reloc value
+	 based on the operand information and leave it to
+	 bfd_install_relocation.  Note that this doesn't work when
+	 partial_inplace == false.  */
+
+      reloc_type = md_cgen_lookup_reloc (insn, operand, fixP);
+      if (reloc_type != BFD_RELOC_NONE)
+	{
+	  fixP->fx_r_type = reloc_type;
+	}
+      else
+	{
+	  as_bad_where (fixP->fx_file, fixP->fx_line,
+			_("unresolved expression that must be resolved"));
+	  fixP->fx_done = 1;
+	  return 1;
+	}
+    }
+  else if (fixP->fx_done)
+    {
+      /* We're finished with this fixup.  Install it because
+	 bfd_install_relocation won't be called to do it.  */
+      switch (fixP->fx_r_type)
+	{
+	case BFD_RELOC_8:
+	  md_number_to_chars (where, value, 1);
+	  break;
+	case BFD_RELOC_16:
+	  md_number_to_chars (where, value, 2);
+	  break;
+	case BFD_RELOC_32:
+	  md_number_to_chars (where, value, 4);
+	  break;
+	case BFD_RELOC_64:
+	  md_number_to_chars (where, value, 8);
+	  break;
+	default:
+	  as_bad_where (fixP->fx_file, fixP->fx_line,
+			_("internal error: can't install fix for reloc type %d (`%s')"),
+			fixP->fx_r_type, bfd_get_reloc_code_name (fixP->fx_r_type));
+	  break;
+	}
+    }
+  else
+    {
+      /* bfd_install_relocation will be called to finish things up.  */
+    }
+
+  /* This is a RELA port.  Thus, it does not need to store a
+     value if it is going to make a reloc.  What's more, when
+     assembling a line like
+     
+     .byte global-0x7f00
+     
+     we'll get a spurious error message if we try to stuff 0x7f00 into
+     the byte.  */
+  if (! fixP->fx_done)
+    *valueP = 0;
+
+  /* Tuck `value' away for use by tc_gen_reloc.
+     See the comment describing fx_addnumber in write.h.
+     This field is misnamed (or misused :-).  */
+  fixP->fx_addnumber = value;
+
+  return 1;
+}
+
+
+/* Write a value out to the object file, using the appropriate endianness.  */
+
+void
+md_number_to_chars (buf, val, n)
+     char * buf;
+     valueT val;
+     int    n;
+{
+  number_to_chars_littleendian (buf, val, n);
+}
+
+/* Turn a string in input_line_pointer into a floating point constant of type
+   type, and store the appropriate bytes in *litP.  The number of LITTLENUMS
+   emitted is stored in *sizeP .  An error message is returned, or NULL on OK.
+*/
+
+/* Equal to MAX_PRECISION in atof-ieee.c */
+#define MAX_LITTLENUMS 6
+
+char *
+md_atof (type, litP, sizeP)
+     char   type;
+     char * litP;
+     int *  sizeP;
+{
+  int              prec;
+  LITTLENUM_TYPE   words [MAX_LITTLENUMS];
+  LITTLENUM_TYPE   *wordP;
+  char *           t;
+
+  switch (type)
+    {
+    case 'f':
+    case 'F':
+      prec = 2;
+      break;
+
+    case 'd':
+    case 'D':
+      prec = 4;
+      break;
+
+   /* FIXME: Some targets allow other format chars for bigger sizes here.  */
+
+    default:
+      * sizeP = 0;
+      return _("Bad call to md_atof()");
+    }
+
+  t = atof_ieee (input_line_pointer, type, words);
+  if (t)
+    input_line_pointer = t;
+  * sizeP = prec * sizeof (LITTLENUM_TYPE);
+
+  *sizeP = prec * sizeof (LITTLENUM_TYPE);
+  /* This loops outputs the LITTLENUMs in REVERSE order; in accord with
+     the littleendianness of the processor.  */
+  for (wordP = words + prec - 1; prec--;)
+    {
+      md_number_to_chars (litP, (valueT) (*wordP--), sizeof (LITTLENUM_TYPE));
+      litP += sizeof (LITTLENUM_TYPE);
+    }
+     
+  return 0;
+}
diff --git a/gas/config/tc-xstormy16.h b/gas/config/tc-xstormy16.h
new file mode 100644
index 0000000..07ff314
--- /dev/null
+++ b/gas/config/tc-xstormy16.h
@@ -0,0 +1,69 @@
+/* tc-xstormy16.h -- Header file for tc-xstormy16.c.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+   This file is part of GAS, the GNU Assembler.
+
+   GAS is free software; you can redistribute 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.
+
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA. */
+
+#define TC_XSTORMY16
+
+#ifndef BFD_ASSEMBLER
+/* leading space so will compile with cc */
+ #error XSTORMY16 support requires BFD_ASSEMBLER
+#endif
+
+#define LISTING_HEADER "XSTORMY16 GAS "
+
+/* The target BFD architecture.  */
+#define TARGET_ARCH bfd_arch_xstormy16
+
+#define TARGET_FORMAT "elf32-xstormy16"
+
+#define TARGET_BYTES_BIG_ENDIAN 0
+
+/* call md_pcrel_from_section, not md_pcrel_from */
+long md_pcrel_from_section PARAMS ((struct fix *, segT));
+#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section (FIXP, SEC)
+
+/* Permit temporary numeric labels.  */
+#define LOCAL_LABELS_FB 1
+
+#define DIFF_EXPR_OK		/* foo-. gets turned into PC relative relocs */
+
+/* We don't need to handle .word strangely.  */
+#define WORKING_DOT_WORD
+
+#define MD_APPLY_FIX3
+#define md_apply_fix3 xstormy16_md_apply_fix3
+
+#define obj_fix_adjustable(fixP) xstormy16_fix_adjustable (fixP)
+extern boolean xstormy16_fix_adjustable PARAMS ((struct fix *));
+
+#define TC_FORCE_RELOCATION(fix) xstormy16_force_relocation (fix)
+extern int xstormy16_force_relocation PARAMS ((struct fix *));
+
+#define TC_HANDLES_FX_DONE
+
+#define tc_gen_reloc gas_cgen_tc_gen_reloc
+
+/* Call md_pcrel_from_section(), not md_pcrel_from().  */
+#define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section (FIXP, SEC)
+extern long md_pcrel_from_section PARAMS ((struct fix *, segT));
+
+#define TC_CONS_FIX_NEW xstormy16_cons_fix_new
+extern void xstormy16_cons_fix_new PARAMS ((fragS *f, int, int, expressionS *));
+
+#define md_cgen_record_fixup_exp  xstormy16_cgen_record_fixup_exp
diff --git a/gas/configure b/gas/configure
index 8391c62..0d0b8a8 100755
--- a/gas/configure
+++ b/gas/configure
@@ -55,6 +55,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -169,6 +170,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -339,6 +341,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -504,12 +511,16 @@ 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"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -548,12 +559,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:552: checking for Cygwin environment" >&5
+echo "configure:563: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 557 "configure"
+#line 568 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -564,7 +575,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -581,19 +592,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:585: checking for mingw32 environment" >&5
+echo "configure:596: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 590 "configure"
+#line 601 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -658,7 +669,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:662: checking host system type" >&5
+echo "configure:673: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -679,7 +690,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:683: checking target system type" >&5
+echo "configure:694: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -697,7 +708,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:701: checking build system type" >&5
+echo "configure:712: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -722,7 +733,7 @@ test "$host_alias" != "$target_alias" &&
 # 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:726: checking for $ac_word" >&5
+echo "configure:737: 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
@@ -752,7 +763,7 @@ 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:756: checking for $ac_word" >&5
+echo "configure:767: 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
@@ -803,7 +814,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:807: checking for $ac_word" >&5
+echo "configure:818: 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
@@ -835,7 +846,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:839: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:850: 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.
@@ -846,12 +857,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 850 "configure"
+#line 861 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -877,12 +888,12 @@ 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:881: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:892: 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:886: checking whether we are using GNU C" >&5
+echo "configure:897: 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
@@ -891,7 +902,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:906: \"$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
@@ -910,7 +921,7 @@ 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:914: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:925: 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
@@ -942,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:946: checking for POSIXized ISC" >&5
+echo "configure:957: 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
@@ -976,7 +987,7 @@ BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${
 # 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:980: checking for a BSD compatible install" >&5
+echo "configure:991: 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
@@ -1029,7 +1040,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1033: checking whether build environment is sane" >&5
+echo "configure:1044: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -1086,7 +1097,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1090: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1101: 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
@@ -1132,7 +1143,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1136: checking for working aclocal" >&5
+echo "configure:1147: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1145,7 +1156,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1149: checking for working autoconf" >&5
+echo "configure:1160: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1158,7 +1169,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1162: checking for working automake" >&5
+echo "configure:1173: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1171,7 +1182,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1175: checking for working autoheader" >&5
+echo "configure:1186: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1184,7 +1195,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1188: checking for working makeinfo" >&5
+echo "configure:1199: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1279,7 +1290,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1283: checking for ld used by GCC" >&5
+echo "configure:1294: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1309,10 +1320,10 @@ echo "configure:1283: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1313: checking for GNU ld" >&5
+echo "configure:1324: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1316: checking for non-GNU ld" >&5
+echo "configure:1327: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1347,7 +1358,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1351: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1362: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1364,7 +1375,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1368: checking for $LD option to reload object files" >&5
+echo "configure:1379: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1376,7 +1387,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1380: checking for BSD-compatible nm" >&5
+echo "configure:1391: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1414,7 +1425,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1418: checking whether ln -s works" >&5
+echo "configure:1429: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1435,7 +1446,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:1439: checking how to recognise dependant libraries" >&5
+echo "configure:1450: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1599,13 +1610,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1603: checking for object suffix" >&5
+echo "configure:1614: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -1625,7 +1636,7 @@ ac_objext=$ac_cv_objext
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1629: checking for executable suffix" >&5
+echo "configure:1640: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1635,10 +1646,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1668,7 +1679,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:1672: checking for ${ac_tool_prefix}file" >&5
+echo "configure:1683: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1730,7 +1741,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:1734: checking for file" >&5
+echo "configure:1745: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1801,7 +1812,7 @@ esac
 # 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1805: checking for $ac_word" >&5
+echo "configure:1816: 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
@@ -1833,7 +1844,7 @@ if test -n "$ac_tool_prefix"; then
   # 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:1837: checking for $ac_word" >&5
+echo "configure:1848: 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
@@ -1868,7 +1879,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1872: checking for $ac_word" >&5
+echo "configure:1883: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1900,7 +1911,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1904: checking for $ac_word" >&5
+echo "configure:1915: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1967,8 +1978,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1971 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1982 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1989,7 +2000,7 @@ case $host in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1993: checking whether the C compiler needs -belf" >&5
+echo "configure:2004: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2002,14 +2013,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2006 "configure"
+#line 2017 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2579,12 +2590,13 @@ EOF
 			    fmt=aout ;;
       vax-*-vms)            fmt=vms ;;
 
+      w65-*-*)              fmt=coff ;;
+
+      xstormy16-*-*)	    fmt=elf bfd_gas=yes ;;
 
       z8k-*-coff | z8k-*-sim)
 			    fmt=coff ;;
 
-      w65-*-*)              fmt=coff ;;
-
       *-*-aout | *-*-scout)
 			    fmt=aout ;;
       *-*-freebsd*)	    fmt=elf em=freebsd bfd_gas=yes ;;
@@ -2707,6 +2719,11 @@ EOF
 
 	fi
 	;;
+
+      xstormy16)
+	using_cgen=yes
+	;;
+
       *)
 	;;
     esac
@@ -3084,7 +3101,7 @@ EOF
 # 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:3088: checking for $ac_word" >&5
+echo "configure:3105: 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
@@ -3114,7 +3131,7 @@ 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:3118: checking for $ac_word" >&5
+echo "configure:3135: 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
@@ -3165,7 +3182,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3169: checking for $ac_word" >&5
+echo "configure:3186: 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
@@ -3197,7 +3214,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:3201: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:3218: 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.
@@ -3208,12 +3225,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 3212 "configure"
+#line 3229 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:3217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -3239,12 +3256,12 @@ 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:3243: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:3260: 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:3248: checking whether we are using GNU C" >&5
+echo "configure:3265: 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
@@ -3253,7 +3270,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:3274: \"$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
@@ -3272,7 +3289,7 @@ 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:3276: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:3293: 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
@@ -3309,7 +3326,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3313: checking for $ac_word" >&5
+echo "configure:3330: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3340,7 +3357,7 @@ done
 test -n "$YACC" || YACC="yacc"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3344: checking how to run the C preprocessor" >&5
+echo "configure:3361: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3355,13 +3372,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 3359 "configure"
+#line 3376 "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:3365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -3372,13 +3389,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 3376 "configure"
+#line 3393 "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:3382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -3389,13 +3406,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 3393 "configure"
+#line 3410 "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:3399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -3425,7 +3442,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3429: checking for $ac_word" >&5
+echo "configure:3446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3458,7 +3475,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex""
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3462: checking for $ac_word" >&5
+echo "configure:3479: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3492,7 +3509,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3496: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3513: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3500,7 +3517,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3504 "configure"
+#line 3521 "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
@@ -3511,7 +3528,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3534,7 +3551,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:3538: checking lex output file root" >&5
+echo "configure:3555: checking lex output file root" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3555,7 +3572,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:3559: checking whether yytext is a pointer" >&5
+echo "configure:3576: checking whether yytext is a pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3567,14 +3584,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 3571 "configure"
+#line 3588 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -3600,7 +3617,7 @@ ALL_LINGUAS="fr"
 # 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:3604: checking for $ac_word" >&5
+echo "configure:3621: 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
@@ -3628,12 +3645,12 @@ else
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3632: checking for ANSI C header files" >&5
+echo "configure:3649: 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 3637 "configure"
+#line 3654 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3641,7 +3658,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3658,7 +3675,7 @@ 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 3662 "configure"
+#line 3679 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3676,7 +3693,7 @@ 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 3680 "configure"
+#line 3697 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3697,7 +3714,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3701 "configure"
+#line 3718 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3708,7 +3725,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3732,12 +3749,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3736: checking for working const" >&5
+echo "configure:3753: 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 3741 "configure"
+#line 3758 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3786,7 +3803,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:3790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3807,21 +3824,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3811: checking for inline" >&5
+echo "configure:3828: 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 3818 "configure"
+#line 3835 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:3825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -3847,12 +3864,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3851: checking for off_t" >&5
+echo "configure:3868: 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 3856 "configure"
+#line 3873 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3880,12 +3897,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3884: checking for size_t" >&5
+echo "configure:3901: 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 3889 "configure"
+#line 3906 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3915,19 +3932,19 @@ 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:3919: checking for working alloca.h" >&5
+echo "configure:3936: 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 3924 "configure"
+#line 3941 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -3948,12 +3965,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:3952: checking for alloca" >&5
+echo "configure:3969: 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 3957 "configure"
+#line 3974 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -3981,7 +3998,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -4013,12 +4030,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4017: checking whether alloca needs Cray hooks" >&5
+echo "configure:4034: 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 4022 "configure"
+#line 4039 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4043,12 +4060,12 @@ 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:4047: checking for $ac_func" >&5
+echo "configure:4064: 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 4052 "configure"
+#line 4069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4071,7 +4088,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4098,7 +4115,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4102: checking stack direction for C alloca" >&5
+echo "configure:4119: 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
@@ -4106,7 +4123,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4110 "configure"
+#line 4127 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -4125,7 +4142,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -4146,21 +4163,21 @@ EOF
 
 fi
 
-for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
+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:4154: checking for $ac_hdr" >&5
+echo "configure:4171: 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 4159 "configure"
+#line 4176 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4189,12 +4206,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4193: checking for $ac_func" >&5
+echo "configure:4210: 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 4198 "configure"
+#line 4215 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4217,7 +4234,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4242,7 +4259,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:4246: checking for working mmap" >&5
+echo "configure:4263: 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
@@ -4250,7 +4267,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 4254 "configure"
+#line 4271 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -4278,24 +4295,11 @@ else
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
 /* 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
@@ -4403,7 +4407,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:4407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -4431,17 +4435,17 @@ 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:4435: checking for $ac_hdr" >&5
+echo "configure:4439: 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 4440 "configure"
+#line 4444 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4471,12 +4475,12 @@ done
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4475: checking for $ac_func" >&5
+echo "configure:4479: 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 4480 "configure"
+#line 4484 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4499,7 +4503,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4528,12 +4532,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4532: checking for $ac_func" >&5
+echo "configure:4536: 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 4537 "configure"
+#line 4541 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4556,7 +4560,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4590,19 +4594,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4594: checking for LC_MESSAGES" >&5
+echo "configure:4598: 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 4599 "configure"
+#line 4603 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -4623,7 +4627,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:4627: checking whether NLS is requested" >&5
+echo "configure:4631: 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"
@@ -4643,7 +4647,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:4647: checking whether included gettext is requested" >&5
+echo "configure:4651: 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"
@@ -4662,17 +4666,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:4666: checking for libintl.h" >&5
+echo "configure:4670: 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 4671 "configure"
+#line 4675 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4689,19 +4693,19 @@ 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:4693: checking for gettext in libc" >&5
+echo "configure:4697: 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 4698 "configure"
+#line 4702 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -4717,7 +4721,7 @@ 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:4721: checking for bindtextdomain in -lintl" >&5
+echo "configure:4725: 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
@@ -4725,7 +4729,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4729 "configure"
+#line 4733 "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
@@ -4736,7 +4740,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:4740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4752,19 +4756,19 @@ 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:4756: checking for gettext in libintl" >&5
+echo "configure:4760: 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 4761 "configure"
+#line 4765 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -4792,7 +4796,7 @@ 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:4796: checking for $ac_word" >&5
+echo "configure:4800: 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
@@ -4826,12 +4830,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4830: checking for $ac_func" >&5
+echo "configure:4834: 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 4835 "configure"
+#line 4839 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4854,7 +4858,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4881,7 +4885,7 @@ 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:4885: checking for $ac_word" >&5
+echo "configure:4889: 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
@@ -4917,7 +4921,7 @@ 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:4921: checking for $ac_word" >&5
+echo "configure:4925: 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
@@ -4949,7 +4953,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 4953 "configure"
+#line 4957 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4957,7 +4961,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -4989,7 +4993,7 @@ fi
         # 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:4993: checking for $ac_word" >&5
+echo "configure:4997: 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
@@ -5023,7 +5027,7 @@ 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:5027: checking for $ac_word" >&5
+echo "configure:5031: 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
@@ -5059,7 +5063,7 @@ 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:5063: checking for $ac_word" >&5
+echo "configure:5067: 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
@@ -5149,7 +5153,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:5153: checking for catalogs to be installed" >&5
+echo "configure:5157: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -5177,17 +5181,17 @@ echo "configure:5153: checking for catalogs to be installed" >&5
       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:5181: checking for linux/version.h" >&5
+echo "configure:5185: 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 5186 "configure"
+#line 5190 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5250,7 +5254,7 @@ fi
   
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:5254: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:5258: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -5275,7 +5279,7 @@ fi
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:5279: checking for executable suffix" >&5
+echo "configure:5283: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5285,10 +5289,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:5289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:5293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -5310,17 +5314,17 @@ for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h e
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5314: checking for $ac_hdr" >&5
+echo "configure:5318: 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 5319 "configure"
+#line 5323 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5350,7 +5354,7 @@ done
 # Put this here so that autoconf's "cross-compiling" message doesn't confuse
 # people who are not cross-compiling but are compiling cross-assemblers.
 echo $ac_n "checking whether compiling a cross-assembler""... $ac_c" 1>&6
-echo "configure:5354: checking whether compiling a cross-assembler" >&5
+echo "configure:5358: checking whether compiling a cross-assembler" >&5
 if test "${host}" = "${target}"; then
   cross_gas=no
 else
@@ -5365,19 +5369,19 @@ echo "$ac_t""$cross_gas" 1>&6
 # 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:5369: checking for working alloca.h" >&5
+echo "configure:5373: 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 5374 "configure"
+#line 5378 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -5398,12 +5402,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:5402: checking for alloca" >&5
+echo "configure:5406: 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 5407 "configure"
+#line 5411 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -5431,7 +5435,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:5435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -5463,12 +5467,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:5467: checking whether alloca needs Cray hooks" >&5
+echo "configure:5471: 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 5472 "configure"
+#line 5476 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5493,12 +5497,12 @@ 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:5497: checking for $ac_func" >&5
+echo "configure:5501: 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 5502 "configure"
+#line 5506 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5521,7 +5525,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5548,7 +5552,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5552: checking stack direction for C alloca" >&5
+echo "configure:5556: 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
@@ -5556,7 +5560,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5560 "configure"
+#line 5564 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5575,7 +5579,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:5579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -5597,21 +5601,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5601: checking for inline" >&5
+echo "configure:5605: 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 5608 "configure"
+#line 5612 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:5615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5641,12 +5645,12 @@ esac
 for ac_func in unlink remove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5645: checking for $ac_func" >&5
+echo "configure:5649: 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 5650 "configure"
+#line 5654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5669,7 +5673,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5698,12 +5702,12 @@ done
 for ac_func in sbrk
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5702: checking for $ac_func" >&5
+echo "configure:5706: 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 5707 "configure"
+#line 5711 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5726,7 +5730,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5761,7 +5765,7 @@ case $host in
   ;;
 *-ncr-sysv4.3*)
   echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6
-echo "configure:5765: checking for _mwvalidcheckl in -lmw" >&5
+echo "configure:5769: checking for _mwvalidcheckl in -lmw" >&5
 ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5769,7 +5773,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5773 "configure"
+#line 5777 "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
@@ -5780,7 +5784,7 @@ int main() {
 _mwvalidcheckl()
 ; return 0; }
 EOF
-if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5801,7 +5805,7 @@ else
 fi
 
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5805: checking for main in -lm" >&5
+echo "configure:5809: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5809,14 +5813,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5813 "configure"
+#line 5817 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5839,7 +5843,7 @@ fi
   ;;
 *)
   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:5843: checking for main in -lm" >&5
+echo "configure:5847: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5847,14 +5851,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5851 "configure"
+#line 5855 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5885,12 +5889,12 @@ esac
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
 echo $ac_n "checking for working assert macro""... $ac_c" 1>&6
-echo "configure:5889: checking for working assert macro" >&5
+echo "configure:5893: checking for working assert macro" >&5
 if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5894 "configure"
+#line 5898 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -5906,7 +5910,7 @@ assert (a == b
 
 ; return 0; }
 EOF
-if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_assert_ok=yes
 else
@@ -5947,12 +5951,12 @@ gas_test_headers="
 "
 
 echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6
-echo "configure:5951: checking whether declaration is required for strstr" >&5
+echo "configure:5955: checking whether declaration is required for strstr" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_strstr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5956 "configure"
+#line 5960 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -5963,7 +5967,7 @@ x = (f) strstr;
 
 ; return 0; }
 EOF
-if { (eval echo configure:5967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_strstr=no
 else
@@ -5984,12 +5988,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6
-echo "configure:5988: checking whether declaration is required for malloc" >&5
+echo "configure:5992: checking whether declaration is required for malloc" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5993 "configure"
+#line 5997 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6000,7 +6004,7 @@ x = (f) malloc;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_malloc=no
 else
@@ -6021,12 +6025,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6
-echo "configure:6025: checking whether declaration is required for free" >&5
+echo "configure:6029: checking whether declaration is required for free" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6030 "configure"
+#line 6034 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6037,7 +6041,7 @@ x = (f) free;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_free=no
 else
@@ -6058,12 +6062,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6
-echo "configure:6062: checking whether declaration is required for sbrk" >&5
+echo "configure:6066: checking whether declaration is required for sbrk" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_sbrk'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6067 "configure"
+#line 6071 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6074,7 +6078,7 @@ x = (f) sbrk;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_sbrk=no
 else
@@ -6095,12 +6099,12 @@ fi
 
 
 echo $ac_n "checking whether declaration is required for environ""... $ac_c" 1>&6
-echo "configure:6099: checking whether declaration is required for environ" >&5
+echo "configure:6103: checking whether declaration is required for environ" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_environ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6104 "configure"
+#line 6108 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() {
@@ -6111,7 +6115,7 @@ x = (f) environ;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_environ=no
 else
@@ -6135,12 +6139,12 @@ fi
 # for it?
 
 echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6
-echo "configure:6139: checking whether declaration is required for errno" >&5
+echo "configure:6143: checking whether declaration is required for errno" >&5
 if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6144 "configure"
+#line 6148 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
@@ -6155,7 +6159,7 @@ x = (f) errno;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gas_cv_decl_needed_errno=no
 else
diff --git a/gas/configure.in b/gas/configure.in
index c3467d7..b38f49b 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -449,12 +449,13 @@ changequote([,])dnl
 			    fmt=aout ;;
       vax-*-vms)            fmt=vms ;;
 
+      w65-*-*)              fmt=coff ;;
+
+      xstormy16-*-*)	    fmt=elf bfd_gas=yes ;;
 
       z8k-*-coff | z8k-*-sim)
 			    fmt=coff ;;
 
-      w65-*-*)              fmt=coff ;;
-
       *-*-aout | *-*-scout)
 			    fmt=aout ;;
       *-*-freebsd*)	    fmt=elf em=freebsd bfd_gas=yes ;;
@@ -570,6 +571,11 @@ changequote([,])dnl
 	  AC_DEFINE_UNQUOTED(DEFAULT_ARCH, "${arch}", [Default architecture.])
 	fi
 	;;
+
+      xstormy16)
+	using_cgen=yes
+	;;
+
       *)
 	;;
     esac
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index 3c32dde..7e161c6 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -129,6 +129,7 @@ TEXI2POD = perl $(top_srcdir)/../etc/texi2pod.pl
 POD2MAN = pod2man --center="GNU Development Tools" \
 	--release="binutils-$(VERSION)" --section=1
 
+
 man_MANS = as.1
 
 info_TEXINFOS = as.texinfo gasp.texi
@@ -277,7 +278,7 @@ uninstall-info:
 	else ii=; fi; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  test -z "$$ii" \
+	  test -z "$ii" \
 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 	done
 	@$(NORMAL_UNINSTALL)
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0ad24bc..61cee67 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,8 +1,26 @@
+<<<<<<< ChangeLog
+2001-11-26  Geoffrey Keating  <geoffk@redhat.com>
+	    matthew green  <mrg@redhat.com>
+
+	* gas/xstormy16/allinsn.d: New file.
+	* gas/xstormy16/allinsn.exp: New file.
+	* gas/xstormy16/allinsn.s: New file.
+	* gas/xstormy16/allinsn.sh: New file.
+	* gas/xstormy16/gcc.d: New file.
+	* gas/xstormy16/gcc.s: New file.
+	* gas/xstormy16/gcc.sh: New file.
+	* gas/xstormy16/reloc-1.d: New file.
+	* gas/xstormy16/reloc-1.s: New file.
+	* gas/xstormy16/reloc-2.d: New file.
+	* gas/xstormy16/reloc-2.s: New file.
+
+=======
 2001-12-08  Alan Modra  <amodra@bigpond.net.au>
 
 	* gas/all/incbin.s: Add spaces before directives.
 	* gas/all/incbin.d: Update.
 
+>>>>>>> 1.255
 Fri Dec  7 09:16:07 2001  Jeffrey A Law  (law@cygnus.com)
 
 	* gas/hppa/parse/linesepbug.s: Restore to its original form,
diff --git a/gas/testsuite/gas/xstormy16/allinsn.d b/gas/testsuite/gas/xstormy16/allinsn.d
new file mode 100644
index 0000000..e566a9a
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/allinsn.d
@@ -0,0 +1,1222 @@
+#as:
+#objdump: -dr
+#name: allinsn
+
+.*: +file format .*
+
+Disassembly of section \.text:
+
+00000000 <movlmemimm>:
+   0:	00 78 00 00 	mov\.b 0x0,#0x0
+   4:	ff 79 ff ff 	mov\.w 0xff,#0xffff
+   8:	80 79 00 80 	mov\.w 0x80,#0x8000
+   c:	7f 78 ff 7f 	mov\.b 0x7f,#0x7fff
+  10:	01 79 01 00 	mov\.w 0x1,#0x1
+  14:	51 79 a9 fc 	mov\.w 0x51,#0xfca9
+  18:	f7 79 f6 a4 	mov\.w 0xf7,#0xa4f6
+  1c:	54 78 07 41 	mov\.b 0x54,#0x4107
+
+00000020 <movhmemimm>:
+  20:	00 7a 00 00 	mov\.b 0x7f00,#0x0
+  24:	ff 7b ff ff 	mov\.w 0x7fff,#0xffff
+  28:	80 7b 00 80 	mov\.w 0x7f80,#0x8000
+  2c:	7f 7a ff 7f 	mov\.b 0x7f7f,#0x7fff
+  30:	01 7b 01 00 	mov\.w 0x7f01,#0x1
+  34:	a5 7a 98 07 	mov\.b 0x7fa5,#0x798
+  38:	ba 7b fd 2c 	mov\.w 0x7fba,#0x2cfd
+  3c:	3f 7a d4 63 	mov\.b 0x7f3f,#0x63d4
+
+00000040 <movlgrmem>:
+  40:	00 80       	mov\.b r0,0x0
+  42:	ff 8f       	mov\.w r7,0xff
+  44:	80 89       	mov\.w r4,0x80
+  46:	7f 86       	mov\.b r3,0x7f
+  48:	01 83       	mov\.w r1,0x1
+  4a:	b3 8d       	mov\.w r6,0xb3
+  4c:	b7 81       	mov\.w r0,0xb7
+  4e:	29 86       	mov\.b r3,0x29
+
+00000050 <movhgrmem>:
+  50:	00 a0       	mov\.b r0,0x7f00
+  52:	ff af       	mov\.w r7,0x7fff
+  54:	80 a9       	mov\.w r4,0x7f80
+  56:	7f a6       	mov\.b r3,0x7f7f
+  58:	01 a3       	mov\.w r1,0x7f01
+  5a:	72 a4       	mov\.b r2,0x7f72
+  5c:	d2 a5       	mov\.w r2,0x7fd2
+  5e:	b5 ab       	mov\.w r5,0x7fb5
+
+00000060 <movlmemgr>:
+  60:	00 90       	mov\.b 0x0,r0
+  62:	ff 9f       	mov\.w 0xff,r7
+  64:	80 99       	mov\.w 0x80,r4
+  66:	7f 96       	mov\.b 0x7f,r3
+  68:	01 93       	mov\.w 0x1,r1
+  6a:	89 91       	mov\.w 0x89,r0
+  6c:	1a 91       	mov\.w 0x1a,r0
+  6e:	7f 98       	mov\.b 0x7f,r4
+
+00000070 <movhmemgr>:
+  70:	00 b0       	mov\.b 0x7f00,r0
+  72:	ff bf       	mov\.w 0x7fff,r7
+  74:	80 b9       	mov\.w 0x7f80,r4
+  76:	7f b6       	mov\.b 0x7f7f,r3
+  78:	01 b3       	mov\.w 0x7f01,r1
+  7a:	62 b7       	mov\.w 0x7f62,r3
+  7c:	87 bf       	mov\.w 0x7f87,r7
+  7e:	e5 b4       	mov\.b 0x7fe5,r2
+
+00000080 <movgrgri>:
+  80:	00 70       	mov\.b r0,\(r0\)
+  82:	f7 71       	mov\.w r7,\(r15\)
+  84:	84 71       	mov\.w r4,\(r8\)
+  86:	73 70       	mov\.b r3,\(r7\)
+  88:	11 71       	mov\.w r1,\(r1\)
+  8a:	46 71       	mov\.w r6,\(r4\)
+  8c:	c0 70       	mov\.b r0,\(r12\)
+  8e:	95 71       	mov\.w r5,\(r9\)
+
+00000090 <movgrgripostinc>:
+  90:	00 60       	mov\.b r0,\(r0\+\+\)
+  92:	f7 61       	mov\.w r7,\(r15\+\+\)
+  94:	84 61       	mov\.w r4,\(r8\+\+\)
+  96:	73 60       	mov\.b r3,\(r7\+\+\)
+  98:	11 61       	mov\.w r1,\(r1\+\+\)
+  9a:	84 61       	mov\.w r4,\(r8\+\+\)
+  9c:	c3 61       	mov\.w r3,\(r12\+\+\)
+  9e:	46 60       	mov\.b r6,\(r4\+\+\)
+
+000000a0 <movgrgripredec>:
+  a0:	00 68       	mov\.b r0,\(--r0\)
+  a2:	f7 69       	mov\.w r7,\(--r15\)
+  a4:	84 69       	mov\.w r4,\(--r8\)
+  a6:	73 68       	mov\.b r3,\(--r7\)
+  a8:	11 69       	mov\.w r1,\(--r1\)
+  aa:	95 69       	mov\.w r5,\(--r9\)
+  ac:	e4 69       	mov\.w r4,\(--r14\)
+  ae:	74 68       	mov\.b r4,\(--r7\)
+
+000000b0 <movgrigr>:
+  b0:	00 72       	mov\.b \(r0\),r0
+  b2:	f7 73       	mov\.w \(r15\),r7
+  b4:	84 73       	mov\.w \(r8\),r4
+  b6:	73 72       	mov\.b \(r7\),r3
+  b8:	11 73       	mov\.w \(r1\),r1
+  ba:	43 73       	mov\.w \(r4\),r3
+  bc:	36 72       	mov\.b \(r3\),r6
+  be:	70 73       	mov\.w \(r7\),r0
+
+000000c0 <movgripostincgr>:
+  c0:	00 62       	mov\.b \(r0\+\+\),r0
+  c2:	f7 63       	mov\.w \(r15\+\+\),r7
+  c4:	84 63       	mov\.w \(r8\+\+\),r4
+  c6:	73 62       	mov\.b \(r7\+\+\),r3
+  c8:	11 63       	mov\.w \(r1\+\+\),r1
+  ca:	c5 63       	mov\.w \(r12\+\+\),r5
+  cc:	42 62       	mov\.b \(r4\+\+\),r2
+  ce:	b6 62       	mov\.b \(r11\+\+\),r6
+
+000000d0 <movgripredecgr>:
+  d0:	00 6a       	mov\.b \(--r0\),r0
+  d2:	f7 6b       	mov\.w \(--r15\),r7
+  d4:	84 6b       	mov\.w \(--r8\),r4
+  d6:	73 6a       	mov\.b \(--r7\),r3
+  d8:	11 6b       	mov\.w \(--r1\),r1
+  da:	83 6a       	mov\.b \(--r8\),r3
+  dc:	b4 6a       	mov\.b \(--r11\),r4
+  de:	16 6b       	mov\.w \(--r1\),r6
+
+000000e0 <movgrgrii>:
+  e0:	08 70 00 00 	mov\.b r0,\(r0,0\)
+  e4:	ff 71 ff 0f 	mov\.w r7,\(r15,-1\)
+  e8:	8c 71 00 08 	mov\.w r4,\(r8,-2048\)
+  ec:	7b 70 ff 07 	mov\.b r3,\(r7,2047\)
+  f0:	19 71 01 00 	mov\.w r1,\(r1,1\)
+  f4:	8e 71 3c 0e 	mov\.w r6,\(r8,-452\)
+  f8:	bc 71 3c 02 	mov\.w r4,\(r11,572\)
+  fc:	19 70 4a 09 	mov\.b r1,\(r1,-1718\)
+
+00000100 <movgrgriipostinc>:
+ 100:	08 60 00 00 	mov\.b r0,\(r0\+\+,0\)
+ 104:	ff 61 ff 0f 	mov\.w r7,\(r15\+\+,-1\)
+ 108:	8c 61 00 08 	mov\.w r4,\(r8\+\+,-2048\)
+ 10c:	7b 60 ff 07 	mov\.b r3,\(r7\+\+,2047\)
+ 110:	19 61 01 00 	mov\.w r1,\(r1\+\+,1\)
+ 114:	0e 61 c0 0f 	mov\.w r6,\(r0\+\+,-64\)
+ 118:	ff 60 24 04 	mov\.b r7,\(r15\+\+,1060\)
+ 11c:	78 60 4f 03 	mov\.b r0,\(r7\+\+,847\)
+
+00000120 <movgrgriipredec>:
+ 120:	08 68 00 00 	mov\.b r0,\(--r0,0\)
+ 124:	ff 69 ff 0f 	mov\.w r7,\(--r15,-1\)
+ 128:	8c 69 00 08 	mov\.w r4,\(--r8,-2048\)
+ 12c:	7b 68 ff 07 	mov\.b r3,\(--r7,2047\)
+ 130:	19 69 01 00 	mov\.w r1,\(--r1,1\)
+ 134:	f8 69 f4 06 	mov\.w r0,\(--r15,1780\)
+ 138:	1e 69 e2 05 	mov\.w r6,\(--r1,1506\)
+ 13c:	3f 69 0f 08 	mov\.w r7,\(--r3,-2033\)
+
+00000140 <movgriigr>:
+ 140:	08 72 00 00 	mov\.b \(r0,0\),r0
+ 144:	ff 73 ff 0f 	mov\.w \(r15,-1\),r7
+ 148:	8c 73 00 08 	mov\.w \(r8,-2048\),r4
+ 14c:	7b 72 ff 07 	mov\.b \(r7,2047\),r3
+ 150:	19 73 01 00 	mov\.w \(r1,1\),r1
+ 154:	7d 73 9c 07 	mov\.w \(r7,1948\),r5
+ 158:	3c 72 b4 0c 	mov\.b \(r3,-844\),r4
+ 15c:	f8 73 a8 06 	mov\.w \(r15,1704\),r0
+
+00000160 <movgriipostincgr>:
+ 160:	08 62 00 00 	mov\.b \(r0\+\+,0\),r0
+ 164:	ff 63 ff 0f 	mov\.w \(r15\+\+,-1\),r7
+ 168:	8c 63 00 08 	mov\.w \(r8\+\+,-2048\),r4
+ 16c:	7b 62 ff 07 	mov\.b \(r7\+\+,2047\),r3
+ 170:	19 63 01 00 	mov\.w \(r1\+\+,1\),r1
+ 174:	2f 63 50 0f 	mov\.w \(r2\+\+,-176\),r7
+ 178:	8c 63 6d 05 	mov\.w \(r8\+\+,1389\),r4
+ 17c:	38 62 2f 00 	mov\.b \(r3\+\+,47\),r0
+
+00000180 <movgriipredecgr>:
+ 180:	08 6a 00 00 	mov\.b \(--r0,0\),r0
+ 184:	ff 6b ff 0f 	mov\.w \(--r15,-1\),r7
+ 188:	8c 6b 00 08 	mov\.w \(--r8,-2048\),r4
+ 18c:	7b 6a ff 07 	mov\.b \(--r7,2047\),r3
+ 190:	19 6b 01 00 	mov\.w \(--r1,1\),r1
+ 194:	8c 6a ec 03 	mov\.b \(--r8,1004\),r4
+ 198:	ea 6b 5c 0a 	mov\.w \(--r14,-1444\),r2
+ 19c:	5c 6a 61 0c 	mov\.b \(--r5,-927\),r4
+
+000001a0 <movgrgr>:
+ 1a0:	00 46       	mov r0,r0
+ 1a2:	ff 46       	mov r15,r15
+ 1a4:	88 46       	mov r8,r8
+ 1a6:	77 46       	mov r7,r7
+ 1a8:	11 46       	mov r1,r1
+ 1aa:	e9 46       	mov r9,r14
+ 1ac:	f7 46       	mov r7,r15
+ 1ae:	fc 46       	mov r12,r15
+
+000001b0 <movimm8>:
+ 1b0:	00 47       	mov Rx,#0x0
+ 1b2:	ff 47       	mov Rx,#0xff
+ 1b4:	80 47       	mov Rx,#0x80
+ 1b6:	7f 47       	mov Rx,#0x7f
+ 1b8:	01 47       	mov Rx,#0x1
+ 1ba:	88 47       	mov Rx,#0x88
+ 1bc:	53 47       	mov Rx,#0x53
+ 1be:	68 47       	mov Rx,#0x68
+
+000001c0 <movwimm8>:
+ 1c0:	00 47       	mov Rx,#0x0
+ 1c2:	ff 47       	mov Rx,#0xff
+ 1c4:	80 47       	mov Rx,#0x80
+ 1c6:	7f 47       	mov Rx,#0x7f
+ 1c8:	01 47       	mov Rx,#0x1
+ 1ca:	5c 47       	mov Rx,#0x5c
+ 1cc:	61 47       	mov Rx,#0x61
+ 1ce:	04 47       	mov Rx,#0x4
+
+000001d0 <movgrimm8>:
+ 1d0:	00 21       	mov r0,#0x0
+ 1d2:	ff 2f       	mov r7,#0xff
+ 1d4:	80 29       	mov r4,#0x80
+ 1d6:	7f 27       	mov r3,#0x7f
+ 1d8:	01 23       	mov r1,#0x1
+ 1da:	ce 25       	mov r2,#0xce
+ 1dc:	37 29       	mov r4,#0x37
+ 1de:	03 25       	mov r2,#0x3
+
+000001e0 <movwgrimm8>:
+ 1e0:	00 21       	mov r0,#0x0
+ 1e2:	ff 2f       	mov r7,#0xff
+ 1e4:	80 29       	mov r4,#0x80
+ 1e6:	7f 27       	mov r3,#0x7f
+ 1e8:	01 23       	mov r1,#0x1
+ 1ea:	f3 29       	mov r4,#0xf3
+ 1ec:	37 27       	mov r3,#0x37
+ 1ee:	6c 25       	mov r2,#0x6c
+
+000001f0 <movgrimm16>:
+ 1f0:	00 21       	mov r0,#0x0
+ 1f2:	3f 31 ff ff 	mov r15,#0xffff
+ 1f6:	38 31 00 80 	mov r8,#0x8000
+ 1fa:	37 31 ff 7f 	mov r7,#0x7fff
+ 1fe:	01 23       	mov r1,#0x1
+ 200:	34 31 62 4e 	mov r4,#0x4e62
+ 204:	33 31 16 1c 	mov r3,#0x1c16
+ 208:	32 31 64 3e 	mov r2,#0x3e64
+
+0000020c <movwgrimm16>:
+ 20c:	00 21       	mov r0,#0x0
+ 20e:	3f 31 ff ff 	mov r15,#0xffff
+ 212:	38 31 00 80 	mov r8,#0x8000
+ 216:	37 31 ff 7f 	mov r7,#0x7fff
+ 21a:	01 23       	mov r1,#0x1
+ 21c:	36 31 08 41 	mov r6,#0x4108
+ 220:	38 31 f1 68 	mov r8,#0x68f1
+ 224:	3a 31 2a 4e 	mov r10,#0x4e2a
+
+00000228 <movlowgr>:
+ 228:	c0 30       	mov\.b r0,RxL
+ 22a:	cf 30       	mov\.b r15,RxL
+ 22c:	c8 30       	mov\.b r8,RxL
+ 22e:	c7 30       	mov\.b r7,RxL
+ 230:	c1 30       	mov\.b r1,RxL
+ 232:	cb 30       	mov\.b r11,RxL
+ 234:	c5 30       	mov\.b r5,RxL
+ 236:	c2 30       	mov\.b r2,RxL
+
+00000238 <movhighgr>:
+ 238:	d0 30       	mov\.b r0,RxH
+ 23a:	df 30       	mov\.b r15,RxH
+ 23c:	d8 30       	mov\.b r8,RxH
+ 23e:	d7 30       	mov\.b r7,RxH
+ 240:	d1 30       	mov\.b r1,RxH
+ 242:	d2 30       	mov\.b r2,RxH
+ 244:	d7 30       	mov\.b r7,RxH
+ 246:	d2 30       	mov\.b r2,RxH
+
+00000248 <movfgrgri>:
+ 248:	00 74       	movf\.b r0,\(r0\)
+ 24a:	f7 75       	movf\.w r7,\(r15\)
+ 24c:	84 75       	movf\.w r4,\(r8\)
+ 24e:	73 74       	movf\.b r3,\(r7\)
+ 250:	11 75       	movf\.w r1,\(r1\)
+ 252:	f6 74       	movf\.b r6,\(r15\)
+ 254:	a1 74       	movf\.b r1,\(r10\)
+ 256:	16 74       	movf\.b r6,\(r1\)
+
+00000258 <movfgrgripostinc>:
+ 258:	00 64       	movf\.b r0,\(r0\+\+\)
+ 25a:	f7 65       	movf\.w r7,\(r15\+\+\)
+ 25c:	84 65       	movf\.w r4,\(r8\+\+\)
+ 25e:	73 64       	movf\.b r3,\(r7\+\+\)
+ 260:	11 65       	movf\.w r1,\(r1\+\+\)
+ 262:	52 64       	movf\.b r2,\(r5\+\+\)
+ 264:	a5 65       	movf\.w r5,\(r10\+\+\)
+ 266:	57 65       	movf\.w r7,\(r5\+\+\)
+
+00000268 <movfgrgripredec>:
+ 268:	00 6c       	movf\.b r0,\(--r0\)
+ 26a:	f7 6d       	movf\.w r7,\(--r15\)
+ 26c:	84 6d       	movf\.w r4,\(--r8\)
+ 26e:	73 6c       	movf\.b r3,\(--r7\)
+ 270:	11 6d       	movf\.w r1,\(--r1\)
+ 272:	a6 6d       	movf\.w r6,\(--r10\)
+ 274:	e1 6c       	movf\.b r1,\(--r14\)
+ 276:	73 6d       	movf\.w r3,\(--r7\)
+
+00000278 <movfgrigr>:
+ 278:	00 76       	movf\.b \(r0\),r0
+ 27a:	f7 77       	movf\.w \(r15\),r7
+ 27c:	84 77       	movf\.w \(r8\),r4
+ 27e:	73 76       	movf\.b \(r7\),r3
+ 280:	11 77       	movf\.w \(r1\),r1
+ 282:	54 76       	movf\.b \(r5\),r4
+ 284:	34 76       	movf\.b \(r3\),r4
+ 286:	c3 77       	movf\.w \(r12\),r3
+
+00000288 <movfgripostincgr>:
+ 288:	00 66       	movf\.b \(r0\+\+\),r0
+ 28a:	f7 67       	movf\.w \(r15\+\+\),r7
+ 28c:	84 67       	movf\.w \(r8\+\+\),r4
+ 28e:	73 66       	movf\.b \(r7\+\+\),r3
+ 290:	11 67       	movf\.w \(r1\+\+\),r1
+ 292:	95 66       	movf\.b \(r9\+\+\),r5
+ 294:	a4 67       	movf\.w \(r10\+\+\),r4
+ 296:	91 66       	movf\.b \(r9\+\+\),r1
+
+00000298 <movfgripredecgr>:
+ 298:	00 6e       	movf\.b \(--r0\),r0
+ 29a:	f7 6f       	movf\.w \(--r15\),r7
+ 29c:	84 6f       	movf\.w \(--r8\),r4
+ 29e:	73 6e       	movf\.b \(--r7\),r3
+ 2a0:	11 6f       	movf\.w \(--r1\),r1
+ 2a2:	02 6e       	movf\.b \(--r0\),r2
+ 2a4:	b2 6f       	movf\.w \(--r11\),r2
+ 2a6:	a5 6e       	movf\.b \(--r10\),r5
+
+000002a8 <movfgrgrii>:
+ 2a8:	08 74 00 00 	movf\.b r0,\(r0,r0,0\)
+ 2ac:	ff 75 ff 7f 	movf\.w r7,\(r7,r15,-1\)
+ 2b0:	8c 75 00 48 	movf\.w r4,\(r4,r8,-2048\)
+ 2b4:	7b 74 ff 37 	movf\.b r3,\(r3,r7,2047\)
+ 2b8:	19 75 01 10 	movf\.w r1,\(r1,r1,1\)
+ 2bc:	0f 74 c1 75 	movf\.b r7,\(r7,r0,1473\)
+ 2c0:	9a 75 0e 0a 	movf\.w r2,\(r0,r9,-1522\)
+ 2c4:	1a 75 e0 51 	movf\.w r2,\(r5,r1,480\)
+
+000002c8 <movfgrgriipostinc>:
+ 2c8:	08 64 00 00 	movf\.b r0,\(r0,r0\+\+,0\)
+ 2cc:	ff 65 ff 7f 	movf\.w r7,\(r7,r15\+\+,-1\)
+ 2d0:	8c 65 00 48 	movf\.w r4,\(r4,r8\+\+,-2048\)
+ 2d4:	7b 64 ff 37 	movf\.b r3,\(r3,r7\+\+,2047\)
+ 2d8:	19 65 01 10 	movf\.w r1,\(r1,r1\+\+,1\)
+ 2dc:	29 64 76 05 	movf\.b r1,\(r0,r2\+\+,1398\)
+ 2e0:	9c 65 f6 0c 	movf\.w r4,\(r0,r9\+\+,-778\)
+ 2e4:	e9 65 1c 56 	movf\.w r1,\(r5,r14\+\+,1564\)
+
+000002e8 <movfgrgriipredec>:
+ 2e8:	08 6c 00 00 	movf\.b r0,\(r0,--r0,0\)
+ 2ec:	ff 6d ff 7f 	movf\.w r7,\(r7,--r15,-1\)
+ 2f0:	8c 6d 00 48 	movf\.w r4,\(r4,--r8,-2048\)
+ 2f4:	7b 6c ff 37 	movf\.b r3,\(r3,--r7,2047\)
+ 2f8:	19 6d 01 10 	movf\.w r1,\(r1,--r1,1\)
+ 2fc:	7e 6c fe 00 	movf\.b r6,\(r0,--r7,254\)
+ 300:	cd 6d 89 46 	movf\.w r5,\(r4,--r12,1673\)
+ 304:	a8 6c da 0f 	movf\.b r0,\(r0,--r10,-38\)
+
+00000308 <movfgriigr>:
+ 308:	08 76 00 00 	movf\.b \(r0,r0,0\),r0
+ 30c:	ff 77 ff 7f 	movf\.w \(r7,r15,-1\),r7
+ 310:	8c 77 00 48 	movf\.w \(r4,r8,-2048\),r4
+ 314:	7b 76 ff 37 	movf\.b \(r3,r7,2047\),r3
+ 318:	19 77 01 10 	movf\.w \(r1,r1,1\),r1
+ 31c:	2b 77 9c 79 	movf\.w \(r7,r2,-1636\),r3
+ 320:	c9 77 5a 66 	movf\.w \(r6,r12,1626\),r1
+ 324:	e8 76 04 36 	movf\.b \(r3,r14,1540\),r0
+
+00000328 <movfgriipostincgr>:
+ 328:	08 66 00 00 	movf\.b \(r0,r0\+\+,0\),r0
+ 32c:	ff 67 ff 7f 	movf\.w \(r7,r15\+\+,-1\),r7
+ 330:	8c 67 00 48 	movf\.w \(r4,r8\+\+,-2048\),r4
+ 334:	7b 66 ff 37 	movf\.b \(r3,r7\+\+,2047\),r3
+ 338:	19 67 01 10 	movf\.w \(r1,r1\+\+,1\),r1
+ 33c:	db 66 d2 71 	movf\.b \(r7,r13\+\+,466\),r3
+ 340:	bc 66 fa 30 	movf\.b \(r3,r11\+\+,250\),r4
+ 344:	af 66 38 2a 	movf\.b \(r2,r10\+\+,-1480\),r7
+
+00000348 <movfgriipredecgr>:
+ 348:	08 6e 00 00 	movf\.b \(r0,--r0,0\),r0
+ 34c:	ff 6f ff 7f 	movf\.w \(r7,--r15,-1\),r7
+ 350:	8c 6f 00 48 	movf\.w \(r4,--r8,-2048\),r4
+ 354:	7b 6e ff 37 	movf\.b \(r3,--r7,2047\),r3
+ 358:	19 6f 01 10 	movf\.w \(r1,--r1,1\),r1
+ 35c:	a8 6e a0 5d 	movf\.b \(r5,--r10,-608\),r0
+ 360:	bf 6e 3f 13 	movf\.b \(r1,--r11,831\),r7
+ 364:	fe 6f 0c 78 	movf\.w \(r7,--r15,-2036\),r6
+
+00000368 <maskgrgr>:
+ 368:	00 33       	mask r0,r0
+ 36a:	ff 33       	mask r15,r15
+ 36c:	88 33       	mask r8,r8
+ 36e:	77 33       	mask r7,r7
+ 370:	11 33       	mask r1,r1
+ 372:	04 33       	mask r4,r0
+ 374:	b6 33       	mask r6,r11
+ 376:	48 33       	mask r8,r4
+
+00000378 <maskgrimm16>:
+ 378:	e0 30 00 00 	mask r0,#0x0
+ 37c:	ef 30 ff ff 	mask r15,#0xffff
+ 380:	e8 30 00 80 	mask r8,#0x8000
+ 384:	e7 30 ff 7f 	mask r7,#0x7fff
+ 388:	e1 30 01 00 	mask r1,#0x1
+ 38c:	e7 30 e9 46 	mask r7,#0x46e9
+ 390:	ef 30 64 1d 	mask r15,#0x1d64
+ 394:	ee 30 2d 86 	mask r14,#0x862d
+
+00000398 <pushgr>:
+ 398:	80 00       	push r0
+ 39a:	8f 00       	push r15
+ 39c:	88 00       	push r8
+ 39e:	87 00       	push r7
+ 3a0:	81 00       	push r1
+ 3a2:	89 00       	push r9
+ 3a4:	84 00       	push r4
+ 3a6:	83 00       	push r3
+
+000003a8 <popgr>:
+ 3a8:	90 00       	pop r0
+ 3aa:	9f 00       	pop r15
+ 3ac:	98 00       	pop r8
+ 3ae:	97 00       	pop r7
+ 3b0:	91 00       	pop r1
+ 3b2:	93 00       	pop r3
+ 3b4:	92 00       	pop r2
+ 3b6:	9c 00       	pop r12
+
+000003b8 <swpn>:
+ 3b8:	90 30       	swpn r0
+ 3ba:	9f 30       	swpn r15
+ 3bc:	98 30       	swpn r8
+ 3be:	97 30       	swpn r7
+ 3c0:	91 30       	swpn r1
+ 3c2:	9f 30       	swpn r15
+ 3c4:	94 30       	swpn r4
+ 3c6:	93 30       	swpn r3
+
+000003c8 <swpb>:
+ 3c8:	80 30       	swpb r0
+ 3ca:	8f 30       	swpb r15
+ 3cc:	88 30       	swpb r8
+ 3ce:	87 30       	swpb r7
+ 3d0:	81 30       	swpb r1
+ 3d2:	82 30       	swpb r2
+ 3d4:	8c 30       	swpb r12
+ 3d6:	82 30       	swpb r2
+
+000003d8 <swpw>:
+ 3d8:	00 32       	swpw r0,r0
+ 3da:	ff 32       	swpw r15,r15
+ 3dc:	88 32       	swpw r8,r8
+ 3de:	77 32       	swpw r7,r7
+ 3e0:	11 32       	swpw r1,r1
+ 3e2:	4c 32       	swpw r12,r4
+ 3e4:	28 32       	swpw r8,r2
+ 3e6:	d5 32       	swpw r5,r13
+
+000003e8 <andgrgr>:
+ 3e8:	00 40       	and r0,r0
+ 3ea:	ff 40       	and r15,r15
+ 3ec:	88 40       	and r8,r8
+ 3ee:	77 40       	and r7,r7
+ 3f0:	11 40       	and r1,r1
+ 3f2:	22 40       	and r2,r2
+ 3f4:	5f 40       	and r15,r5
+ 3f6:	57 40       	and r7,r5
+
+000003f8 <andimm8>:
+ 3f8:	00 41       	and Rx,#0x0
+ 3fa:	ff 41       	and Rx,#0xff
+ 3fc:	80 41       	and Rx,#0x80
+ 3fe:	7f 41       	and Rx,#0x7f
+ 400:	01 41       	and Rx,#0x1
+ 402:	ce 41       	and Rx,#0xce
+ 404:	0b 41       	and Rx,#0xb
+ 406:	e8 41       	and Rx,#0xe8
+
+00000408 <andgrimm16>:
+ 408:	00 31 00 00 	and r0,#0x0
+ 40c:	0f 31 ff ff 	and r15,#0xffff
+ 410:	08 31 00 80 	and r8,#0x8000
+ 414:	07 31 ff 7f 	and r7,#0x7fff
+ 418:	01 31 01 00 	and r1,#0x1
+ 41c:	0a 31 4d 43 	and r10,#0x434d
+ 420:	0b 31 0b f0 	and r11,#0xf00b
+ 424:	05 31 4d b7 	and r5,#0xb74d
+
+00000428 <orgrgr>:
+ 428:	00 42       	or r0,r0
+ 42a:	ff 42       	or r15,r15
+ 42c:	88 42       	or r8,r8
+ 42e:	77 42       	or r7,r7
+ 430:	11 42       	or r1,r1
+ 432:	53 42       	or r3,r5
+ 434:	fe 42       	or r14,r15
+ 436:	c5 42       	or r5,r12
+
+00000438 <orimm8>:
+ 438:	00 43       	or Rx,#0x0
+ 43a:	ff 43       	or Rx,#0xff
+ 43c:	80 43       	or Rx,#0x80
+ 43e:	7f 43       	or Rx,#0x7f
+ 440:	01 43       	or Rx,#0x1
+ 442:	04 43       	or Rx,#0x4
+ 444:	26 43       	or Rx,#0x26
+ 446:	34 43       	or Rx,#0x34
+
+00000448 <orgrimm16>:
+ 448:	10 31 00 00 	or r0,#0x0
+ 44c:	1f 31 ff ff 	or r15,#0xffff
+ 450:	18 31 00 80 	or r8,#0x8000
+ 454:	17 31 ff 7f 	or r7,#0x7fff
+ 458:	11 31 01 00 	or r1,#0x1
+ 45c:	12 31 33 fc 	or r2,#0xfc33
+ 460:	12 31 db 47 	or r2,#0x47db
+ 464:	11 31 53 f6 	or r1,#0xf653
+
+00000468 <xorgrgr>:
+ 468:	00 44       	xor r0,r0
+ 46a:	ff 44       	xor r15,r15
+ 46c:	88 44       	xor r8,r8
+ 46e:	77 44       	xor r7,r7
+ 470:	11 44       	xor r1,r1
+ 472:	1e 44       	xor r14,r1
+ 474:	99 44       	xor r9,r9
+ 476:	8c 44       	xor r12,r8
+
+00000478 <xorimm8>:
+ 478:	00 45       	xor Rx,#0x0
+ 47a:	ff 45       	xor Rx,#0xff
+ 47c:	80 45       	xor Rx,#0x80
+ 47e:	7f 45       	xor Rx,#0x7f
+ 480:	01 45       	xor Rx,#0x1
+ 482:	d0 45       	xor Rx,#0xd0
+ 484:	7e 45       	xor Rx,#0x7e
+ 486:	37 45       	xor Rx,#0x37
+
+00000488 <xorgrimm16>:
+ 488:	20 31 00 00 	xor r0,#0x0
+ 48c:	2f 31 ff ff 	xor r15,#0xffff
+ 490:	28 31 00 80 	xor r8,#0x8000
+ 494:	27 31 ff 7f 	xor r7,#0x7fff
+ 498:	21 31 01 00 	xor r1,#0x1
+ 49c:	2f 31 75 dc 	xor r15,#0xdc75
+ 4a0:	23 31 85 03 	xor r3,#0x385
+ 4a4:	22 31 99 90 	xor r2,#0x9099
+
+000004a8 <notgr>:
+ 4a8:	b0 30       	not r0
+ 4aa:	bf 30       	not r15
+ 4ac:	b8 30       	not r8
+ 4ae:	b7 30       	not r7
+ 4b0:	b1 30       	not r1
+ 4b2:	b4 30       	not r4
+ 4b4:	b3 30       	not r3
+ 4b6:	b3 30       	not r3
+
+000004b8 <addgrgr>:
+ 4b8:	00 49       	add r0,r0
+ 4ba:	ff 49       	add r15,r15
+ 4bc:	88 49       	add r8,r8
+ 4be:	77 49       	add r7,r7
+ 4c0:	11 49       	add r1,r1
+ 4c2:	7c 49       	add r12,r7
+ 4c4:	a1 49       	add r1,r10
+ 4c6:	ee 49       	add r14,r14
+
+000004c8 <addgrimm4>:
+ 4c8:	00 51       	add r0,#0x0
+ 4ca:	ff 51       	add r15,#0xf
+ 4cc:	88 51       	add r8,#0x8
+ 4ce:	77 51       	add r7,#0x7
+ 4d0:	11 51       	add r1,#0x1
+ 4d2:	07 51       	add r7,#0x0
+ 4d4:	9a 51       	add r10,#0x9
+ 4d6:	87 51       	add r7,#0x8
+
+000004d8 <addimm8>:
+ 4d8:	00 59       	add Rx,#0x0
+ 4da:	ff 59       	add Rx,#0xff
+ 4dc:	80 59       	add Rx,#0x80
+ 4de:	7f 59       	add Rx,#0x7f
+ 4e0:	01 59       	add Rx,#0x1
+ 4e2:	19 59       	add Rx,#0x19
+ 4e4:	f7 59       	add Rx,#0xf7
+ 4e6:	dd 59       	add Rx,#0xdd
+
+000004e8 <addgrimm16>:
+ 4e8:	00 51       	add r0,#0x0
+ 4ea:	4f 31 ff 00 	add r15,#0xff
+ 4ee:	48 31 80 00 	add r8,#0x80
+ 4f2:	47 31 7f 00 	add r7,#0x7f
+ 4f6:	11 51       	add r1,#0x1
+ 4f8:	43 31 63 00 	add r3,#0x63
+ 4fc:	f0 51       	add r0,#0xf
+ 4fe:	47 31 d6 00 	add r7,#0xd6
+
+00000502 <adcgrgr>:
+ 502:	00 4b       	adc r0,r0
+ 504:	ff 4b       	adc r15,r15
+ 506:	88 4b       	adc r8,r8
+ 508:	77 4b       	adc r7,r7
+ 50a:	11 4b       	adc r1,r1
+ 50c:	d2 4b       	adc r2,r13
+ 50e:	ae 4b       	adc r14,r10
+ 510:	f2 4b       	adc r2,r15
+
+00000512 <adcgrimm4>:
+ 512:	00 53       	adc r0,#0x0
+ 514:	ff 53       	adc r15,#0xf
+ 516:	88 53       	adc r8,#0x8
+ 518:	77 53       	adc r7,#0x7
+ 51a:	11 53       	adc r1,#0x1
+ 51c:	1f 53       	adc r15,#0x1
+ 51e:	31 53       	adc r1,#0x3
+ 520:	b6 53       	adc r6,#0xb
+
+00000522 <adcimm8>:
+ 522:	00 5b       	adc Rx,#0x0
+ 524:	ff 5b       	adc Rx,#0xff
+ 526:	80 5b       	adc Rx,#0x80
+ 528:	7f 5b       	adc Rx,#0x7f
+ 52a:	01 5b       	adc Rx,#0x1
+ 52c:	e1 5b       	adc Rx,#0xe1
+ 52e:	4b 5b       	adc Rx,#0x4b
+ 530:	12 5b       	adc Rx,#0x12
+
+00000532 <adcgrimm16>:
+ 532:	00 53       	adc r0,#0x0
+ 534:	5f 31 ff ff 	adc r15,#0xffff
+ 538:	58 31 00 80 	adc r8,#0x8000
+ 53c:	57 31 ff 7f 	adc r7,#0x7fff
+ 540:	11 53       	adc r1,#0x1
+ 542:	5d 31 99 f6 	adc r13,#0xf699
+ 546:	53 31 f3 5c 	adc r3,#0x5cf3
+ 54a:	5b 31 5d c0 	adc r11,#0xc05d
+
+0000054e <subgrgr>:
+ 54e:	00 4d       	sub r0,r0
+ 550:	ff 4d       	sub r15,r15
+ 552:	88 4d       	sub r8,r8
+ 554:	77 4d       	sub r7,r7
+ 556:	11 4d       	sub r1,r1
+ 558:	88 4d       	sub r8,r8
+ 55a:	99 4d       	sub r9,r9
+ 55c:	f9 4d       	sub r9,r15
+
+0000055e <subgrimm4>:
+ 55e:	00 55       	sub r0,#0x0
+ 560:	ff 55       	sub r15,#0xf
+ 562:	88 55       	sub r8,#0x8
+ 564:	77 55       	sub r7,#0x7
+ 566:	11 55       	sub r1,#0x1
+ 568:	f2 55       	sub r2,#0xf
+ 56a:	9c 55       	sub r12,#0x9
+ 56c:	48 55       	sub r8,#0x4
+
+0000056e <subimm8>:
+ 56e:	00 5d       	sub Rx,#0x0
+ 570:	ff 5d       	sub Rx,#0xff
+ 572:	80 5d       	sub Rx,#0x80
+ 574:	7f 5d       	sub Rx,#0x7f
+ 576:	01 5d       	sub Rx,#0x1
+ 578:	cd 5d       	sub Rx,#0xcd
+ 57a:	99 5d       	sub Rx,#0x99
+ 57c:	d9 5d       	sub Rx,#0xd9
+
+0000057e <subgrimm16>:
+ 57e:	00 55       	sub r0,#0x0
+ 580:	6f 31 ff ff 	sub r15,#0xffff
+ 584:	68 31 00 80 	sub r8,#0x8000
+ 588:	67 31 ff 7f 	sub r7,#0x7fff
+ 58c:	11 55       	sub r1,#0x1
+ 58e:	63 31 b7 ca 	sub r3,#0xcab7
+ 592:	6b 31 41 5c 	sub r11,#0x5c41
+ 596:	6a 31 4a 1e 	sub r10,#0x1e4a
+
+0000059a <sbcgrgr>:
+ 59a:	00 4f       	sbc r0,r0
+ 59c:	ff 4f       	sbc r15,r15
+ 59e:	88 4f       	sbc r8,r8
+ 5a0:	77 4f       	sbc r7,r7
+ 5a2:	11 4f       	sbc r1,r1
+ 5a4:	2b 4f       	sbc r11,r2
+ 5a6:	19 4f       	sbc r9,r1
+ 5a8:	f4 4f       	sbc r4,r15
+
+000005aa <sbcgrimm4>:
+ 5aa:	00 57       	sbc r0,#0x0
+ 5ac:	ff 57       	sbc r15,#0xf
+ 5ae:	88 57       	sbc r8,#0x8
+ 5b0:	77 57       	sbc r7,#0x7
+ 5b2:	11 57       	sbc r1,#0x1
+ 5b4:	ba 57       	sbc r10,#0xb
+ 5b6:	ab 57       	sbc r11,#0xa
+ 5b8:	ad 57       	sbc r13,#0xa
+
+000005ba <sbcgrimm8>:
+ 5ba:	00 5f       	sbc Rx,#0x0
+ 5bc:	ff 5f       	sbc Rx,#0xff
+ 5be:	80 5f       	sbc Rx,#0x80
+ 5c0:	7f 5f       	sbc Rx,#0x7f
+ 5c2:	01 5f       	sbc Rx,#0x1
+ 5c4:	89 5f       	sbc Rx,#0x89
+ 5c6:	e0 5f       	sbc Rx,#0xe0
+ 5c8:	9c 5f       	sbc Rx,#0x9c
+
+000005ca <sbcgrimm16>:
+ 5ca:	00 57       	sbc r0,#0x0
+ 5cc:	7f 31 ff ff 	sbc r15,#0xffff
+ 5d0:	78 31 00 80 	sbc r8,#0x8000
+ 5d4:	77 31 ff 7f 	sbc r7,#0x7fff
+ 5d8:	11 57       	sbc r1,#0x1
+ 5da:	70 31 fb 7e 	sbc r0,#0x7efb
+ 5de:	77 31 a2 21 	sbc r7,#0x21a2
+ 5e2:	7e 31 95 4f 	sbc r14,#0x4f95
+
+000005e6 <incgr>:
+ 5e6:	00 30       	inc r0
+ 5e8:	0f 30       	inc r15
+ 5ea:	08 30       	inc r8
+ 5ec:	07 30       	inc r7
+ 5ee:	01 30       	inc r1
+ 5f0:	0d 30       	inc r13
+ 5f2:	01 30       	inc r1
+ 5f4:	0b 30       	inc r11
+
+000005f6 <incgrimm2>:
+ 5f6:	00 30       	inc r0
+ 5f8:	3f 30       	inc r15,#0x3
+ 5fa:	28 30       	inc r8,#0x2
+ 5fc:	17 30       	inc r7,#0x1
+ 5fe:	11 30       	inc r1,#0x1
+ 600:	1e 30       	inc r14,#0x1
+ 602:	05 30       	inc r5
+ 604:	3c 30       	inc r12,#0x3
+
+00000606 <decgr>:
+ 606:	40 30       	dec r0
+ 608:	4f 30       	dec r15
+ 60a:	48 30       	dec r8
+ 60c:	47 30       	dec r7
+ 60e:	41 30       	dec r1
+ 610:	4c 30       	dec r12
+ 612:	48 30       	dec r8
+ 614:	4a 30       	dec r10
+
+00000616 <decgrimm2>:
+ 616:	40 30       	dec r0
+ 618:	7f 30       	dec r15,#0x3
+ 61a:	68 30       	dec r8,#0x2
+ 61c:	57 30       	dec r7,#0x1
+ 61e:	51 30       	dec r1,#0x1
+ 620:	45 30       	dec r5
+ 622:	4d 30       	dec r13
+ 624:	6d 30       	dec r13,#0x2
+
+00000626 <rrcgrgr>:
+ 626:	00 38       	rrc r0,r0
+ 628:	ff 38       	rrc r15,r15
+ 62a:	88 38       	rrc r8,r8
+ 62c:	77 38       	rrc r7,r7
+ 62e:	11 38       	rrc r1,r1
+ 630:	48 38       	rrc r8,r4
+ 632:	ea 38       	rrc r10,r14
+ 634:	9f 38       	rrc r15,r9
+
+00000636 <rrcgrimm4>:
+ 636:	00 39       	rrc r0,#0x0
+ 638:	ff 39       	rrc r15,#0xf
+ 63a:	88 39       	rrc r8,#0x8
+ 63c:	77 39       	rrc r7,#0x7
+ 63e:	11 39       	rrc r1,#0x1
+ 640:	3b 39       	rrc r11,#0x3
+ 642:	ce 39       	rrc r14,#0xc
+ 644:	f2 39       	rrc r2,#0xf
+
+00000646 <rlcgrgr>:
+ 646:	00 3a       	rlc r0,r0
+ 648:	ff 3a       	rlc r15,r15
+ 64a:	88 3a       	rlc r8,r8
+ 64c:	77 3a       	rlc r7,r7
+ 64e:	11 3a       	rlc r1,r1
+ 650:	3f 3a       	rlc r15,r3
+ 652:	7f 3a       	rlc r15,r7
+ 654:	af 3a       	rlc r15,r10
+
+00000656 <rlcgrimm4>:
+ 656:	00 3b       	rlc r0,#0x0
+ 658:	ff 3b       	rlc r15,#0xf
+ 65a:	88 3b       	rlc r8,#0x8
+ 65c:	77 3b       	rlc r7,#0x7
+ 65e:	11 3b       	rlc r1,#0x1
+ 660:	28 3b       	rlc r8,#0x2
+ 662:	62 3b       	rlc r2,#0x6
+ 664:	a6 3b       	rlc r6,#0xa
+
+00000666 <shrgrgr>:
+ 666:	00 3c       	shr r0,r0
+ 668:	ff 3c       	shr r15,r15
+ 66a:	88 3c       	shr r8,r8
+ 66c:	77 3c       	shr r7,r7
+ 66e:	11 3c       	shr r1,r1
+ 670:	2d 3c       	shr r13,r2
+ 672:	87 3c       	shr r7,r8
+ 674:	86 3c       	shr r6,r8
+
+00000676 <shrgrimm>:
+ 676:	00 3d       	shr r0,#0x0
+ 678:	ff 3d       	shr r15,#0xf
+ 67a:	88 3d       	shr r8,#0x8
+ 67c:	77 3d       	shr r7,#0x7
+ 67e:	11 3d       	shr r1,#0x1
+ 680:	d9 3d       	shr r9,#0xd
+ 682:	72 3d       	shr r2,#0x7
+ 684:	88 3d       	shr r8,#0x8
+
+00000686 <shlgrgr>:
+ 686:	00 3e       	shl r0,r0
+ 688:	ff 3e       	shl r15,r15
+ 68a:	88 3e       	shl r8,r8
+ 68c:	77 3e       	shl r7,r7
+ 68e:	11 3e       	shl r1,r1
+ 690:	32 3e       	shl r2,r3
+ 692:	30 3e       	shl r0,r3
+ 694:	12 3e       	shl r2,r1
+
+00000696 <shlgrimm>:
+ 696:	00 3f       	shl r0,#0x0
+ 698:	ff 3f       	shl r15,#0xf
+ 69a:	88 3f       	shl r8,#0x8
+ 69c:	77 3f       	shl r7,#0x7
+ 69e:	11 3f       	shl r1,#0x1
+ 6a0:	d6 3f       	shl r6,#0xd
+ 6a2:	63 3f       	shl r3,#0x6
+ 6a4:	ff 3f       	shl r15,#0xf
+
+000006a6 <asrgrgr>:
+ 6a6:	00 36       	asr r0,r0
+ 6a8:	ff 36       	asr r15,r15
+ 6aa:	88 36       	asr r8,r8
+ 6ac:	77 36       	asr r7,r7
+ 6ae:	11 36       	asr r1,r1
+ 6b0:	a5 36       	asr r5,r10
+ 6b2:	53 36       	asr r3,r5
+ 6b4:	b6 36       	asr r6,r11
+
+000006b6 <asrgrimm>:
+ 6b6:	00 37       	asr r0,#0x0
+ 6b8:	ff 37       	asr r15,#0xf
+ 6ba:	88 37       	asr r8,#0x8
+ 6bc:	77 37       	asr r7,#0x7
+ 6be:	11 37       	asr r1,#0x1
+ 6c0:	4d 37       	asr r13,#0x4
+ 6c2:	d0 37       	asr r0,#0xd
+ 6c4:	36 37       	asr r6,#0x3
+
+000006c6 <set1grimm>:
+ 6c6:	00 09       	set1 r0,#0x0
+ 6c8:	ff 09       	set1 r15,#0xf
+ 6ca:	88 09       	set1 r8,#0x8
+ 6cc:	77 09       	set1 r7,#0x7
+ 6ce:	11 09       	set1 r1,#0x1
+ 6d0:	a6 09       	set1 r6,#0xa
+ 6d2:	1d 09       	set1 r13,#0x1
+ 6d4:	fd 09       	set1 r13,#0xf
+
+000006d6 <set1grgr>:
+ 6d6:	00 0b       	set1 r0,r0
+ 6d8:	ff 0b       	set1 r15,r15
+ 6da:	88 0b       	set1 r8,r8
+ 6dc:	77 0b       	set1 r7,r7
+ 6de:	11 0b       	set1 r1,r1
+ 6e0:	06 0b       	set1 r6,r0
+ 6e2:	76 0b       	set1 r6,r7
+ 6e4:	2e 0b       	set1 r14,r2
+
+000006e6 <set1lmemimm>:
+ 6e6:	00 e1       	set1 0x0,#0x0
+ 6e8:	ff ef       	set1 0xff,#0x7
+ 6ea:	80 e9       	set1 0x80,#0x4
+ 6ec:	7f e7       	set1 0x7f,#0x3
+ 6ee:	01 e3       	set1 0x1,#0x1
+ 6f0:	f4 e7       	set1 0xf4,#0x3
+ 6f2:	37 ef       	set1 0x37,#0x7
+ 6f4:	fc eb       	set1 0xfc,#0x5
+
+000006f6 <set1hmemimm>:
+ 6f6:	00 f1       	set1 0x7f00,#0x0
+ 6f8:	ff ff       	set1 0x7fff,#0x7
+ 6fa:	80 f9       	set1 0x7f80,#0x4
+ 6fc:	7f f7       	set1 0x7f7f,#0x3
+ 6fe:	01 f3       	set1 0x7f01,#0x1
+ 700:	0a f7       	set1 0x7f0a,#0x3
+ 702:	63 f9       	set1 0x7f63,#0x4
+ 704:	94 f7       	set1 0x7f94,#0x3
+
+00000706 <clr1grimm>:
+ 706:	00 08       	clr1 r0,#0x0
+ 708:	ff 08       	clr1 r15,#0xf
+ 70a:	88 08       	clr1 r8,#0x8
+ 70c:	77 08       	clr1 r7,#0x7
+ 70e:	11 08       	clr1 r1,#0x1
+ 710:	0c 08       	clr1 r12,#0x0
+ 712:	b8 08       	clr1 r8,#0xb
+ 714:	77 08       	clr1 r7,#0x7
+
+00000716 <clr1grgr>:
+ 716:	00 0a       	clr1 r0,r0
+ 718:	ff 0a       	clr1 r15,r15
+ 71a:	88 0a       	clr1 r8,r8
+ 71c:	77 0a       	clr1 r7,r7
+ 71e:	11 0a       	clr1 r1,r1
+ 720:	33 0a       	clr1 r3,r3
+ 722:	10 0a       	clr1 r0,r1
+ 724:	0f 0a       	clr1 r15,r0
+
+00000726 <clr1lmemimm>:
+ 726:	00 e0       	clr1 0x0,#0x0
+ 728:	ff ee       	clr1 0xff,#0x7
+ 72a:	80 e8       	clr1 0x80,#0x4
+ 72c:	7f e6       	clr1 0x7f,#0x3
+ 72e:	01 e2       	clr1 0x1,#0x1
+ 730:	72 ee       	clr1 0x72,#0x7
+ 732:	e5 e8       	clr1 0xe5,#0x4
+ 734:	56 e2       	clr1 0x56,#0x1
+
+00000736 <clr1hmemimm>:
+ 736:	00 f0       	clr1 0x7f00,#0x0
+ 738:	ff fe       	clr1 0x7fff,#0x7
+ 73a:	80 f8       	clr1 0x7f80,#0x4
+ 73c:	7f f6       	clr1 0x7f7f,#0x3
+ 73e:	01 f2       	clr1 0x7f01,#0x1
+ 740:	2c f6       	clr1 0x7f2c,#0x3
+ 742:	d4 fa       	clr1 0x7fd4,#0x5
+ 744:	43 fe       	clr1 0x7f43,#0x7
+
+00000746 <cbwgr>:
+ 746:	a0 30       	cbw r0
+ 748:	af 30       	cbw r15
+ 74a:	a8 30       	cbw r8
+ 74c:	a7 30       	cbw r7
+ 74e:	a1 30       	cbw r1
+ 750:	a8 30       	cbw r8
+ 752:	ab 30       	cbw r11
+ 754:	a3 30       	cbw r3
+
+00000756 <revgr>:
+ 756:	f0 30       	rev r0
+ 758:	ff 30       	rev r15
+ 75a:	f8 30       	rev r8
+ 75c:	f7 30       	rev r7
+ 75e:	f1 30       	rev r1
+ 760:	f1 30       	rev r1
+ 762:	f1 30       	rev r1
+ 764:	fe 30       	rev r14
+
+00000766 <bgr>:
+ 766:	20 00       	br r0
+ 768:	2f 00       	br r15
+ 76a:	28 00       	br r8
+ 76c:	27 00       	br r7
+ 76e:	21 00       	br r1
+ 770:	20 00       	br r0
+ 772:	2f 00       	br r15
+ 774:	2c 00       	br r12
+
+00000776 <jmp>:
+ 776:	40 00       	jmp r8,r0
+ 778:	5f 00       	jmp r9,r15
+ 77a:	58 00       	jmp r9,r8
+ 77c:	47 00       	jmp r8,r7
+ 77e:	51 00       	jmp r9,r1
+ 780:	57 00       	jmp r9,r7
+ 782:	55 00       	jmp r9,r5
+ 784:	4c 00       	jmp r8,r12
+
+00000786 <jmpf>:
+ 786:	00 02 00 00 	jmpf 0x0
+ 78a:	ff 02 ff ff 	jmpf 0xffffff
+ 78e:	00 02 00 80 	jmpf 0x800000
+ 792:	ff 02 ff 7f 	jmpf 0x7fffff
+ 796:	01 02 00 00 	jmpf 0x1
+ 79a:	6d 02 c0 a3 	jmpf 0xa3c06d
+ 79e:	52 02 54 e6 	jmpf 0xe65452
+ 7a2:	d8 02 56 16 	jmpf 0x1656d8
+
+000007a6 <callrgr>:
+ 7a6:	10 00       	callr r0
+ 7a8:	1f 00       	callr r15
+ 7aa:	18 00       	callr r8
+ 7ac:	17 00       	callr r7
+ 7ae:	11 00       	callr r1
+ 7b0:	11 00       	callr r1
+ 7b2:	1c 00       	callr r12
+ 7b4:	18 00       	callr r8
+
+000007b6 <callgr>:
+ 7b6:	a0 00       	call r8,r0
+ 7b8:	bf 00       	call r9,r15
+ 7ba:	b8 00       	call r9,r8
+ 7bc:	a7 00       	call r8,r7
+ 7be:	b1 00       	call r9,r1
+ 7c0:	b6 00       	call r9,r6
+ 7c2:	be 00       	call r9,r14
+ 7c4:	ac 00       	call r8,r12
+
+000007c6 <callfimm>:
+ 7c6:	00 01 00 00 	callf 0x0
+ 7ca:	ff 01 ff ff 	callf 0xffffff
+ 7ce:	00 01 00 80 	callf 0x800000
+ 7d2:	ff 01 ff 7f 	callf 0x7fffff
+ 7d6:	01 01 00 00 	callf 0x1
+ 7da:	56 01 b2 ce 	callf 0xceb256
+ 7de:	df 01 5f a5 	callf 0xa55fdf
+ 7e2:	b3 01 e6 e7 	callf 0xe7e6b3
+
+000007e6 <icallrgr>:
+ 7e6:	30 00       	icallr r0
+ 7e8:	3f 00       	icallr r15
+ 7ea:	38 00       	icallr r8
+ 7ec:	37 00       	icallr r7
+ 7ee:	31 00       	icallr r1
+ 7f0:	3f 00       	icallr r15
+ 7f2:	3c 00       	icallr r12
+ 7f4:	39 00       	icallr r9
+
+000007f6 <icallgr>:
+ 7f6:	60 00       	icall r8,r0
+ 7f8:	7f 00       	icall r9,r15
+ 7fa:	78 00       	icall r9,r8
+ 7fc:	67 00       	icall r8,r7
+ 7fe:	71 00       	icall r9,r1
+ 800:	7a 00       	icall r9,r10
+ 802:	6f 00       	icall r8,r15
+ 804:	6a 00       	icall r8,r10
+
+00000806 <icallfimm>:
+ 806:	00 03 00 00 	icallf 0x0
+ 80a:	ff 03 ff ff 	icallf 0xffffff
+ 80e:	00 03 00 80 	icallf 0x800000
+ 812:	ff 03 ff 7f 	icallf 0x7fffff
+ 816:	01 03 00 00 	icallf 0x1
+ 81a:	22 03 3f 93 	icallf 0x933f22
+ 81e:	6e 03 35 1e 	icallf 0x1e356e
+ 822:	48 03 e8 74 	icallf 0x74e848
+
+00000826 <iret>:
+ 826:	02 00       	iret
+
+00000828 <ret>:
+ 828:	03 00       	ret
+
+0000082a <mul>:
+ 82a:	d0 00       	mul
+
+0000082c <div>:
+ 82c:	c0 00       	div
+
+0000082e <nop>:
+ 82e:	00 00       	nop
+ 830:	03 00       	ret
+
+00000832 <halt>:
+ 832:	08 00       	halt
+
+00000834 <hold>:
+ 834:	0a 00       	hold
+
+00000836 <brk>:
+ 836:	05 00       	brk
+
+00000838 <bccgrgr>:
+ 838:	00 0d 00 00 	bge r0,r0,0x83c
+ 83c:	ff 0d ff ff 	bz r15,r15,0x83f
+ 840:	88 0d 00 88 	bpl r8,r8,0x44
+ 844:	77 0d ff 77 	bls r7,r7,0x1047
+ 848:	11 0d 01 10 	bnc r1,r1,0x84d
+ 84c:	d3 0d 07 37 	bc r3,r13,0xf57
+ 850:	a1 0d 1d 08 	bge r1,r10,0x71
+ 854:	50 0d 94 fb 	bz r0,r5,0x3ec
+
+00000858 <bccgrimm8>:
+ 858:	00 20 00 00 	bge r0,#0x0,0x85c
+ 85c:	ff 2e ff ff 	bz r7,#0xff,0x85f
+ 860:	80 28 00 88 	bpl r4,#0x80,0x64
+ 864:	7f 26 ff 77 	bls r3,#0x7f,0x1067
+ 868:	01 22 01 10 	bnc r1,#0x1,0x86d
+ 86c:	08 26 c1 15 	bnc r3,#0x8,0xe31
+ 870:	cb 2a 53 c6 	bnz\.b r5,#0xcb,0xec7
+ 874:	e1 2e d2 33 	bc r7,#0xe1,0xc4a
+
+00000878 <bccimm16>:
+ 878:	00 c0 00 00 	bge Rx,#0x0,0x87c
+ 87c:	ff cf ff ff 	bz Rx,#0xffff,0x87f
+ 880:	80 c8 00 80 	bpl Rx,#0x8000,0x804
+ 884:	7f c7 ff 7f 	bls Rx,#0x7fff,0x907
+ 888:	01 c1 01 00 	bnc Rx,#0x1,0x88d
+ 88c:	04 ce fb 77 	bz\.b Rx,#0x77fb,0x894
+ 890:	f3 c9 3a f3 	bnv Rx,#0xf33a,0x887
+ 894:	6c c9 32 bc 	bnv Rx,#0xbc32,0x904
+
+00000898 <bngrimm4>:
+ 898:	00 04 00 00 	bn r0,#0x0,0x89c
+ 89c:	ff 04 ff 0f 	bn r15,#0xf,0x89f
+ 8a0:	88 04 00 08 	bn r8,#0x8,0xa4
+ 8a4:	77 04 ff 07 	bn r7,#0x7,0x10a7
+ 8a8:	11 04 01 00 	bn r1,#0x1,0x8ad
+ 8ac:	3b 04 49 08 	bn r11,#0x3,0xf9
+ 8b0:	4f 04 4b 0b 	bn r15,#0x4,0x3ff
+ 8b4:	8a 04 9b 06 	bn r10,#0x8,0xf53
+
+000008b8 <bngrgr>:
+ 8b8:	00 06 00 00 	bn r0,r0,0x8bc
+ 8bc:	ff 06 ff 0f 	bn r15,r15,0x8bf
+ 8c0:	88 06 00 08 	bn r8,r8,0xc4
+ 8c4:	77 06 ff 07 	bn r7,r7,0x10c7
+ 8c8:	11 06 01 00 	bn r1,r1,0x8cd
+ 8cc:	34 06 9d 04 	bn r4,r3,0xd6d
+ 8d0:	25 06 4d 00 	bn r5,r2,0x921
+ 8d4:	73 06 77 02 	bn r3,r7,0xb4f
+
+000008d8 <bnlmemimm>:
+ 8d8:	00 7c 00 00 	bn 0x0,#0x0,0x8dc
+ 8dc:	ff 7c ff 7f 	bn 0xff,#0x7,0x8df
+ 8e0:	80 7c 00 48 	bn 0x80,#0x4,0xe4
+ 8e4:	7f 7c ff 37 	bn 0x7f,#0x3,0x10e7
+ 8e8:	01 7c 01 10 	bn 0x1,#0x1,0x8ed
+ 8ec:	99 7c b1 7c 	bn 0x99,#0x7,0x5a1
+ 8f0:	cc 7c a7 08 	bn 0xcc,#0x0,0x19b
+ 8f4:	f2 7c 74 75 	bn 0xf2,#0x7,0xe6c
+
+000008f8 <bnhmemimm>:
+ 8f8:	00 7e 00 00 	bn 0x7f00,#0x0,0x8fc
+ 8fc:	ff 7e ff 7f 	bn 0x7fff,#0x7,0x8ff
+ 900:	80 7e 00 48 	bn 0x7f80,#0x4,0x104
+ 904:	7f 7e ff 37 	bn 0x7f7f,#0x3,0x1107
+ 908:	01 7e 01 10 	bn 0x7f01,#0x1,0x90d
+ 90c:	b9 7e 9a 3d 	bn 0x7fb9,#0x3,0x6aa
+ 910:	69 7e 64 1d 	bn 0x7f69,#0x1,0x678
+ 914:	4f 7e 20 75 	bn 0x7f4f,#0x7,0xe38
+
+00000918 <bpgrimm4>:
+ 918:	00 05 00 00 	bp r0,#0x0,0x91c
+ 91c:	ff 05 ff 0f 	bp r15,#0xf,0x91f
+ 920:	88 05 00 08 	bp r8,#0x8,0x124
+ 924:	77 05 ff 07 	bp r7,#0x7,0x1127
+ 928:	11 05 01 00 	bp r1,#0x1,0x92d
+ 92c:	c0 05 33 04 	bp r0,#0xc,0xd63
+ 930:	51 05 27 02 	bp r1,#0x5,0xb5b
+ 934:	86 05 34 06 	bp r6,#0x8,0xf6c
+
+00000938 <bpgrgr>:
+ 938:	00 07 00 00 	bp r0,r0,0x93c
+ 93c:	ff 07 ff 0f 	bp r15,r15,0x93f
+ 940:	88 07 00 08 	bp r8,r8,0x144
+ 944:	77 07 ff 07 	bp r7,r7,0x1147
+ 948:	11 07 01 00 	bp r1,r1,0x94d
+ 94c:	94 07 9a 0d 	bp r4,r9,0x6ea
+ 950:	a9 07 b0 0a 	bp r9,r10,0x404
+ 954:	14 07 97 01 	bp r4,r1,0xaef
+
+00000958 <bplmemimm>:
+ 958:	00 7d 00 00 	bp 0x0,#0x0,0x95c
+ 95c:	ff 7d ff 7f 	bp 0xff,#0x7,0x95f
+ 960:	80 7d 00 48 	bp 0x80,#0x4,0x164
+ 964:	7f 7d ff 37 	bp 0x7f,#0x3,0x1167
+ 968:	01 7d 01 10 	bp 0x1,#0x1,0x96d
+ 96c:	c1 7d 72 3e 	bp 0xc1,#0x3,0x7e2
+ 970:	fa 7d ef 29 	bp 0xfa,#0x2,0x363
+ 974:	b4 7d 43 62 	bp 0xb4,#0x6,0xbbb
+
+00000978 <bphmemimm>:
+ 978:	00 7f 00 00 	bp 0x7f00,#0x0,0x97c
+ 97c:	ff 7f ff 7f 	bp 0x7fff,#0x7,0x97f
+ 980:	80 7f 00 48 	bp 0x7f80,#0x4,0x184
+ 984:	7f 7f ff 37 	bp 0x7f7f,#0x3,0x1187
+ 988:	01 7f 01 10 	bp 0x7f01,#0x1,0x98d
+ 98c:	c3 7f 50 1e 	bp 0x7fc3,#0x1,0x7e0
+ 990:	81 7f 1c 5a 	bp 0x7f81,#0x5,0x3b0
+ 994:	38 7f bb 36 	bp 0x7f38,#0x3,0x1053
+
+00000998 <bcc>:
+ 998:	00 d0       	bge 0x99a
+ 99a:	ff df       	bz 0x99b
+ 99c:	80 d8       	bpl 0x91e
+ 99e:	7f d7       	bls 0xa1f
+ 9a0:	01 d1       	bnc 0x9a3
+ 9a2:	30 dc       	bnz\.b 0x9d4
+ 9a4:	f9 d1       	bnc 0x99f
+ 9a6:	4a dc       	bnz\.b 0x9f2
+
+000009a8 <br>:
+ 9a8:	00 10       	br 0x9aa
+ 9aa:	fe 1f       	br 0x9aa
+ 9ac:	00 18       	br 0x1ae
+ 9ae:	fe 17       	br 0x11ae
+ 9b0:	00 10       	br 0x9b2
+ 9b2:	c0 15       	br 0xf74
+ 9b4:	52 16       	br 0x1008
+ 9b6:	d2 13       	br 0xd8a
+
+000009b8 <callrimm>:
+ 9b8:	01 10       	callr 0x9ba
+ 9ba:	ff 1f       	callr 0x9ba
+ 9bc:	01 18       	callr 0x1be
+ 9be:	ff 17       	callr 0x11be
+ 9c0:	01 10       	callr 0x9c2
+ 9c2:	c1 15       	callr 0xf84
+ 9c4:	53 16       	callr 0x1018
+ 9c6:	d3 13       	callr 0xd9a
diff --git a/gas/testsuite/gas/xstormy16/allinsn.exp b/gas/testsuite/gas/xstormy16/allinsn.exp
new file mode 100644
index 0000000..f48dcc5
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/allinsn.exp
@@ -0,0 +1,8 @@
+# XSTORMY16 assembler testsuite. -*- Tcl -*-
+
+if [istarget xstormy16*-*-*] {
+    run_dump_test "allinsn"
+    run_dump_test "reloc-1"
+    run_dump_test "reloc-2"
+    run_dump_test "gcc"
+}
diff --git a/gas/testsuite/gas/xstormy16/allinsn.s b/gas/testsuite/gas/xstormy16/allinsn.s
new file mode 100644
index 0000000..f00aa6f
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/allinsn.s
@@ -0,0 +1,1346 @@
+ .data
+foodata: .word 42
+ .text
+footext:
+	.text
+	.global movlmemimm
+movlmemimm:
+	mov.b 0,#0
+	mov.w 255,#65535
+	mov.w 128,#32768
+	mov.b 127,#32767
+	mov.w 1,#1
+	mov.w 81,#64681
+	mov.w 247,#42230
+	mov.b 84,#16647
+	.text
+	.global movhmemimm
+movhmemimm:
+	mov.b 0x7f00+0,#0
+	mov.w 0x7f00+255,#65535
+	mov.w 0x7f00+128,#32768
+	mov.b 0x7f00+127,#32767
+	mov.w 0x7f00+1,#1
+	mov.b 0x7f00+165,#1944
+	mov.w 0x7f00+186,#11517
+	mov.b 0x7f00+63,#25556
+	.text
+	.global movlgrmem
+movlgrmem:
+	mov.b r0,0
+	mov.w r7,255
+	mov.w r4,128
+	mov.b r3,127
+	mov.w r1,1
+	mov.w r6,179
+	mov.w r0,183
+	mov.b r3,41
+	.text
+	.global movhgrmem
+movhgrmem:
+	mov.b r0,0x7f00+0
+	mov.w r7,0x7f00+255
+	mov.w r4,0x7f00+128
+	mov.b r3,0x7f00+127
+	mov.w r1,0x7f00+1
+	mov.b r2,0x7f00+114
+	mov.w r2,0x7f00+210
+	mov.w r5,0x7f00+181
+	.text
+	.global movlmemgr
+movlmemgr:
+	mov.b 0,r0
+	mov.w 255,r7
+	mov.w 128,r4
+	mov.b 127,r3
+	mov.w 1,r1
+	mov.w 137,r0
+	mov.w 26,r0
+	mov.b 127,r4
+	.text
+	.global movhmemgr
+movhmemgr:
+	mov.b 0x7f00+0,r0
+	mov.w 0x7f00+255,r7
+	mov.w 0x7f00+128,r4
+	mov.b 0x7f00+127,r3
+	mov.w 0x7f00+1,r1
+	mov.w 0x7f00+98,r3
+	mov.w 0x7f00+135,r7
+	mov.b 0x7f00+229,r2
+	.text
+	.global movgrgri
+movgrgri:
+	mov.b r0,(r0)
+	mov.w r7,(r15)
+	mov.w r4,(r8)
+	mov.b r3,(r7)
+	mov.w r1,(r1)
+	mov.w r6,(r4)
+	mov.b r0,(r12)
+	mov.w r5,(r9)
+	.text
+	.global movgrgripostinc
+movgrgripostinc:
+	mov.b r0,(r0++)
+	mov.w r7,(r15++)
+	mov.w r4,(r8++)
+	mov.b r3,(r7++)
+	mov.w r1,(r1++)
+	mov.w r4,(r8++)
+	mov.w r3,(r12++)
+	mov.b r6,(r4++)
+	.text
+	.global movgrgripredec
+movgrgripredec:
+	mov.b r0,(--r0)
+	mov.w r7,(--r15)
+	mov.w r4,(--r8)
+	mov.b r3,(--r7)
+	mov.w r1,(--r1)
+	mov.w r5,(--r9)
+	mov.w r4,(--r14)
+	mov.b r4,(--r7)
+	.text
+	.global movgrigr
+movgrigr:
+	mov.b (r0),r0
+	mov.w (r15),r7
+	mov.w (r8),r4
+	mov.b (r7),r3
+	mov.w (r1),r1
+	mov.w (r4),r3
+	mov.b (r3),r6
+	mov.w (r7),r0
+	.text
+	.global movgripostincgr
+movgripostincgr:
+	mov.b (r0++),r0
+	mov.w (r15++),r7
+	mov.w (r8++),r4
+	mov.b (r7++),r3
+	mov.w (r1++),r1
+	mov.w (r12++),r5
+	mov.b (r4++),r2
+	mov.b (r11++),r6
+	.text
+	.global movgripredecgr
+movgripredecgr:
+	mov.b (--r0),r0
+	mov.w (--r15),r7
+	mov.w (--r8),r4
+	mov.b (--r7),r3
+	mov.w (--r1),r1
+	mov.b (--r8),r3
+	mov.b (--r11),r4
+	mov.w (--r1),r6
+	.text
+	.global movgrgrii
+movgrgrii:
+	mov.b r0,(r0,0)
+	mov.w r7,(r15,-1)
+	mov.w r4,(r8,-2048)
+	mov.b r3,(r7,2047)
+	mov.w r1,(r1,1)
+	mov.w r6,(r8,-452)
+	mov.w r4,(r11,572)
+	mov.b r1,(r1,-1718)
+	.text
+	.global movgrgriipostinc
+movgrgriipostinc:
+	mov.b r0,(r0++,0)
+	mov.w r7,(r15++,-1)
+	mov.w r4,(r8++,-2048)
+	mov.b r3,(r7++,2047)
+	mov.w r1,(r1++,1)
+	mov.w r6,(r0++,-64)
+	mov.b r7,(r15++,1060)
+	mov.b r0,(r7++,847)
+	.text
+	.global movgrgriipredec
+movgrgriipredec:
+	mov.b r0,(--r0,0)
+	mov.w r7,(--r15,-1)
+	mov.w r4,(--r8,-2048)
+	mov.b r3,(--r7,2047)
+	mov.w r1,(--r1,1)
+	mov.w r0,(--r15,1780)
+	mov.w r6,(--r1,1506)
+	mov.w r7,(--r3,-2033)
+	.text
+	.global movgriigr
+movgriigr:
+	mov.b (r0,0),r0
+	mov.w (r15,-1),r7
+	mov.w (r8,-2048),r4
+	mov.b (r7,2047),r3
+	mov.w (r1,1),r1
+	mov.w (r7,1948),r5
+	mov.b (r3,-844),r4
+	mov.w (r15,1704),r0
+	.text
+	.global movgriipostincgr
+movgriipostincgr:
+	mov.b (r0++,0),r0
+	mov.w (r15++,-1),r7
+	mov.w (r8++,-2048),r4
+	mov.b (r7++,2047),r3
+	mov.w (r1++,1),r1
+	mov.w (r2++,-176),r7
+	mov.w (r8++,1389),r4
+	mov.b (r3++,47),r0
+	.text
+	.global movgriipredecgr
+movgriipredecgr:
+	mov.b (--r0,0),r0
+	mov.w (--r15,-1),r7
+	mov.w (--r8,-2048),r4
+	mov.b (--r7,2047),r3
+	mov.w (--r1,1),r1
+	mov.b (--r8,1004),r4
+	mov.w (--r14,-1444),r2
+	mov.b (--r5,-927),r4
+	.text
+	.global movgrgr
+movgrgr:
+	mov r0,r0
+	mov r15,r15
+	mov r8,r8
+	mov r7,r7
+	mov r1,r1
+	mov r9,r14
+	mov r7,r15
+	mov r12,r15
+	.text
+	.global movimm8
+movimm8:
+	mov Rx,#0
+	mov Rx,#255
+	mov Rx,#128
+	mov Rx,#127
+	mov Rx,#1
+	mov Rx,#136
+	mov Rx,#83
+	mov Rx,#104
+	.text
+	.global movwimm8
+movwimm8:
+	mov.w Rx,#0
+	mov.w Rx,#255
+	mov.w Rx,#128
+	mov.w Rx,#127
+	mov.w Rx,#1
+	mov.w Rx,#92
+	mov.w Rx,#97
+	mov.w Rx,#4
+	.text
+	.global movgrimm8
+movgrimm8:
+	mov r0,#0
+	mov r7,#255
+	mov r4,#128
+	mov r3,#127
+	mov r1,#1
+	mov r2,#206
+	mov r4,#55
+	mov r2,#3
+	.text
+	.global movwgrimm8
+movwgrimm8:
+	mov.w r0,#0
+	mov.w r7,#255
+	mov.w r4,#128
+	mov.w r3,#127
+	mov.w r1,#1
+	mov.w r4,#243
+	mov.w r3,#55
+	mov.w r2,#108
+	.text
+	.global movgrimm16
+movgrimm16:
+	mov r0,#0
+	mov r15,#65535
+	mov r8,#32768
+	mov r7,#32767
+	mov r1,#1
+	mov r4,#20066
+	mov r3,#7190
+	mov r2,#15972
+	.text
+	.global movwgrimm16
+movwgrimm16:
+	mov.w r0,#0
+	mov.w r15,#65535
+	mov.w r8,#32768
+	mov.w r7,#32767
+	mov.w r1,#1
+	mov.w r6,#16648
+	mov.w r8,#26865
+	mov.w r10,#20010
+	.text
+	.global movlowgr
+movlowgr:
+	mov.b r0,RxL
+	mov.b r15,RxL
+	mov.b r8,RxL
+	mov.b r7,RxL
+	mov.b r1,RxL
+	mov.b r11,RxL
+	mov.b r5,RxL
+	mov.b r2,RxL
+	.text
+	.global movhighgr
+movhighgr:
+	mov.b r0,RxH
+	mov.b r15,RxH
+	mov.b r8,RxH
+	mov.b r7,RxH
+	mov.b r1,RxH
+	mov.b r2,RxH
+	mov.b r7,RxH
+	mov.b r2,RxH
+	.text
+	.global movfgrgri
+movfgrgri:
+	movf.b r0,(r0)
+	movf.w r7,(r15)
+	movf.w r4,(r8)
+	movf.b r3,(r7)
+	movf.w r1,(r1)
+	movf.b r6,(r15)
+	movf.b r1,(r10)
+	movf.b r6,(r1)
+	.text
+	.global movfgrgripostinc
+movfgrgripostinc:
+	movf.b r0,(r0++)
+	movf.w r7,(r15++)
+	movf.w r4,(r8++)
+	movf.b r3,(r7++)
+	movf.w r1,(r1++)
+	movf.b r2,(r5++)
+	movf.w r5,(r10++)
+	movf.w r7,(r5++)
+	.text
+	.global movfgrgripredec
+movfgrgripredec:
+	movf.b r0,(--r0)
+	movf.w r7,(--r15)
+	movf.w r4,(--r8)
+	movf.b r3,(--r7)
+	movf.w r1,(--r1)
+	movf.w r6,(--r10)
+	movf.b r1,(--r14)
+	movf.w r3,(--r7)
+	.text
+	.global movfgrigr
+movfgrigr:
+	movf.b (r0),r0
+	movf.w (r15),r7
+	movf.w (r8),r4
+	movf.b (r7),r3
+	movf.w (r1),r1
+	movf.b (r5),r4
+	movf.b (r3),r4
+	movf.w (r12),r3
+	.text
+	.global movfgripostincgr
+movfgripostincgr:
+	movf.b (r0++),r0
+	movf.w (r15++),r7
+	movf.w (r8++),r4
+	movf.b (r7++),r3
+	movf.w (r1++),r1
+	movf.b (r9++),r5
+	movf.w (r10++),r4
+	movf.b (r9++),r1
+	.text
+	.global movfgripredecgr
+movfgripredecgr:
+	movf.b (--r0),r0
+	movf.w (--r15),r7
+	movf.w (--r8),r4
+	movf.b (--r7),r3
+	movf.w (--r1),r1
+	movf.b (--r0),r2
+	movf.w (--r11),r2
+	movf.b (--r10),r5
+	.text
+	.global movfgrgrii
+movfgrgrii:
+	movf.b r0,(r0,r0,0)
+	movf.w r7,(r7,r15,-1)
+	movf.w r4,(r4,r8,-2048)
+	movf.b r3,(r3,r7,2047)
+	movf.w r1,(r1,r1,1)
+	movf.b r7,(r7,r0,1473)
+	movf.w r2,(r0,r9,-1522)
+	movf.w r2,(r5,r1,480)
+	.text
+	.global movfgrgriipostinc
+movfgrgriipostinc:
+	movf.b r0,(r0,r0++,0)
+	movf.w r7,(r7,r15++,-1)
+	movf.w r4,(r4,r8++,-2048)
+	movf.b r3,(r3,r7++,2047)
+	movf.w r1,(r1,r1++,1)
+	movf.b r1,(r0,r2++,1398)
+	movf.w r4,(r0,r9++,-778)
+	movf.w r1,(r5,r14++,1564)
+	.text
+	.global movfgrgriipredec
+movfgrgriipredec:
+	movf.b r0,(r0,--r0,0)
+	movf.w r7,(r7,--r15,-1)
+	movf.w r4,(r4,--r8,-2048)
+	movf.b r3,(r3,--r7,2047)
+	movf.w r1,(r1,--r1,1)
+	movf.b r6,(r0,--r7,254)
+	movf.w r5,(r4,--r12,1673)
+	movf.b r0,(r0,--r10,-38)
+	.text
+	.global movfgriigr
+movfgriigr:
+	movf.b (r0,r0,0),r0
+	movf.w (r7,r15,-1),r7
+	movf.w (r4,r8,-2048),r4
+	movf.b (r3,r7,2047),r3
+	movf.w (r1,r1,1),r1
+	movf.w (r7,r2,-1636),r3
+	movf.w (r6,r12,1626),r1
+	movf.b (r3,r14,1540),r0
+	.text
+	.global movfgriipostincgr
+movfgriipostincgr:
+	movf.b (r0,r0++,0),r0
+	movf.w (r7,r15++,-1),r7
+	movf.w (r4,r8++,-2048),r4
+	movf.b (r3,r7++,2047),r3
+	movf.w (r1,r1++,1),r1
+	movf.b (r7,r13++,466),r3
+	movf.b (r3,r11++,250),r4
+	movf.b (r2,r10++,-1480),r7
+	.text
+	.global movfgriipredecgr
+movfgriipredecgr:
+	movf.b (r0,--r0,0),r0
+	movf.w (r7,--r15,-1),r7
+	movf.w (r4,--r8,-2048),r4
+	movf.b (r3,--r7,2047),r3
+	movf.w (r1,--r1,1),r1
+	movf.b (r5,--r10,-608),r0
+	movf.b (r1,--r11,831),r7
+	movf.w (r7,--r15,-2036),r6
+	.text
+	.global maskgrgr
+maskgrgr:
+	mask r0,r0
+	mask r15,r15
+	mask r8,r8
+	mask r7,r7
+	mask r1,r1
+	mask r4,r0
+	mask r6,r11
+	mask r8,r4
+	.text
+	.global maskgrimm16
+maskgrimm16:
+	mask r0,#0
+	mask r15,#65535
+	mask r8,#32768
+	mask r7,#32767
+	mask r1,#1
+	mask r7,#18153
+	mask r15,#7524
+	mask r14,#34349
+	.text
+	.global pushgr
+pushgr:
+	push r0
+	push r15
+	push r8
+	push r7
+	push r1
+	push r9
+	push r4
+	push r3
+	.text
+	.global popgr
+popgr:
+	pop r0
+	pop r15
+	pop r8
+	pop r7
+	pop r1
+	pop r3
+	pop r2
+	pop r12
+	.text
+	.global swpn
+swpn:
+	swpn r0
+	swpn r15
+	swpn r8
+	swpn r7
+	swpn r1
+	swpn r15
+	swpn r4
+	swpn r3
+	.text
+	.global swpb
+swpb:
+	swpb r0
+	swpb r15
+	swpb r8
+	swpb r7
+	swpb r1
+	swpb r2
+	swpb r12
+	swpb r2
+	.text
+	.global swpw
+swpw:
+	swpw r0,r0
+	swpw r15,r15
+	swpw r8,r8
+	swpw r7,r7
+	swpw r1,r1
+	swpw r12,r4
+	swpw r8,r2
+	swpw r5,r13
+	.text
+	.global andgrgr
+andgrgr:
+	and r0,r0
+	and r15,r15
+	and r8,r8
+	and r7,r7
+	and r1,r1
+	and r2,r2
+	and r15,r5
+	and r7,r5
+	.text
+	.global andimm8
+andimm8:
+	and Rx,#0
+	and Rx,#255
+	and Rx,#128
+	and Rx,#127
+	and Rx,#1
+	and Rx,#206
+	and Rx,#11
+	and Rx,#232
+	.text
+	.global andgrimm16
+andgrimm16:
+	and r0,#0
+	and r15,#65535
+	and r8,#32768
+	and r7,#32767
+	and r1,#1
+	and r10,#17229
+	and r11,#61451
+	and r5,#46925
+	.text
+	.global orgrgr
+orgrgr:
+	or r0,r0
+	or r15,r15
+	or r8,r8
+	or r7,r7
+	or r1,r1
+	or r3,r5
+	or r14,r15
+	or r5,r12
+	.text
+	.global orimm8
+orimm8:
+	or Rx,#0
+	or Rx,#255
+	or Rx,#128
+	or Rx,#127
+	or Rx,#1
+	or Rx,#4
+	or Rx,#38
+	or Rx,#52
+	.text
+	.global orgrimm16
+orgrimm16:
+	or r0,#0
+	or r15,#65535
+	or r8,#32768
+	or r7,#32767
+	or r1,#1
+	or r2,#64563
+	or r2,#18395
+	or r1,#63059
+	.text
+	.global xorgrgr
+xorgrgr:
+	xor r0,r0
+	xor r15,r15
+	xor r8,r8
+	xor r7,r7
+	xor r1,r1
+	xor r14,r1
+	xor r9,r9
+	xor r12,r8
+	.text
+	.global xorimm8
+xorimm8:
+	xor Rx,#0
+	xor Rx,#255
+	xor Rx,#128
+	xor Rx,#127
+	xor Rx,#1
+	xor Rx,#208
+	xor Rx,#126
+	xor Rx,#55
+	.text
+	.global xorgrimm16
+xorgrimm16:
+	xor r0,#0
+	xor r15,#65535
+	xor r8,#32768
+	xor r7,#32767
+	xor r1,#1
+	xor r15,#56437
+	xor r3,#901
+	xor r2,#37017
+	.text
+	.global notgr
+notgr:
+	not r0
+	not r15
+	not r8
+	not r7
+	not r1
+	not r4
+	not r3
+	not r3
+	.text
+	.global addgrgr
+addgrgr:
+	add r0,r0
+	add r15,r15
+	add r8,r8
+	add r7,r7
+	add r1,r1
+	add r12,r7
+	add r1,r10
+	add r14,r14
+	.text
+	.global addgrimm4
+addgrimm4:
+	add r0,#0
+	add r15,#15
+	add r8,#8
+	add r7,#7
+	add r1,#1
+	add r7,#0
+	add r10,#9
+	add r7,#8
+	.text
+	.global addimm8
+addimm8:
+	add Rx,#0
+	add Rx,#255
+	add Rx,#128
+	add Rx,#127
+	add Rx,#1
+	add Rx,#25
+	add Rx,#247
+	add Rx,#221
+	.text
+	.global addgrimm16
+addgrimm16:
+	add r0,#0
+	add r15,#255
+	add r8,#128
+	add r7,#127
+	add r1,#1
+	add r3,#99
+	add r0,#15
+	add r7,#214
+	.text
+	.global adcgrgr
+adcgrgr:
+	adc r0,r0
+	adc r15,r15
+	adc r8,r8
+	adc r7,r7
+	adc r1,r1
+	adc r2,r13
+	adc r14,r10
+	adc r2,r15
+	.text
+	.global adcgrimm4
+adcgrimm4:
+	adc r0,#0
+	adc r15,#15
+	adc r8,#8
+	adc r7,#7
+	adc r1,#1
+	adc r15,#1
+	adc r1,#3
+	adc r6,#11
+	.text
+	.global adcimm8
+adcimm8:
+	adc Rx,#0
+	adc Rx,#255
+	adc Rx,#128
+	adc Rx,#127
+	adc Rx,#1
+	adc Rx,#225
+	adc Rx,#75
+	adc Rx,#18
+	.text
+	.global adcgrimm16
+adcgrimm16:
+	adc r0,#0
+	adc r15,#65535
+	adc r8,#32768
+	adc r7,#32767
+	adc r1,#1
+	adc r13,#63129
+	adc r3,#23795
+	adc r11,#49245
+	.text
+	.global subgrgr
+subgrgr:
+	sub r0,r0
+	sub r15,r15
+	sub r8,r8
+	sub r7,r7
+	sub r1,r1
+	sub r8,r8
+	sub r9,r9
+	sub r9,r15
+	.text
+	.global subgrimm4
+subgrimm4:
+	sub r0,#0
+	sub r15,#15
+	sub r8,#8
+	sub r7,#7
+	sub r1,#1
+	sub r2,#15
+	sub r12,#9
+	sub r8,#4
+	.text
+	.global subimm8
+subimm8:
+	sub Rx,#0
+	sub Rx,#255
+	sub Rx,#128
+	sub Rx,#127
+	sub Rx,#1
+	sub Rx,#205
+	sub Rx,#153
+	sub Rx,#217
+	.text
+	.global subgrimm16
+subgrimm16:
+	sub r0,#0
+	sub r15,#65535
+	sub r8,#32768
+	sub r7,#32767
+	sub r1,#1
+	sub r3,#51895
+	sub r11,#23617
+	sub r10,#7754
+	.text
+	.global sbcgrgr
+sbcgrgr:
+	sbc r0,r0
+	sbc r15,r15
+	sbc r8,r8
+	sbc r7,r7
+	sbc r1,r1
+	sbc r11,r2
+	sbc r9,r1
+	sbc r4,r15
+	.text
+	.global sbcgrimm4
+sbcgrimm4:
+	sbc r0,#0
+	sbc r15,#15
+	sbc r8,#8
+	sbc r7,#7
+	sbc r1,#1
+	sbc r10,#11
+	sbc r11,#10
+	sbc r13,#10
+	.text
+	.global sbcgrimm8
+sbcgrimm8:
+	sbc Rx,#0
+	sbc Rx,#255
+	sbc Rx,#128
+	sbc Rx,#127
+	sbc Rx,#1
+	sbc Rx,#137
+	sbc Rx,#224
+	sbc Rx,#156
+	.text
+	.global sbcgrimm16
+sbcgrimm16:
+	sbc r0,#0
+	sbc r15,#65535
+	sbc r8,#32768
+	sbc r7,#32767
+	sbc r1,#1
+	sbc r0,#32507
+	sbc r7,#8610
+	sbc r14,#20373
+	.text
+	.global incgr
+incgr:
+	inc r0
+	inc r15
+	inc r8
+	inc r7
+	inc r1
+	inc r13
+	inc r1
+	inc r11
+	.text
+	.global incgrimm2
+incgrimm2:
+	inc r0,#0
+	inc r15,#3
+	inc r8,#2
+	inc r7,#1
+	inc r1,#1
+	inc r14,#1
+	inc r5,#0
+	inc r12,#3
+	.text
+	.global decgr
+decgr:
+	dec r0
+	dec r15
+	dec r8
+	dec r7
+	dec r1
+	dec r12
+	dec r8
+	dec r10
+	.text
+	.global decgrimm2
+decgrimm2:
+	dec r0,#0
+	dec r15,#3
+	dec r8,#2
+	dec r7,#1
+	dec r1,#1
+	dec r5,#0
+	dec r13,#0
+	dec r13,#2
+	.text
+	.global rrcgrgr
+rrcgrgr:
+	rrc r0,r0
+	rrc r15,r15
+	rrc r8,r8
+	rrc r7,r7
+	rrc r1,r1
+	rrc r8,r4
+	rrc r10,r14
+	rrc r15,r9
+	.text
+	.global rrcgrimm4
+rrcgrimm4:
+	rrc r0,#0
+	rrc r15,#15
+	rrc r8,#8
+	rrc r7,#7
+	rrc r1,#1
+	rrc r11,#3
+	rrc r14,#12
+	rrc r2,#15
+	.text
+	.global rlcgrgr
+rlcgrgr:
+	rlc r0,r0
+	rlc r15,r15
+	rlc r8,r8
+	rlc r7,r7
+	rlc r1,r1
+	rlc r15,r3
+	rlc r15,r7
+	rlc r15,r10
+	.text
+	.global rlcgrimm4
+rlcgrimm4:
+	rlc r0,#0
+	rlc r15,#15
+	rlc r8,#8
+	rlc r7,#7
+	rlc r1,#1
+	rlc r8,#2
+	rlc r2,#6
+	rlc r6,#10
+	.text
+	.global shrgrgr
+shrgrgr:
+	shr r0,r0
+	shr r15,r15
+	shr r8,r8
+	shr r7,r7
+	shr r1,r1
+	shr r13,r2
+	shr r7,r8
+	shr r6,r8
+	.text
+	.global shrgrimm
+shrgrimm:
+	shr r0,#0
+	shr r15,#15
+	shr r8,#8
+	shr r7,#7
+	shr r1,#1
+	shr r9,#13
+	shr r2,#7
+	shr r8,#8
+	.text
+	.global shlgrgr
+shlgrgr:
+	shl r0,r0
+	shl r15,r15
+	shl r8,r8
+	shl r7,r7
+	shl r1,r1
+	shl r2,r3
+	shl r0,r3
+	shl r2,r1
+	.text
+	.global shlgrimm
+shlgrimm:
+	shl r0,#0
+	shl r15,#15
+	shl r8,#8
+	shl r7,#7
+	shl r1,#1
+	shl r6,#13
+	shl r3,#6
+	shl r15,#15
+	.text
+	.global asrgrgr
+asrgrgr:
+	asr r0,r0
+	asr r15,r15
+	asr r8,r8
+	asr r7,r7
+	asr r1,r1
+	asr r5,r10
+	asr r3,r5
+	asr r6,r11
+	.text
+	.global asrgrimm
+asrgrimm:
+	asr r0,#0
+	asr r15,#15
+	asr r8,#8
+	asr r7,#7
+	asr r1,#1
+	asr r13,#4
+	asr r0,#13
+	asr r6,#3
+	.text
+	.global set1grimm
+set1grimm:
+	set1 r0,#0
+	set1 r15,#15
+	set1 r8,#8
+	set1 r7,#7
+	set1 r1,#1
+	set1 r6,#10
+	set1 r13,#1
+	set1 r13,#15
+	.text
+	.global set1grgr
+set1grgr:
+	set1 r0,r0
+	set1 r15,r15
+	set1 r8,r8
+	set1 r7,r7
+	set1 r1,r1
+	set1 r6,r0
+	set1 r6,r7
+	set1 r14,r2
+	.text
+	.global set1lmemimm
+set1lmemimm:
+	set1 0,#0
+	set1 255,#7
+	set1 128,#4
+	set1 127,#3
+	set1 1,#1
+	set1 244,#3
+	set1 55,#7
+	set1 252,#5
+	.text
+	.global set1hmemimm
+set1hmemimm:
+	set1 0x7f00+0,#0
+	set1 0x7f00+255,#7
+	set1 0x7f00+128,#4
+	set1 0x7f00+127,#3
+	set1 0x7f00+1,#1
+	set1 0x7f00+10,#3
+	set1 0x7f00+99,#4
+	set1 0x7f00+148,#3
+	.text
+	.global clr1grimm
+clr1grimm:
+	clr1 r0,#0
+	clr1 r15,#15
+	clr1 r8,#8
+	clr1 r7,#7
+	clr1 r1,#1
+	clr1 r12,#0
+	clr1 r8,#11
+	clr1 r7,#7
+	.text
+	.global clr1grgr
+clr1grgr:
+	clr1 r0,r0
+	clr1 r15,r15
+	clr1 r8,r8
+	clr1 r7,r7
+	clr1 r1,r1
+	clr1 r3,r3
+	clr1 r0,r1
+	clr1 r15,r0
+	.text
+	.global clr1lmemimm
+clr1lmemimm:
+	clr1 0,#0
+	clr1 255,#7
+	clr1 128,#4
+	clr1 127,#3
+	clr1 1,#1
+	clr1 114,#7
+	clr1 229,#4
+	clr1 86,#1
+	.text
+	.global clr1hmemimm
+clr1hmemimm:
+	clr1 0x7f00+0,#0
+	clr1 0x7f00+255,#7
+	clr1 0x7f00+128,#4
+	clr1 0x7f00+127,#3
+	clr1 0x7f00+1,#1
+	clr1 0x7f00+44,#3
+	clr1 0x7f00+212,#5
+	clr1 0x7f00+67,#7
+	.text
+	.global cbwgr
+cbwgr:
+	cbw r0
+	cbw r15
+	cbw r8
+	cbw r7
+	cbw r1
+	cbw r8
+	cbw r11
+	cbw r3
+	.text
+	.global revgr
+revgr:
+	rev r0
+	rev r15
+	rev r8
+	rev r7
+	rev r1
+	rev r1
+	rev r1
+	rev r14
+	.text
+	.global bgr
+bgr:
+	br r0
+	br r15
+	br r8
+	br r7
+	br r1
+	br r0
+	br r15
+	br r12
+	.text
+	.global jmp
+jmp:
+	jmp r8,r0
+	jmp r9,r15
+	jmp r9,r8
+	jmp r8,r7
+	jmp r9,r1
+	jmp r9,r7
+	jmp r9,r5
+	jmp r8,r12
+	.text
+	.global jmpf
+jmpf:
+	jmpf 0
+	jmpf 16777215
+	jmpf 8388608
+	jmpf 8388607
+	jmpf 1
+	jmpf 10731629
+	jmpf 15094866
+	jmpf 1464024
+	.text
+	.global callrgr
+callrgr:
+	callr r0
+	callr r15
+	callr r8
+	callr r7
+	callr r1
+	callr r1
+	callr r12
+	callr r8
+	.text
+	.global callgr
+callgr:
+	call r8,r0
+	call r9,r15
+	call r9,r8
+	call r8,r7
+	call r9,r1
+	call r9,r6
+	call r9,r14
+	call r8,r12
+	.text
+	.global callfimm
+callfimm:
+	callf 0
+	callf 16777215
+	callf 8388608
+	callf 8388607
+	callf 1
+	callf 13546070
+	callf 10837983
+	callf 15197875
+	.text
+	.global icallrgr
+icallrgr:
+	icallr r0
+	icallr r15
+	icallr r8
+	icallr r7
+	icallr r1
+	icallr r15
+	icallr r12
+	icallr r9
+	.text
+	.global icallgr
+icallgr:
+	icall r8,r0
+	icall r9,r15
+	icall r9,r8
+	icall r8,r7
+	icall r9,r1
+	icall r9,r10
+	icall r8,r15
+	icall r8,r10
+	.text
+	.global icallfimm
+icallfimm:
+	icallf 0
+	icallf 16777215
+	icallf 8388608
+	icallf 8388607
+	icallf 1
+	icallf 9649954
+	icallf 1979758
+	icallf 7661640
+	.text
+	.global iret
+iret:
+	iret
+	.text
+	.global ret
+ret:
+	ret
+	.text
+	.global mul
+mul:
+	mul
+	.text
+	.global div
+div:
+	div
+	.text
+	.global nop
+nop:
+	nop
+	ret
+	.text
+	.global halt
+halt:
+	halt
+	.text
+	.global hold
+hold:
+	hold
+	.text
+	.global brk
+brk:
+	brk
+	.text
+	.global bccgrgr
+bccgrgr:
+	bge r0,r0,0+(.+4)
+	bz r15,r15,-1+(.+4)
+	bpl r8,r8,-2048+(.+4)
+	bls r7,r7,2047+(.+4)
+	bnc r1,r1,1+(.+4)
+	bc r3,r13,1799+(.+4)
+	bge r1,r10,-2019+(.+4)
+	bz r0,r5,-1132+(.+4)
+	.text
+	.global bccgrimm8
+bccgrimm8:
+	bge r0,#0,0+(.+4)
+	bz r7,#255,-1+(.+4)
+	bpl r4,#128,-2048+(.+4)
+	bls r3,#127,2047+(.+4)
+	bnc r1,#1,1+(.+4)
+	bnc r3,#8,1473+(.+4)
+	bnz.b r5,#203,1619+(.+4)
+	bc r7,#225,978+(.+4)
+	.text
+	.global bccimm16
+bccimm16:
+	bge Rx,#0,0+(.+4)
+	bz Rx,#65535,-1+(.+4)
+	bpl Rx,#32768,-128+(.+4)
+	bls Rx,#32767,127+(.+4)
+	bnc Rx,#1,1+(.+4)
+	bz.b Rx,#30715,4+(.+4)
+	bnv Rx,#62266,-13+(.+4)
+	bnv Rx,#48178,108+(.+4)
+	.text
+	.global bngrimm4
+bngrimm4:
+	bn r0,#0,0+(.+4)
+	bn r15,#15,-1+(.+4)
+	bn r8,#8,-2048+(.+4)
+	bn r7,#7,2047+(.+4)
+	bn r1,#1,1+(.+4)
+	bn r11,#3,-1975+(.+4)
+	bn r15,#4,-1205+(.+4)
+	bn r10,#8,1691+(.+4)
+	.text
+	.global bngrgr
+bngrgr:
+	bn r0,r0,0+(.+4)
+	bn r15,r15,-1+(.+4)
+	bn r8,r8,-2048+(.+4)
+	bn r7,r7,2047+(.+4)
+	bn r1,r1,1+(.+4)
+	bn r4,r3,1181+(.+4)
+	bn r5,r2,77+(.+4)
+	bn r3,r7,631+(.+4)
+	.text
+	.global bnlmemimm
+bnlmemimm:
+	bn 0,#0,0+(.+4)
+	bn 255,#7,-1+(.+4)
+	bn 128,#4,-2048+(.+4)
+	bn 127,#3,2047+(.+4)
+	bn 1,#1,1+(.+4)
+	bn 153,#7,-847+(.+4)
+	bn 204,#0,-1881+(.+4)
+	bn 242,#7,1396+(.+4)
+	.text
+	.global bnhmemimm
+bnhmemimm:
+	bn 0x7f00+0,#0,0+(.+4)
+	bn 0x7f00+255,#7,-1+(.+4)
+	bn 0x7f00+128,#4,-2048+(.+4)
+	bn 0x7f00+127,#3,2047+(.+4)
+	bn 0x7f00+1,#1,1+(.+4)
+	bn 0x7f00+185,#3,-614+(.+4)
+	bn 0x7f00+105,#1,-668+(.+4)
+	bn 0x7f00+79,#7,1312+(.+4)
+	.text
+	.global bpgrimm4
+bpgrimm4:
+	bp r0,#0,0+(.+4)
+	bp r15,#15,-1+(.+4)
+	bp r8,#8,-2048+(.+4)
+	bp r7,#7,2047+(.+4)
+	bp r1,#1,1+(.+4)
+	bp r0,#12,1075+(.+4)
+	bp r1,#5,551+(.+4)
+	bp r6,#8,1588+(.+4)
+	.text
+	.global bpgrgr
+bpgrgr:
+	bp r0,r0,0+(.+4)
+	bp r15,r15,-1+(.+4)
+	bp r8,r8,-2048+(.+4)
+	bp r7,r7,2047+(.+4)
+	bp r1,r1,1+(.+4)
+	bp r4,r9,-614+(.+4)
+	bp r9,r10,-1360+(.+4)
+	bp r4,r1,407+(.+4)
+	.text
+	.global bplmemimm
+bplmemimm:
+	bp 0,#0,0+(.+4)
+	bp 255,#7,-1+(.+4)
+	bp 128,#4,-2048+(.+4)
+	bp 127,#3,2047+(.+4)
+	bp 1,#1,1+(.+4)
+	bp 193,#3,-398+(.+4)
+	bp 250,#2,-1553+(.+4)
+	bp 180,#6,579+(.+4)
+	.text
+	.global bphmemimm
+bphmemimm:
+	bp 0x7f00+0,#0,0+(.+4)
+	bp 0x7f00+255,#7,-1+(.+4)
+	bp 0x7f00+128,#4,-2048+(.+4)
+	bp 0x7f00+127,#3,2047+(.+4)
+	bp 0x7f00+1,#1,1+(.+4)
+	bp 0x7f00+195,#1,-432+(.+4)
+	bp 0x7f00+129,#5,-1508+(.+4)
+	bp 0x7f00+56,#3,1723+(.+4)
+	.text
+	.global bcc
+bcc:
+	bge 0+(.+2)
+	bz -1+(.+2)
+	bpl -128+(.+2)
+	bls 127+(.+2)
+	bnc 1+(.+2)
+	bnz.b 48+(.+2)
+	bnc -7+(.+2)
+	bnz.b 74+(.+2)
+	.text
+	.global br
+br:
+	br 0+(.+2)
+	br -2+(.+2)
+	br -2048+(.+2)
+	br 2046+(.+2)
+	br 1+(.+2)
+	br 1472+(.+2)
+	br 1618+(.+2)
+	br 978+(.+2)
+	.text
+	.global callrimm
+callrimm:
+	callr 0+(.+2)
+	callr -2+(.+2)
+	callr -2048+(.+2)
+	callr 2046+(.+2)
+	callr 1+(.+2)
+	callr 1472+(.+2)
+	callr 1618+(.+2)
+	callr 978+(.+2)
diff --git a/gas/testsuite/gas/xstormy16/allinsn.sh b/gas/testsuite/gas/xstormy16/allinsn.sh
new file mode 100644
index 0000000..466e44c
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/allinsn.sh
@@ -0,0 +1,1389 @@
+#/bin/sh
+# Generate test result data for xstormy16 GAS testing.
+# This script is machine generated.
+# It is intended to be run in the testsuite source directory.
+#
+# Syntax: build.sh /path/to/build/gas
+
+if [ $# = 0 ] ; then
+  if [ ! -x ../gas/as-new ] ; then
+    echo "Usage: $0 [/path/to/gas/build]"
+  else
+    BUILD=`pwd`/../gas
+  fi
+else
+  BUILD=$1
+fi
+
+if [ ! -x $BUILD/as-new ] ; then
+  echo "$BUILD is not a gas build directory"
+  exit 1
+fi
+
+# Put results here, so we preserve the existing set for comparison.
+rm -rf tmpdir
+mkdir tmpdir
+cd tmpdir
+
+function gentest {
+    rm -f a.out
+    $BUILD/as-new ${1}.s -o a.out
+    echo "#as:" >${1}.d
+    echo "#objdump: -dr" >>${1}.d
+    echo "#name: $1" >>${1}.d
+    $BUILD/../binutils/objdump -dr a.out | 	sed -e 's/(/\\(/g'             -e 's/)/\\)/g'             -e 's/\$/\\$/g'             -e 's/\[/\\\[/g'             -e 's/\]/\\\]/g'             -e 's/[+]/\\+/g'             -e 's/[.]/\\./g'             -e 's/[*]/\\*/g' | 	sed -e 's/^.*file format.*$/.*: +file format .*/' 	>>${1}.d
+    rm -f a.out
+}
+
+# Now come all the testcases.
+cat > allinsn.s <<EOF
+ .data
+foodata: .word 42
+ .text
+footext:
+	.text
+	.global movlmemimm
+movlmemimm:
+	mov.b 0,#0
+	mov.w 255,#65535
+	mov.w 128,#32768
+	mov.b 127,#32767
+	mov.w 1,#1
+	mov.w 81,#64681
+	mov.w 247,#42230
+	mov.b 84,#16647
+	.text
+	.global movhmemimm
+movhmemimm:
+	mov.b 0x7f00+0,#0
+	mov.w 0x7f00+255,#65535
+	mov.w 0x7f00+128,#32768
+	mov.b 0x7f00+127,#32767
+	mov.w 0x7f00+1,#1
+	mov.b 0x7f00+165,#1944
+	mov.w 0x7f00+186,#11517
+	mov.b 0x7f00+63,#25556
+	.text
+	.global movlgrmem
+movlgrmem:
+	mov.b r0,0
+	mov.w r7,255
+	mov.w r4,128
+	mov.b r3,127
+	mov.w r1,1
+	mov.w r6,179
+	mov.w r0,183
+	mov.b r3,41
+	.text
+	.global movhgrmem
+movhgrmem:
+	mov.b r0,0x7f00+0
+	mov.w r7,0x7f00+255
+	mov.w r4,0x7f00+128
+	mov.b r3,0x7f00+127
+	mov.w r1,0x7f00+1
+	mov.b r2,0x7f00+114
+	mov.w r2,0x7f00+210
+	mov.w r5,0x7f00+181
+	.text
+	.global movlmemgr
+movlmemgr:
+	mov.b 0,r0
+	mov.w 255,r7
+	mov.w 128,r4
+	mov.b 127,r3
+	mov.w 1,r1
+	mov.w 137,r0
+	mov.w 26,r0
+	mov.b 127,r4
+	.text
+	.global movhmemgr
+movhmemgr:
+	mov.b 0x7f00+0,r0
+	mov.w 0x7f00+255,r7
+	mov.w 0x7f00+128,r4
+	mov.b 0x7f00+127,r3
+	mov.w 0x7f00+1,r1
+	mov.w 0x7f00+98,r3
+	mov.w 0x7f00+135,r7
+	mov.b 0x7f00+229,r2
+	.text
+	.global movgrgri
+movgrgri:
+	mov.b r0,(r0)
+	mov.w r7,(r15)
+	mov.w r4,(r8)
+	mov.b r3,(r7)
+	mov.w r1,(r1)
+	mov.w r6,(r4)
+	mov.b r0,(r12)
+	mov.w r5,(r9)
+	.text
+	.global movgrgripostinc
+movgrgripostinc:
+	mov.b r0,(r0++)
+	mov.w r7,(r15++)
+	mov.w r4,(r8++)
+	mov.b r3,(r7++)
+	mov.w r1,(r1++)
+	mov.w r4,(r8++)
+	mov.w r3,(r12++)
+	mov.b r6,(r4++)
+	.text
+	.global movgrgripredec
+movgrgripredec:
+	mov.b r0,(--r0)
+	mov.w r7,(--r15)
+	mov.w r4,(--r8)
+	mov.b r3,(--r7)
+	mov.w r1,(--r1)
+	mov.w r5,(--r9)
+	mov.w r4,(--r14)
+	mov.b r4,(--r7)
+	.text
+	.global movgrigr
+movgrigr:
+	mov.b (r0),r0
+	mov.w (r15),r7
+	mov.w (r8),r4
+	mov.b (r7),r3
+	mov.w (r1),r1
+	mov.w (r4),r3
+	mov.b (r3),r6
+	mov.w (r7),r0
+	.text
+	.global movgripostincgr
+movgripostincgr:
+	mov.b (r0++),r0
+	mov.w (r15++),r7
+	mov.w (r8++),r4
+	mov.b (r7++),r3
+	mov.w (r1++),r1
+	mov.w (r12++),r5
+	mov.b (r4++),r2
+	mov.b (r11++),r6
+	.text
+	.global movgripredecgr
+movgripredecgr:
+	mov.b (--r0),r0
+	mov.w (--r15),r7
+	mov.w (--r8),r4
+	mov.b (--r7),r3
+	mov.w (--r1),r1
+	mov.b (--r8),r3
+	mov.b (--r11),r4
+	mov.w (--r1),r6
+	.text
+	.global movgrgrii
+movgrgrii:
+	mov.b r0,(r0,0)
+	mov.w r7,(r15,-1)
+	mov.w r4,(r8,-2048)
+	mov.b r3,(r7,2047)
+	mov.w r1,(r1,1)
+	mov.w r6,(r8,-452)
+	mov.w r4,(r11,572)
+	mov.b r1,(r1,-1718)
+	.text
+	.global movgrgriipostinc
+movgrgriipostinc:
+	mov.b r0,(r0++,0)
+	mov.w r7,(r15++,-1)
+	mov.w r4,(r8++,-2048)
+	mov.b r3,(r7++,2047)
+	mov.w r1,(r1++,1)
+	mov.w r6,(r0++,-64)
+	mov.b r7,(r15++,1060)
+	mov.b r0,(r7++,847)
+	.text
+	.global movgrgriipredec
+movgrgriipredec:
+	mov.b r0,(--r0,0)
+	mov.w r7,(--r15,-1)
+	mov.w r4,(--r8,-2048)
+	mov.b r3,(--r7,2047)
+	mov.w r1,(--r1,1)
+	mov.w r0,(--r15,1780)
+	mov.w r6,(--r1,1506)
+	mov.w r7,(--r3,-2033)
+	.text
+	.global movgriigr
+movgriigr:
+	mov.b (r0,0),r0
+	mov.w (r15,-1),r7
+	mov.w (r8,-2048),r4
+	mov.b (r7,2047),r3
+	mov.w (r1,1),r1
+	mov.w (r7,1948),r5
+	mov.b (r3,-844),r4
+	mov.w (r15,1704),r0
+	.text
+	.global movgriipostincgr
+movgriipostincgr:
+	mov.b (r0++,0),r0
+	mov.w (r15++,-1),r7
+	mov.w (r8++,-2048),r4
+	mov.b (r7++,2047),r3
+	mov.w (r1++,1),r1
+	mov.w (r2++,-176),r7
+	mov.w (r8++,1389),r4
+	mov.b (r3++,47),r0
+	.text
+	.global movgriipredecgr
+movgriipredecgr:
+	mov.b (--r0,0),r0
+	mov.w (--r15,-1),r7
+	mov.w (--r8,-2048),r4
+	mov.b (--r7,2047),r3
+	mov.w (--r1,1),r1
+	mov.b (--r8,1004),r4
+	mov.w (--r14,-1444),r2
+	mov.b (--r5,-927),r4
+	.text
+	.global movgrgr
+movgrgr:
+	mov r0,r0
+	mov r15,r15
+	mov r8,r8
+	mov r7,r7
+	mov r1,r1
+	mov r9,r14
+	mov r7,r15
+	mov r12,r15
+	.text
+	.global movimm8
+movimm8:
+	mov Rx,#0
+	mov Rx,#255
+	mov Rx,#128
+	mov Rx,#127
+	mov Rx,#1
+	mov Rx,#136
+	mov Rx,#83
+	mov Rx,#104
+	.text
+	.global movwimm8
+movwimm8:
+	mov.w Rx,#0
+	mov.w Rx,#255
+	mov.w Rx,#128
+	mov.w Rx,#127
+	mov.w Rx,#1
+	mov.w Rx,#92
+	mov.w Rx,#97
+	mov.w Rx,#4
+	.text
+	.global movgrimm8
+movgrimm8:
+	mov r0,#0
+	mov r7,#255
+	mov r4,#128
+	mov r3,#127
+	mov r1,#1
+	mov r2,#206
+	mov r4,#55
+	mov r2,#3
+	.text
+	.global movwgrimm8
+movwgrimm8:
+	mov.w r0,#0
+	mov.w r7,#255
+	mov.w r4,#128
+	mov.w r3,#127
+	mov.w r1,#1
+	mov.w r4,#243
+	mov.w r3,#55
+	mov.w r2,#108
+	.text
+	.global movgrimm16
+movgrimm16:
+	mov r0,#0
+	mov r15,#65535
+	mov r8,#32768
+	mov r7,#32767
+	mov r1,#1
+	mov r4,#20066
+	mov r3,#7190
+	mov r2,#15972
+	.text
+	.global movwgrimm16
+movwgrimm16:
+	mov.w r0,#0
+	mov.w r15,#65535
+	mov.w r8,#32768
+	mov.w r7,#32767
+	mov.w r1,#1
+	mov.w r6,#16648
+	mov.w r8,#26865
+	mov.w r10,#20010
+	.text
+	.global movlowgr
+movlowgr:
+	mov.b r0,RxL
+	mov.b r15,RxL
+	mov.b r8,RxL
+	mov.b r7,RxL
+	mov.b r1,RxL
+	mov.b r11,RxL
+	mov.b r5,RxL
+	mov.b r2,RxL
+	.text
+	.global movhighgr
+movhighgr:
+	mov.b r0,RxH
+	mov.b r15,RxH
+	mov.b r8,RxH
+	mov.b r7,RxH
+	mov.b r1,RxH
+	mov.b r2,RxH
+	mov.b r7,RxH
+	mov.b r2,RxH
+	.text
+	.global movfgrgri
+movfgrgri:
+	movf.b r0,(r0)
+	movf.w r7,(r15)
+	movf.w r4,(r8)
+	movf.b r3,(r7)
+	movf.w r1,(r1)
+	movf.b r6,(r15)
+	movf.b r1,(r10)
+	movf.b r6,(r1)
+	.text
+	.global movfgrgripostinc
+movfgrgripostinc:
+	movf.b r0,(r0++)
+	movf.w r7,(r15++)
+	movf.w r4,(r8++)
+	movf.b r3,(r7++)
+	movf.w r1,(r1++)
+	movf.b r2,(r5++)
+	movf.w r5,(r10++)
+	movf.w r7,(r5++)
+	.text
+	.global movfgrgripredec
+movfgrgripredec:
+	movf.b r0,(--r0)
+	movf.w r7,(--r15)
+	movf.w r4,(--r8)
+	movf.b r3,(--r7)
+	movf.w r1,(--r1)
+	movf.w r6,(--r10)
+	movf.b r1,(--r14)
+	movf.w r3,(--r7)
+	.text
+	.global movfgrigr
+movfgrigr:
+	movf.b (r0),r0
+	movf.w (r15),r7
+	movf.w (r8),r4
+	movf.b (r7),r3
+	movf.w (r1),r1
+	movf.b (r5),r4
+	movf.b (r3),r4
+	movf.w (r12),r3
+	.text
+	.global movfgripostincgr
+movfgripostincgr:
+	movf.b (r0++),r0
+	movf.w (r15++),r7
+	movf.w (r8++),r4
+	movf.b (r7++),r3
+	movf.w (r1++),r1
+	movf.b (r9++),r5
+	movf.w (r10++),r4
+	movf.b (r9++),r1
+	.text
+	.global movfgripredecgr
+movfgripredecgr:
+	movf.b (--r0),r0
+	movf.w (--r15),r7
+	movf.w (--r8),r4
+	movf.b (--r7),r3
+	movf.w (--r1),r1
+	movf.b (--r0),r2
+	movf.w (--r11),r2
+	movf.b (--r10),r5
+	.text
+	.global movfgrgrii
+movfgrgrii:
+	movf.b r0,(r0,r0,0)
+	movf.w r7,(r7,r15,-1)
+	movf.w r4,(r4,r8,-2048)
+	movf.b r3,(r3,r7,2047)
+	movf.w r1,(r1,r1,1)
+	movf.b r7,(r7,r0,1473)
+	movf.w r2,(r0,r9,-1522)
+	movf.w r2,(r5,r1,480)
+	.text
+	.global movfgrgriipostinc
+movfgrgriipostinc:
+	movf.b r0,(r0,r0++,0)
+	movf.w r7,(r7,r15++,-1)
+	movf.w r4,(r4,r8++,-2048)
+	movf.b r3,(r3,r7++,2047)
+	movf.w r1,(r1,r1++,1)
+	movf.b r1,(r0,r2++,1398)
+	movf.w r4,(r0,r9++,-778)
+	movf.w r1,(r5,r14++,1564)
+	.text
+	.global movfgrgriipredec
+movfgrgriipredec:
+	movf.b r0,(r0,--r0,0)
+	movf.w r7,(r7,--r15,-1)
+	movf.w r4,(r4,--r8,-2048)
+	movf.b r3,(r3,--r7,2047)
+	movf.w r1,(r1,--r1,1)
+	movf.b r6,(r0,--r7,254)
+	movf.w r5,(r4,--r12,1673)
+	movf.b r0,(r0,--r10,-38)
+	.text
+	.global movfgriigr
+movfgriigr:
+	movf.b (r0,r0,0),r0
+	movf.w (r7,r15,-1),r7
+	movf.w (r4,r8,-2048),r4
+	movf.b (r3,r7,2047),r3
+	movf.w (r1,r1,1),r1
+	movf.w (r7,r2,-1636),r3
+	movf.w (r6,r12,1626),r1
+	movf.b (r3,r14,1540),r0
+	.text
+	.global movfgriipostincgr
+movfgriipostincgr:
+	movf.b (r0,r0++,0),r0
+	movf.w (r7,r15++,-1),r7
+	movf.w (r4,r8++,-2048),r4
+	movf.b (r3,r7++,2047),r3
+	movf.w (r1,r1++,1),r1
+	movf.b (r7,r13++,466),r3
+	movf.b (r3,r11++,250),r4
+	movf.b (r2,r10++,-1480),r7
+	.text
+	.global movfgriipredecgr
+movfgriipredecgr:
+	movf.b (r0,--r0,0),r0
+	movf.w (r7,--r15,-1),r7
+	movf.w (r4,--r8,-2048),r4
+	movf.b (r3,--r7,2047),r3
+	movf.w (r1,--r1,1),r1
+	movf.b (r5,--r10,-608),r0
+	movf.b (r1,--r11,831),r7
+	movf.w (r7,--r15,-2036),r6
+	.text
+	.global maskgrgr
+maskgrgr:
+	mask r0,r0
+	mask r15,r15
+	mask r8,r8
+	mask r7,r7
+	mask r1,r1
+	mask r4,r0
+	mask r6,r11
+	mask r8,r4
+	.text
+	.global maskgrimm16
+maskgrimm16:
+	mask r0,#0
+	mask r15,#65535
+	mask r8,#32768
+	mask r7,#32767
+	mask r1,#1
+	mask r7,#18153
+	mask r15,#7524
+	mask r14,#34349
+	.text
+	.global pushgr
+pushgr:
+	push r0
+	push r15
+	push r8
+	push r7
+	push r1
+	push r9
+	push r4
+	push r3
+	.text
+	.global popgr
+popgr:
+	pop r0
+	pop r15
+	pop r8
+	pop r7
+	pop r1
+	pop r3
+	pop r2
+	pop r12
+	.text
+	.global swpn
+swpn:
+	swpn r0
+	swpn r15
+	swpn r8
+	swpn r7
+	swpn r1
+	swpn r15
+	swpn r4
+	swpn r3
+	.text
+	.global swpb
+swpb:
+	swpb r0
+	swpb r15
+	swpb r8
+	swpb r7
+	swpb r1
+	swpb r2
+	swpb r12
+	swpb r2
+	.text
+	.global swpw
+swpw:
+	swpw r0,r0
+	swpw r15,r15
+	swpw r8,r8
+	swpw r7,r7
+	swpw r1,r1
+	swpw r12,r4
+	swpw r8,r2
+	swpw r5,r13
+	.text
+	.global andgrgr
+andgrgr:
+	and r0,r0
+	and r15,r15
+	and r8,r8
+	and r7,r7
+	and r1,r1
+	and r2,r2
+	and r15,r5
+	and r7,r5
+	.text
+	.global andimm8
+andimm8:
+	and Rx,#0
+	and Rx,#255
+	and Rx,#128
+	and Rx,#127
+	and Rx,#1
+	and Rx,#206
+	and Rx,#11
+	and Rx,#232
+	.text
+	.global andgrimm16
+andgrimm16:
+	and r0,#0
+	and r15,#65535
+	and r8,#32768
+	and r7,#32767
+	and r1,#1
+	and r10,#17229
+	and r11,#61451
+	and r5,#46925
+	.text
+	.global orgrgr
+orgrgr:
+	or r0,r0
+	or r15,r15
+	or r8,r8
+	or r7,r7
+	or r1,r1
+	or r3,r5
+	or r14,r15
+	or r5,r12
+	.text
+	.global orimm8
+orimm8:
+	or Rx,#0
+	or Rx,#255
+	or Rx,#128
+	or Rx,#127
+	or Rx,#1
+	or Rx,#4
+	or Rx,#38
+	or Rx,#52
+	.text
+	.global orgrimm16
+orgrimm16:
+	or r0,#0
+	or r15,#65535
+	or r8,#32768
+	or r7,#32767
+	or r1,#1
+	or r2,#64563
+	or r2,#18395
+	or r1,#63059
+	.text
+	.global xorgrgr
+xorgrgr:
+	xor r0,r0
+	xor r15,r15
+	xor r8,r8
+	xor r7,r7
+	xor r1,r1
+	xor r14,r1
+	xor r9,r9
+	xor r12,r8
+	.text
+	.global xorimm8
+xorimm8:
+	xor Rx,#0
+	xor Rx,#255
+	xor Rx,#128
+	xor Rx,#127
+	xor Rx,#1
+	xor Rx,#208
+	xor Rx,#126
+	xor Rx,#55
+	.text
+	.global xorgrimm16
+xorgrimm16:
+	xor r0,#0
+	xor r15,#65535
+	xor r8,#32768
+	xor r7,#32767
+	xor r1,#1
+	xor r15,#56437
+	xor r3,#901
+	xor r2,#37017
+	.text
+	.global notgr
+notgr:
+	not r0
+	not r15
+	not r8
+	not r7
+	not r1
+	not r4
+	not r3
+	not r3
+	.text
+	.global addgrgr
+addgrgr:
+	add r0,r0
+	add r15,r15
+	add r8,r8
+	add r7,r7
+	add r1,r1
+	add r12,r7
+	add r1,r10
+	add r14,r14
+	.text
+	.global addgrimm4
+addgrimm4:
+	add r0,#0
+	add r15,#15
+	add r8,#8
+	add r7,#7
+	add r1,#1
+	add r7,#0
+	add r10,#9
+	add r7,#8
+	.text
+	.global addimm8
+addimm8:
+	add Rx,#0
+	add Rx,#255
+	add Rx,#128
+	add Rx,#127
+	add Rx,#1
+	add Rx,#25
+	add Rx,#247
+	add Rx,#221
+	.text
+	.global addgrimm16
+addgrimm16:
+	add r0,#0
+	add r15,#255
+	add r8,#128
+	add r7,#127
+	add r1,#1
+	add r3,#99
+	add r0,#15
+	add r7,#214
+	.text
+	.global adcgrgr
+adcgrgr:
+	adc r0,r0
+	adc r15,r15
+	adc r8,r8
+	adc r7,r7
+	adc r1,r1
+	adc r2,r13
+	adc r14,r10
+	adc r2,r15
+	.text
+	.global adcgrimm4
+adcgrimm4:
+	adc r0,#0
+	adc r15,#15
+	adc r8,#8
+	adc r7,#7
+	adc r1,#1
+	adc r15,#1
+	adc r1,#3
+	adc r6,#11
+	.text
+	.global adcimm8
+adcimm8:
+	adc Rx,#0
+	adc Rx,#255
+	adc Rx,#128
+	adc Rx,#127
+	adc Rx,#1
+	adc Rx,#225
+	adc Rx,#75
+	adc Rx,#18
+	.text
+	.global adcgrimm16
+adcgrimm16:
+	adc r0,#0
+	adc r15,#65535
+	adc r8,#32768
+	adc r7,#32767
+	adc r1,#1
+	adc r13,#63129
+	adc r3,#23795
+	adc r11,#49245
+	.text
+	.global subgrgr
+subgrgr:
+	sub r0,r0
+	sub r15,r15
+	sub r8,r8
+	sub r7,r7
+	sub r1,r1
+	sub r8,r8
+	sub r9,r9
+	sub r9,r15
+	.text
+	.global subgrimm4
+subgrimm4:
+	sub r0,#0
+	sub r15,#15
+	sub r8,#8
+	sub r7,#7
+	sub r1,#1
+	sub r2,#15
+	sub r12,#9
+	sub r8,#4
+	.text
+	.global subimm8
+subimm8:
+	sub Rx,#0
+	sub Rx,#255
+	sub Rx,#128
+	sub Rx,#127
+	sub Rx,#1
+	sub Rx,#205
+	sub Rx,#153
+	sub Rx,#217
+	.text
+	.global subgrimm16
+subgrimm16:
+	sub r0,#0
+	sub r15,#65535
+	sub r8,#32768
+	sub r7,#32767
+	sub r1,#1
+	sub r3,#51895
+	sub r11,#23617
+	sub r10,#7754
+	.text
+	.global sbcgrgr
+sbcgrgr:
+	sbc r0,r0
+	sbc r15,r15
+	sbc r8,r8
+	sbc r7,r7
+	sbc r1,r1
+	sbc r11,r2
+	sbc r9,r1
+	sbc r4,r15
+	.text
+	.global sbcgrimm4
+sbcgrimm4:
+	sbc r0,#0
+	sbc r15,#15
+	sbc r8,#8
+	sbc r7,#7
+	sbc r1,#1
+	sbc r10,#11
+	sbc r11,#10
+	sbc r13,#10
+	.text
+	.global sbcgrimm8
+sbcgrimm8:
+	sbc Rx,#0
+	sbc Rx,#255
+	sbc Rx,#128
+	sbc Rx,#127
+	sbc Rx,#1
+	sbc Rx,#137
+	sbc Rx,#224
+	sbc Rx,#156
+	.text
+	.global sbcgrimm16
+sbcgrimm16:
+	sbc r0,#0
+	sbc r15,#65535
+	sbc r8,#32768
+	sbc r7,#32767
+	sbc r1,#1
+	sbc r0,#32507
+	sbc r7,#8610
+	sbc r14,#20373
+	.text
+	.global incgr
+incgr:
+	inc r0
+	inc r15
+	inc r8
+	inc r7
+	inc r1
+	inc r13
+	inc r1
+	inc r11
+	.text
+	.global incgrimm2
+incgrimm2:
+	inc r0,#0
+	inc r15,#3
+	inc r8,#2
+	inc r7,#1
+	inc r1,#1
+	inc r14,#1
+	inc r5,#0
+	inc r12,#3
+	.text
+	.global decgr
+decgr:
+	dec r0
+	dec r15
+	dec r8
+	dec r7
+	dec r1
+	dec r12
+	dec r8
+	dec r10
+	.text
+	.global decgrimm2
+decgrimm2:
+	dec r0,#0
+	dec r15,#3
+	dec r8,#2
+	dec r7,#1
+	dec r1,#1
+	dec r5,#0
+	dec r13,#0
+	dec r13,#2
+	.text
+	.global rrcgrgr
+rrcgrgr:
+	rrc r0,r0
+	rrc r15,r15
+	rrc r8,r8
+	rrc r7,r7
+	rrc r1,r1
+	rrc r8,r4
+	rrc r10,r14
+	rrc r15,r9
+	.text
+	.global rrcgrimm4
+rrcgrimm4:
+	rrc r0,#0
+	rrc r15,#15
+	rrc r8,#8
+	rrc r7,#7
+	rrc r1,#1
+	rrc r11,#3
+	rrc r14,#12
+	rrc r2,#15
+	.text
+	.global rlcgrgr
+rlcgrgr:
+	rlc r0,r0
+	rlc r15,r15
+	rlc r8,r8
+	rlc r7,r7
+	rlc r1,r1
+	rlc r15,r3
+	rlc r15,r7
+	rlc r15,r10
+	.text
+	.global rlcgrimm4
+rlcgrimm4:
+	rlc r0,#0
+	rlc r15,#15
+	rlc r8,#8
+	rlc r7,#7
+	rlc r1,#1
+	rlc r8,#2
+	rlc r2,#6
+	rlc r6,#10
+	.text
+	.global shrgrgr
+shrgrgr:
+	shr r0,r0
+	shr r15,r15
+	shr r8,r8
+	shr r7,r7
+	shr r1,r1
+	shr r13,r2
+	shr r7,r8
+	shr r6,r8
+	.text
+	.global shrgrimm
+shrgrimm:
+	shr r0,#0
+	shr r15,#15
+	shr r8,#8
+	shr r7,#7
+	shr r1,#1
+	shr r9,#13
+	shr r2,#7
+	shr r8,#8
+	.text
+	.global shlgrgr
+shlgrgr:
+	shl r0,r0
+	shl r15,r15
+	shl r8,r8
+	shl r7,r7
+	shl r1,r1
+	shl r2,r3
+	shl r0,r3
+	shl r2,r1
+	.text
+	.global shlgrimm
+shlgrimm:
+	shl r0,#0
+	shl r15,#15
+	shl r8,#8
+	shl r7,#7
+	shl r1,#1
+	shl r6,#13
+	shl r3,#6
+	shl r15,#15
+	.text
+	.global asrgrgr
+asrgrgr:
+	asr r0,r0
+	asr r15,r15
+	asr r8,r8
+	asr r7,r7
+	asr r1,r1
+	asr r5,r10
+	asr r3,r5
+	asr r6,r11
+	.text
+	.global asrgrimm
+asrgrimm:
+	asr r0,#0
+	asr r15,#15
+	asr r8,#8
+	asr r7,#7
+	asr r1,#1
+	asr r13,#4
+	asr r0,#13
+	asr r6,#3
+	.text
+	.global set1grimm
+set1grimm:
+	set1 r0,#0
+	set1 r15,#15
+	set1 r8,#8
+	set1 r7,#7
+	set1 r1,#1
+	set1 r6,#10
+	set1 r13,#1
+	set1 r13,#15
+	.text
+	.global set1grgr
+set1grgr:
+	set1 r0,r0
+	set1 r15,r15
+	set1 r8,r8
+	set1 r7,r7
+	set1 r1,r1
+	set1 r6,r0
+	set1 r6,r7
+	set1 r14,r2
+	.text
+	.global set1lmemimm
+set1lmemimm:
+	set1 0,#0
+	set1 255,#7
+	set1 128,#4
+	set1 127,#3
+	set1 1,#1
+	set1 244,#3
+	set1 55,#7
+	set1 252,#5
+	.text
+	.global set1hmemimm
+set1hmemimm:
+	set1 0x7f00+0,#0
+	set1 0x7f00+255,#7
+	set1 0x7f00+128,#4
+	set1 0x7f00+127,#3
+	set1 0x7f00+1,#1
+	set1 0x7f00+10,#3
+	set1 0x7f00+99,#4
+	set1 0x7f00+148,#3
+	.text
+	.global clr1grimm
+clr1grimm:
+	clr1 r0,#0
+	clr1 r15,#15
+	clr1 r8,#8
+	clr1 r7,#7
+	clr1 r1,#1
+	clr1 r12,#0
+	clr1 r8,#11
+	clr1 r7,#7
+	.text
+	.global clr1grgr
+clr1grgr:
+	clr1 r0,r0
+	clr1 r15,r15
+	clr1 r8,r8
+	clr1 r7,r7
+	clr1 r1,r1
+	clr1 r3,r3
+	clr1 r0,r1
+	clr1 r15,r0
+	.text
+	.global clr1lmemimm
+clr1lmemimm:
+	clr1 0,#0
+	clr1 255,#7
+	clr1 128,#4
+	clr1 127,#3
+	clr1 1,#1
+	clr1 114,#7
+	clr1 229,#4
+	clr1 86,#1
+	.text
+	.global clr1hmemimm
+clr1hmemimm:
+	clr1 0x7f00+0,#0
+	clr1 0x7f00+255,#7
+	clr1 0x7f00+128,#4
+	clr1 0x7f00+127,#3
+	clr1 0x7f00+1,#1
+	clr1 0x7f00+44,#3
+	clr1 0x7f00+212,#5
+	clr1 0x7f00+67,#7
+	.text
+	.global cbwgr
+cbwgr:
+	cbw r0
+	cbw r15
+	cbw r8
+	cbw r7
+	cbw r1
+	cbw r8
+	cbw r11
+	cbw r3
+	.text
+	.global revgr
+revgr:
+	rev r0
+	rev r15
+	rev r8
+	rev r7
+	rev r1
+	rev r1
+	rev r1
+	rev r14
+	.text
+	.global bgr
+bgr:
+	br r0
+	br r15
+	br r8
+	br r7
+	br r1
+	br r0
+	br r15
+	br r12
+	.text
+	.global jmp
+jmp:
+	jmp r0,r0
+	jmp r1,r15
+	jmp r1,r8
+	jmp r0,r7
+	jmp r1,r1
+	jmp r1,r7
+	jmp r1,r5
+	jmp r0,r12
+	.text
+	.global jmpf
+jmpf:
+	jmpf 0
+	jmpf 16777215
+	jmpf 8388608
+	jmpf 8388607
+	jmpf 1
+	jmpf 10731629
+	jmpf 15094866
+	jmpf 1464024
+	.text
+	.global callrgr
+callrgr:
+	callr r0
+	callr r15
+	callr r8
+	callr r7
+	callr r1
+	callr r1
+	callr r12
+	callr r8
+	.text
+	.global callgr
+callgr:
+	call r0,r0
+	call r1,r15
+	call r1,r8
+	call r0,r7
+	call r1,r1
+	call r1,r6
+	call r1,r14
+	call r0,r12
+	.text
+	.global callfimm
+callfimm:
+	callf 0
+	callf 16777215
+	callf 8388608
+	callf 8388607
+	callf 1
+	callf 13546070
+	callf 10837983
+	callf 15197875
+	.text
+	.global icallrgr
+icallrgr:
+	icallr r0
+	icallr r15
+	icallr r8
+	icallr r7
+	icallr r1
+	icallr r15
+	icallr r12
+	icallr r9
+	.text
+	.global icallgr
+icallgr:
+	icall r0,r0
+	icall r1,r15
+	icall r1,r8
+	icall r0,r7
+	icall r1,r1
+	icall r1,r10
+	icall r0,r15
+	icall r0,r10
+	.text
+	.global icallfimm
+icallfimm:
+	icallf 0
+	icallf 16777215
+	icallf 8388608
+	icallf 8388607
+	icallf 1
+	icallf 9649954
+	icallf 1979758
+	icallf 7661640
+	.text
+	.global iret
+iret:
+	iret
+	.text
+	.global ret
+ret:
+	ret
+	.text
+	.global mul
+mul:
+	mul
+	.text
+	.global div
+div:
+	div
+	.text
+	.global nop
+nop:
+	nop
+	ret
+	.text
+	.global halt
+halt:
+	halt
+	.text
+	.global hold
+hold:
+	hold
+	.text
+	.global brk
+brk:
+	brk
+	.text
+	.global bccgrgr
+bccgrgr:
+	bge r0,r0,0+(.+4)
+	bz r15,r15,-1+(.+4)
+	bpl r8,r8,-2048+(.+4)
+	bls r7,r7,2047+(.+4)
+	bnc r1,r1,1+(.+4)
+	bc r3,r13,1799+(.+4)
+	bge r1,r10,-2019+(.+4)
+	bz r0,r5,-1132+(.+4)
+	.text
+	.global bccgrimm8
+bccgrimm8:
+	bge r0,#0,0+(.+4)
+	bz r7,#255,-1+(.+4)
+	bpl r4,#128,-2048+(.+4)
+	bls r3,#127,2047+(.+4)
+	bnc r1,#1,1+(.+4)
+	bnc r3,#8,1473+(.+4)
+	bnz.b r5,#203,1619+(.+4)
+	bc r7,#225,978+(.+4)
+	.text
+	.global bccimm16
+bccimm16:
+	bge Rx,#0,0+(.+4)
+	bz Rx,#65535,-1+(.+4)
+	bpl Rx,#32768,-128+(.+4)
+	bls Rx,#32767,127+(.+4)
+	bnc Rx,#1,1+(.+4)
+	bz.b Rx,#30715,4+(.+4)
+	bnv Rx,#62266,-13+(.+4)
+	bnv Rx,#48178,108+(.+4)
+	.text
+	.global bngrimm4
+bngrimm4:
+	bn r0,#0,0+(.+4)
+	bn r15,#15,-1+(.+4)
+	bn r8,#8,-2048+(.+4)
+	bn r7,#7,2047+(.+4)
+	bn r1,#1,1+(.+4)
+	bn r11,#3,-1975+(.+4)
+	bn r15,#4,-1205+(.+4)
+	bn r10,#8,1691+(.+4)
+	.text
+	.global bngrgr
+bngrgr:
+	bn r0,r0,0+(.+4)
+	bn r15,r15,-1+(.+4)
+	bn r8,r8,-2048+(.+4)
+	bn r7,r7,2047+(.+4)
+	bn r1,r1,1+(.+4)
+	bn r4,r3,1181+(.+4)
+	bn r5,r2,77+(.+4)
+	bn r3,r7,631+(.+4)
+	.text
+	.global bnlmemimm
+bnlmemimm:
+	bn 0,#0,0+(.+4)
+	bn 255,#7,-1+(.+4)
+	bn 128,#4,-2048+(.+4)
+	bn 127,#3,2047+(.+4)
+	bn 1,#1,1+(.+4)
+	bn 153,#7,-847+(.+4)
+	bn 204,#0,-1881+(.+4)
+	bn 242,#7,1396+(.+4)
+	.text
+	.global bnhmemimm
+bnhmemimm:
+	bn 0x7f00+0,#0,0+(.+4)
+	bn 0x7f00+255,#7,-1+(.+4)
+	bn 0x7f00+128,#4,-2048+(.+4)
+	bn 0x7f00+127,#3,2047+(.+4)
+	bn 0x7f00+1,#1,1+(.+4)
+	bn 0x7f00+185,#3,-614+(.+4)
+	bn 0x7f00+105,#1,-668+(.+4)
+	bn 0x7f00+79,#7,1312+(.+4)
+	.text
+	.global bpgrimm4
+bpgrimm4:
+	bp r0,#0,0+(.+4)
+	bp r15,#15,-1+(.+4)
+	bp r8,#8,-2048+(.+4)
+	bp r7,#7,2047+(.+4)
+	bp r1,#1,1+(.+4)
+	bp r0,#12,1075+(.+4)
+	bp r1,#5,551+(.+4)
+	bp r6,#8,1588+(.+4)
+	.text
+	.global bpgrgr
+bpgrgr:
+	bp r0,r0,0+(.+4)
+	bp r15,r15,-1+(.+4)
+	bp r8,r8,-2048+(.+4)
+	bp r7,r7,2047+(.+4)
+	bp r1,r1,1+(.+4)
+	bp r4,r9,-614+(.+4)
+	bp r9,r10,-1360+(.+4)
+	bp r4,r1,407+(.+4)
+	.text
+	.global bplmemimm
+bplmemimm:
+	bp 0,#0,0+(.+4)
+	bp 255,#7,-1+(.+4)
+	bp 128,#4,-2048+(.+4)
+	bp 127,#3,2047+(.+4)
+	bp 1,#1,1+(.+4)
+	bp 193,#3,-398+(.+4)
+	bp 250,#2,-1553+(.+4)
+	bp 180,#6,579+(.+4)
+	.text
+	.global bphmemimm
+bphmemimm:
+	bp 0x7f00+0,#0,0+(.+4)
+	bp 0x7f00+255,#7,-1+(.+4)
+	bp 0x7f00+128,#4,-2048+(.+4)
+	bp 0x7f00+127,#3,2047+(.+4)
+	bp 0x7f00+1,#1,1+(.+4)
+	bp 0x7f00+195,#1,-432+(.+4)
+	bp 0x7f00+129,#5,-1508+(.+4)
+	bp 0x7f00+56,#3,1723+(.+4)
+	.text
+	.global bcc
+bcc:
+	bge 0+(.+2)
+	bz -1+(.+2)
+	bpl -128+(.+2)
+	bls 127+(.+2)
+	bnc 1+(.+2)
+	bnz.b 48+(.+2)
+	bnc -7+(.+2)
+	bnz.b 74+(.+2)
+	.text
+	.global br
+br:
+	br 0+(.+2)
+	br -2+(.+2)
+	br -2048+(.+2)
+	br 2046+(.+2)
+	br 1+(.+2)
+	br 1472+(.+2)
+	br 1618+(.+2)
+	br 978+(.+2)
+	.text
+	.global callrimm
+callrimm:
+	callr 0+(.+2)
+	callr -2+(.+2)
+	callr -2048+(.+2)
+	callr 2046+(.+2)
+	callr 1+(.+2)
+	callr 1472+(.+2)
+	callr 1618+(.+2)
+	callr 978+(.+2)
+EOF
+
+# Finally, generate the .d file.
+gentest allinsn
diff --git a/gas/testsuite/gas/xstormy16/gcc.d b/gas/testsuite/gas/xstormy16/gcc.d
new file mode 100644
index 0000000..ea65f88
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/gcc.d
@@ -0,0 +1,15 @@
+#as:
+#objdump: -dr
+#name: gcc
+
+.*: +file format .*
+
+Disassembly of section \.text:
+
+00000000 <\.text>:
+   0:	30 31 ff ff 	mov r0,#0xffff
+   4:	30 31 ff ff 	mov r0,#0xffff
+   8:	40 31 00 00 	add r0,#0x0
+			a: R_XSTORMY16_16	some_external_symbol
+   c:	30 31 00 00 	mov r0,#0x0
+			e: R_XSTORMY16_16	some_external_symbol
diff --git a/gas/testsuite/gas/xstormy16/gcc.s b/gas/testsuite/gas/xstormy16/gcc.s
new file mode 100644
index 0000000..a86bf6f
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/gcc.s
@@ -0,0 +1,4 @@
+	mov.w r0,#-1
+	mov.w r0,#0xFFFF
+	add r0,#some_external_symbol
+	mov.w r0,#some_external_symbol
diff --git a/gas/testsuite/gas/xstormy16/gcc.sh b/gas/testsuite/gas/xstormy16/gcc.sh
new file mode 100644
index 0000000..1eb8972
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/gcc.sh
@@ -0,0 +1,45 @@
+#/bin/sh
+# Generate test result data for xstormy16 GAS testing.
+# It is intended to be run in the testsuite source directory.
+#
+# Syntax: build.sh /path/to/build/gas
+
+if [ $# = 0 ] ; then
+  if [ ! -x ../gas/as-new ] ; then
+    echo "Usage: $0 [/path/to/gas/build]"
+  else
+    BUILD=`pwd`/../gas
+  fi
+else
+  BUILD=$1
+fi
+
+if [ ! -x $BUILD/as-new ] ; then
+  echo "$BUILD is not a gas build directory"
+  exit 1
+fi
+
+# Put results here, so we preserve the existing set for comparison.
+rm -rf tmpdir
+mkdir tmpdir
+cd tmpdir
+
+function gentest {
+    rm -f a.out
+    $BUILD/as-new ${1}.s -o a.out
+    echo "#as:" >${1}.d
+    echo "#objdump: -dr" >>${1}.d
+    echo "#name: $1" >>${1}.d
+    $BUILD/../binutils/objdump -dr a.out | 	sed -e 's/(/\\(/g'             -e 's/)/\\)/g'             -e 's/\$/\\$/g'             -e 's/\[/\\\[/g'             -e 's/\]/\\\]/g'             -e 's/[+]/\\+/g'             -e 's/[.]/\\./g'             -e 's/[*]/\\*/g' | 	sed -e 's/^.*file format.*$/.*: +file format .*/' 	>>${1}.d
+    rm -f a.out
+}
+
+# Now come all the testcases.
+cat > gcc.s <<EOF
+	mov.w r0,#-1
+	mov.w r0,#0xFFFF
+	add r0,#some_external_symbol
+EOF
+
+# Finally, generate the .d file.
+gentest gcc
diff --git a/gas/testsuite/gas/xstormy16/reloc-1.d b/gas/testsuite/gas/xstormy16/reloc-1.d
new file mode 100644
index 0000000..60848cd
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/reloc-1.d
@@ -0,0 +1,26 @@
+#as:
+#objdump: -rs
+#name: reloc-1
+
+.*: +file format .*
+
+RELOCATION RECORDS FOR \[\.text\]:
+OFFSET   TYPE              VALUE 
+0*000 R_XSTORMY16_16    global
+0*002 R_XSTORMY16_16    global\+0x00000003
+0*004 R_XSTORMY16_PC16  global\+0xfffffffc
+0*006 R_XSTORMY16_32    global
+0*00a R_XSTORMY16_32    global\+0x00000003
+0*00e R_XSTORMY16_PC32  global\+0xfffffff2
+0*012 R_XSTORMY16_8     global
+0*013 R_XSTORMY16_8     global\+0xffff8100
+0*014 R_XSTORMY16_8     global\+0x00000003
+0*015 R_XSTORMY16_PC8   global\+0xffffffeb
+0*016 R_XSTORMY16_16    dglobal
+0*018 R_XSTORMY16_16    dwglobal
+
+
+Contents of section \.text:
+ 0000 00000000 00000000 00000000 00000000  \................
+ 0010 00000000 00000000 0000               \..........      
+Contents of section \.data:
diff --git a/gas/testsuite/gas/xstormy16/reloc-1.s b/gas/testsuite/gas/xstormy16/reloc-1.s
new file mode 100644
index 0000000..4895406
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/reloc-1.s
@@ -0,0 +1,20 @@
+	.text
+	.hword global
+	.hword global+3
+	.hword global-.
+	.word global
+	.word global+3
+	.word global-.
+	.byte global
+	.byte global-0x7F00
+	.byte global+3
+	.byte global-.
+dglobal:
+dwglobal:
+	.globl dglobal
+	.globl dwglobal
+	.weak dwglobal
+	.hword dglobal
+	.hword dwglobal
+
+	
\ No newline at end of file
diff --git a/gas/testsuite/gas/xstormy16/reloc-2.d b/gas/testsuite/gas/xstormy16/reloc-2.d
new file mode 100644
index 0000000..490ee97
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/reloc-2.d
@@ -0,0 +1,56 @@
+#as:
+#objdump: -dr
+#name: reloc-2
+
+.*: +file format .*
+
+Disassembly of section \.text:
+
+00000000 <\.text>:
+   0:	10 30       	inc r0,#0x1
+   2:	00 e3       	set1 0x0,#0x1
+   4:	00 7c fc 1f 	bn 0x0,#0x1,0x4
+   8:	40 31 01 00 	add r0,#0x1
+   c:	08 71 01 00 	mov\.w r0,\(r0,1\)
+  10:	01 79 00 00 	mov\.w 0x1,#0x0
+  14:	01 47       	mov Rx,#0x1
+  16:	00 79 01 00 	mov\.w 0x0,#0x1
+  1a:	01 02 00 00 	jmpf 0x1
+  1e:	ff d0       	bge 0x1f
+  20:	fd c0 00 00 	bge Rx,#0x0,0x21
+  24:	00 0d fd 0f 	bge r0,r0,0x25
+  28:	fe 1f       	br 0x28
+  2a:	00 79 00 00 	mov\.w 0x0,#0x0
+			2a: R_XSTORMY16_8	global
+  2e:	00 47       	mov Rx,#0x0
+			2e: R_XSTORMY16_8	global
+  30:	00 79 00 00 	mov\.w 0x0,#0x0
+			32: R_XSTORMY16_16	global
+  34:	fe d0       	bge 0x34
+			34: R_XSTORMY16_PC8	global
+  36:	fc c0 00 00 	bge Rx,#0x0,0x36
+			36: R_XSTORMY16_PC8	global
+  3a:	00 0d fc 0f 	bge r0,r0,0x3a
+			3c: R_XSTORMY16_REL_12	global
+  3e:	fe 1f       	br 0x3e
+			3e: R_XSTORMY16_REL_12	global
+  40:	0a d0       	bge 0x4c
+  42:	06 c0 00 00 	bge Rx,#0x0,0x4c
+  46:	00 0d 02 00 	bge r0,r0,0x4c
+  4a:	00 10       	br 0x4c
+  4c:	fe d0       	bge 0x4c
+  4e:	fa c0 00 00 	bge Rx,#0x0,0x4c
+  52:	00 0d f6 0f 	bge r0,r0,0x4c
+  56:	f4 1f       	br 0x4c
+  58:	00 79 00 00 	mov\.w 0x0,#0x0
+			5a: R_XSTORMY16_16	global\+0x4
+  5c:	00 79 00 00 	mov\.w 0x0,#0x0
+			5e: R_XSTORMY16_16	\.text\+0x4c
+  60:	00 79 00 00 	mov\.w 0x0,#0x0
+			62: R_XSTORMY16_16	\.text\+0x50
+  64:	00 79 00 00 	mov\.w 0x0,#0x0
+			66: R_XSTORMY16_PC16	global\+0xffffff9c
+  68:	00 79 00 00 	mov\.w 0x0,#0x0
+			6a: R_XSTORMY16_PC16	global\+0xffffffb4
+  6c:	00 02 00 00 	jmpf 0x0
+			6c: R_XSTORMY16_24	global
diff --git a/gas/testsuite/gas/xstormy16/reloc-2.s b/gas/testsuite/gas/xstormy16/reloc-2.s
new file mode 100644
index 0000000..6fae78a
--- /dev/null
+++ b/gas/testsuite/gas/xstormy16/reloc-2.s
@@ -0,0 +1,48 @@
+	.text
+; check that forward references work for all operands.
+	inc r0,#fwd1
+	set1 0,#fwd1
+	bn 0,#fwd1,.
+	add r0,#fwd1
+	mov r0,(r0,fwd1)
+	mov fwd1,#0
+	mov rx,#fwd1
+	mov 0,#fwd1
+	jmpf fwd1
+	bge fwd1+.
+	bge Rx,#0,fwd1+.
+	bge r0,r0,fwd1+.
+	br fwd1+.
+fwd1	= 1
+
+; check that global references work for those operands that support them
+	.globl global
+	
+	mov global,#0
+	mov rx,#global
+	mov 0,#global
+;	jmpf global
+	bge global
+	bge Rx,#0,global
+	bge r0,r0,global
+	br global
+
+; check branch operations to local labels
+	bge .L1
+	bge Rx,#0,.L1
+	bge r0,r0,.L1
+	br .L1
+.L1:
+	bge .L1
+	bge Rx,#0,.L1
+	bge r0,r0,.L1
+	br .L1
+
+; check immediate operands thoroughly
+	mov 0,#global+4
+	mov 0,#.L1
+	mov 0,#.L1+4
+	mov 0,#global-.
+	mov 0,#global-.L1
+
+	jmpf global