From: Nick Clifton <nickc@redhat.com>
Date: Thu, 15 Jan 1998 01:48:51 +0000 (+0000)
Subject: Support for disassembling parallel instructions added.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=23cf992f4ac3a325ebf015b22955a359a986a488;p=binutils-gdb.git

Support for disassembling parallel instructions added.
Insn attributes hand patched until cgen can generate the correct values.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index b772d4ba0e9..0c631aa99c5 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,16 @@
+Wed Jan 14 17:37:03 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* m32r-dis.in: Generated file imported from cgen.
+	* cgen-asm.in: Formatting changes to improve readability.
+	* m32r-asm.c:  Formatting changes to improve readability.
+	* cgen-dis.c:  Formatting changes to improve readability.
+	* m32r-dis.c:  Add support for disassembling parallel
+	instructions. 
+	* m32r-opc.h:  Update with latest version generated by cgen.
+	* m32r-opc.c:  Update with latest version generated by cgen, plus
+	hand patches to allow attributes to work until cgen can generate
+	these correctly.
+	
 start-sanitize-r5900
 Tue Jan 13 09:21:56 1998  Jeffrey A Law  (law@cygnus.com)
 
diff --git a/opcodes/m32r-asm.c b/opcodes/m32r-asm.c
index fb028c20304..f63c3735b49 100644
--- a/opcodes/m32r-asm.c
+++ b/opcodes/m32r-asm.c
@@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include "sysdep.h"
 #include <ctype.h>
 #include <stdio.h>
 #include "ansidecl.h"
@@ -34,10 +35,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    compiled with GCC), or switch to macros, or use something else.
 */
 
-static const char *parse_insn_normal
-     PARAMS ((const struct cgen_insn *, const char **, struct cgen_fields *));
+static const char * parse_insn_normal
+     PARAMS ((const CGEN_INSN *, const char **, CGEN_FIELDS *));
 static void insert_insn_normal
-     PARAMS ((const struct cgen_insn *, struct cgen_fields *, cgen_insn_t *));
+     PARAMS ((const CGEN_INSN *, CGEN_FIELDS *, cgen_insn_t *));
 
 /* Default insertion routine.
 
@@ -119,393 +120,6 @@ insert_normal (value, attrs, start, length, shift, total_length, buffer)
 }
 
 /* -- assembler routines inserted here */
-/* -- asm.c */
-
-/* Handle shigh(), high().  */
-
-static const char *
-parse_h_hi16 (strp, opindex, min, max, valuep)
-     const char **strp;
-     int opindex;
-     unsigned long min, max;
-     unsigned long *valuep;
-{
-  const char *errmsg;
-
-  /* FIXME: Need # in assembler syntax (means '#' is optional).  */
-  if (**strp == '#')
-    ++*strp;
-
-  if (strncmp (*strp, "high(", 5) == 0)
-    {
-      *strp += 5;
-      /* FIXME: If value was a number, right shift by 16.  */
-      errmsg = cgen_parse_address (strp, opindex, BFD_RELOC_M32R_HI16_ULO, valuep);
-      if (**strp != ')')
-	return "missing `)'";
-      ++*strp;
-      return errmsg;
-    }
-  else if (strncmp (*strp, "shigh(", 6) == 0)
-    {
-      *strp += 6;
-      /* FIXME: If value was a number, right shift by 16 (+ sign test).  */
-      errmsg = cgen_parse_address (strp, opindex, BFD_RELOC_M32R_HI16_SLO, valuep);
-      if (**strp != ')')
-	return "missing `)'";
-      ++*strp;
-      return errmsg;
-    }
-
-  return cgen_parse_unsigned_integer (strp, opindex, min, max, valuep);
-}
-
-/* Handle low() in a signed context.  Also handle sda().
-   The signedness of the value doesn't matter to low(), but this also
-   handles the case where low() isn't present.  */
-
-static const char *
-parse_h_slo16 (strp, opindex, min, max, valuep)
-     const char **strp;
-     int opindex;
-     long min, max;
-     long *valuep;
-{
-  const char *errmsg;
-
-  /* FIXME: Need # in assembler syntax (means '#' is optional).  */
-  if (**strp == '#')
-    ++*strp;
-
-  if (strncmp (*strp, "low(", 4) == 0)
-    {
-      *strp += 4;
-      errmsg = cgen_parse_address (strp, opindex, BFD_RELOC_M32R_LO16, valuep);
-      if (**strp != ')')
-	return "missing `)'";
-      ++*strp;
-      return errmsg;
-    }
-
-  if (strncmp (*strp, "sda(", 4) == 0)
-    {
-      *strp += 4;
-      errmsg = cgen_parse_address (strp, opindex, BFD_RELOC_M32R_SDA16, valuep);
-      if (**strp != ')')
-	return "missing `)'";
-      ++*strp;
-      return errmsg;
-    }
-
-  return cgen_parse_signed_integer (strp, opindex, min, max, valuep);
-}
-
-/* Handle low() in an unsigned context.
-   The signedness of the value doesn't matter to low(), but this also
-   handles the case where low() isn't present.  */
-
-static const char *
-parse_h_ulo16 (strp, opindex, min, max, valuep)
-     const char **strp;
-     int opindex;
-     unsigned long min, max;
-     unsigned long *valuep;
-{
-  const char *errmsg;
-
-  /* FIXME: Need # in assembler syntax (means '#' is optional).  */
-  if (**strp == '#')
-    ++*strp;
-
-  if (strncmp (*strp, "low(", 4) == 0)
-    {
-      *strp += 4;
-      errmsg = cgen_parse_address (strp, opindex, BFD_RELOC_M32R_LO16, valuep);
-      if (**strp != ')')
-	return "missing `)'";
-      ++*strp;
-      return errmsg;
-    }
-
-  return cgen_parse_unsigned_integer (strp, opindex, min, max, valuep);
-}
-
-/* -- */
-
-/* Main entry point for operand parsing.
-
-   This function is basically just a big switch statement.  Earlier versions
-   used tables to look up the function to use, but
-   - if the table contains both assembler and disassembler functions then
-     the disassembler contains much of the assembler and vice-versa,
-   - there's a lot of inlining possibilities as things grow,
-   - using a switch statement avoids the function call overhead.
-
-   This function could be moved into `parse_insn_normal', but keeping it
-   separate makes clear the interface between `parse_insn_normal' and each of
-   the handlers.
-*/
-
-CGEN_INLINE const char *
-m32r_cgen_parse_operand (opindex, strp, fields)
-     int opindex;
-     const char **strp;
-     struct cgen_fields *fields;
-{
-  const char *errmsg;
-
-  switch (opindex)
-    {
-    case 0 :
-      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_gr, &fields->f_r2);
-      break;
-    case 1 :
-      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_gr, &fields->f_r1);
-      break;
-    case 2 :
-      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_gr, &fields->f_r1);
-      break;
-    case 3 :
-      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_gr, &fields->f_r2);
-      break;
-    case 4 :
-      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_cr, &fields->f_r2);
-      break;
-    case 5 :
-      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_cr, &fields->f_r1);
-      break;
-    case 6 :
-      errmsg = cgen_parse_signed_integer (strp, 6, -128, 127, &fields->f_simm8);
-      break;
-    case 7 :
-      errmsg = cgen_parse_signed_integer (strp, 7, -32768, 32767, &fields->f_simm16);
-      break;
-    case 8 :
-      errmsg = cgen_parse_unsigned_integer (strp, 8, 0, 15, &fields->f_uimm4);
-      break;
-    case 9 :
-      errmsg = cgen_parse_unsigned_integer (strp, 9, 0, 31, &fields->f_uimm5);
-      break;
-    case 10 :
-      errmsg = cgen_parse_unsigned_integer (strp, 10, 0, 65535, &fields->f_uimm16);
-      break;
-    case 11 :
-      errmsg = parse_h_hi16 (strp, 11, 0, 65535, &fields->f_hi16);
-      break;
-    case 12 :
-      errmsg = parse_h_slo16 (strp, 12, -32768, 32767, &fields->f_simm16);
-      break;
-    case 13 :
-      errmsg = parse_h_ulo16 (strp, 13, 0, 65535, &fields->f_uimm16);
-      break;
-    case 14 :
-      errmsg = cgen_parse_address (strp, 14, 0, &fields->f_uimm24);
-      break;
-    case 15 :
-      errmsg = cgen_parse_address (strp, 15, 0, &fields->f_disp8);
-      break;
-    case 16 :
-      errmsg = cgen_parse_address (strp, 16, 0, &fields->f_disp16);
-      break;
-    case 17 :
-      errmsg = cgen_parse_address (strp, 17, 0, &fields->f_disp24);
-      break;
-
-    default :
-      fprintf (stderr, "Unrecognized field %d while parsing.\n", opindex);
-      abort ();
-  }
-
-  return errmsg;
-}
-
-/* Main entry point for operand insertion.
-
-   This function is basically just a big switch statement.  Earlier versions
-   used tables to look up the function to use, but
-   - if the table contains both assembler and disassembler functions then
-     the disassembler contains much of the assembler and vice-versa,
-   - there's a lot of inlining possibilities as things grow,
-   - using a switch statement avoids the function call overhead.
-
-   This function could be moved into `parse_insn_normal', but keeping it
-   separate makes clear the interface between `parse_insn_normal' and each of
-   the handlers.  It's also needed by GAS to insert operands that couldn't be
-   resolved during parsing.
-*/
-
-CGEN_INLINE void
-m32r_cgen_insert_operand (opindex, fields, buffer)
-     int opindex;
-     struct cgen_fields *fields;
-     cgen_insn_t *buffer;
-{
-  switch (opindex)
-    {
-    case 0 :
-      insert_normal (fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 1 :
-      insert_normal (fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 2 :
-      insert_normal (fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 3 :
-      insert_normal (fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 4 :
-      insert_normal (fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 5 :
-      insert_normal (fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 6 :
-      insert_normal (fields->f_simm8, 0, 8, 8, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 7 :
-      insert_normal (fields->f_simm16, 0, 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 8 :
-      insert_normal (fields->f_uimm4, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 9 :
-      insert_normal (fields->f_uimm5, 0|(1<<CGEN_OPERAND_UNSIGNED), 11, 5, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 10 :
-      insert_normal (fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 11 :
-      insert_normal (fields->f_hi16, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 12 :
-      insert_normal (fields->f_simm16, 0, 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 13 :
-      insert_normal (fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 14 :
-      insert_normal (fields->f_uimm24, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_ABS_ADDR)|(1<<CGEN_OPERAND_UNSIGNED), 8, 24, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 15 :
-      insert_normal (fields->f_disp8, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 8, 8, 2, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 16 :
-      insert_normal (fields->f_disp16, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 16, 16, 2, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-    case 17 :
-      insert_normal (fields->f_disp24, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 8, 24, 2, CGEN_FIELDS_BITSIZE (fields), buffer);
-      break;
-
-    default :
-      fprintf (stderr, "Unrecognized field %d while building insn.\n",
-	       opindex);
-      abort ();
-  }
-}
-
-/* Main entry point for operand validation.
-
-   This function is called from GAS when it has fully resolved an operand
-   that couldn't be resolved during parsing.
-
-   The result is NULL for success or an error message (which may be
-   computed into a static buffer).
-*/
-
-CGEN_INLINE const char *
-m32r_cgen_validate_operand (opindex, fields)
-     int opindex;
-     const struct cgen_fields *fields;
-{
-  const char *errmsg = NULL;
-
-  switch (opindex)
-    {
-    case 0 :
-      /* nothing to do */
-      break;
-    case 1 :
-      /* nothing to do */
-      break;
-    case 2 :
-      /* nothing to do */
-      break;
-    case 3 :
-      /* nothing to do */
-      break;
-    case 4 :
-      /* nothing to do */
-      break;
-    case 5 :
-      /* nothing to do */
-      break;
-    case 6 :
-      errmsg = cgen_validate_signed_integer (fields->f_simm8, -128, 127);
-      break;
-    case 7 :
-      errmsg = cgen_validate_signed_integer (fields->f_simm16, -32768, 32767);
-      break;
-    case 8 :
-      errmsg = cgen_validate_unsigned_integer (fields->f_uimm4, 0, 15);
-      break;
-    case 9 :
-      errmsg = cgen_validate_unsigned_integer (fields->f_uimm5, 0, 31);
-      break;
-    case 10 :
-      errmsg = cgen_validate_unsigned_integer (fields->f_uimm16, 0, 65535);
-      break;
-    case 11 :
-      errmsg = cgen_validate_unsigned_integer (fields->f_hi16, 0, 65535);
-      break;
-    case 12 :
-      errmsg = cgen_validate_signed_integer (fields->f_simm16, -32768, 32767);
-      break;
-    case 13 :
-      errmsg = cgen_validate_unsigned_integer (fields->f_uimm16, 0, 65535);
-      break;
-    case 14 :
-      /* nothing to do */
-      break;
-    case 15 :
-      /* nothing to do */
-      break;
-    case 16 :
-      /* nothing to do */
-      break;
-    case 17 :
-      /* nothing to do */
-      break;
-
-    default :
-      fprintf (stderr, "Unrecognized field %d while validating operand.\n",
-	       opindex);
-      abort ();
-  }
-
-  return errmsg;
-}
-
-cgen_parse_fn *m32r_cgen_parse_handlers[] = {
-  0, /* default */
-  parse_insn_normal,
-};
-
-cgen_insert_fn *m32r_cgen_insert_handlers[] = {
-  0, /* default */
-  insert_insn_normal,
-};
-
-void
-m32r_cgen_init_asm (mach, endian)
-     int mach;
-     enum cgen_endian endian;
-{
-  m32r_cgen_init_tables (mach);
-  cgen_set_cpu (& m32r_cgen_opcode_data, mach, endian);
-  cgen_asm_init ();
-}
-
 
 /* Default insn parser.
 
@@ -523,32 +137,26 @@ m32r_cgen_init_asm (mach, endian)
 
 static const char *
 parse_insn_normal (insn, strp, fields)
-     const struct cgen_insn *insn;
+     const CGEN_INSN *insn;
      const char **strp;
-     struct cgen_fields *fields;
+     CGEN_FIELDS *fields;
 {
-  const struct cgen_syntax *syntax = CGEN_INSN_SYNTAX (insn);
+  const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
   const char *str = *strp;
   const char *errmsg;
+  const char *p;
   const unsigned char *syn;
 #ifdef CGEN_MNEMONIC_OPERANDS
   int past_opcode_p;
 #endif
 
-  /* If mnemonics are constant, they're not stored with the syntax string.  */
-#ifndef CGEN_MNEMONIC_OPERANDS
-  {
-    const char *p = syntax->mnemonic;
-
-    while (*p && *p == *str)
-      ++p, ++str;
-    if (*p || (*str && !isspace (*str)))
-      return "unrecognized instruction";
-
-    while (isspace (*str))
-      ++str;
-  }
-#endif
+  /* For now we assume the mnemonic is first (there are no leading operands).
+     We can parse it without needing to set up operand parsing.  */
+  p = CGEN_INSN_MNEMONIC (insn);
+  while (*p && *p == *str)
+    ++p, ++str;
+  if (*p || (*str && !isspace (*str)))
+    return "unrecognized instruction";
 
   CGEN_INIT_PARSE ();
   cgen_init_parse_operand ();
@@ -558,7 +166,12 @@ parse_insn_normal (insn, strp, fields)
 
   /* We don't check for (*str != '\0') here because we want to parse
      any trailing fake arguments in the syntax string.  */
-  for (syn = syntax->syntax; *syn != '\0'; )
+  syn = CGEN_SYNTAX_STRING (CGEN_INSN_SYNTAX (insn));
+  /* Mnemonics come first for now, ensure valid string.  */
+  if (! CGEN_SYNTAX_MNEMONIC_P (*syn))
+    abort ();
+  ++syn;
+  while (*syn != 0)
     {
       /* Non operand chars must match exactly.  */
       /* FIXME: Need to better handle whitespace.  */
@@ -617,16 +230,16 @@ parse_insn_normal (insn, strp, fields)
 
 static void
 insert_insn_normal (insn, fields, buffer)
-     const struct cgen_insn *insn;
-     struct cgen_fields *fields;
+     const CGEN_INSN *insn;
+     CGEN_FIELDS *fields;
      cgen_insn_t *buffer;
 {
-  const struct cgen_syntax *syntax = CGEN_INSN_SYNTAX (insn);
+  const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
   bfd_vma value;
   const unsigned char *syn;
 
   CGEN_INIT_INSERT ();
-  value = syntax->value;
+  value = CGEN_INSN_VALUE (insn);
 
   /* If we're recording insns as numbers (rather than a string of bytes),
      target byte order handling is deferred until later.  */
@@ -660,7 +273,7 @@ insert_insn_normal (insn, fields, buffer)
   /* ??? Rather than scanning the syntax string again, we could store
      in `fields' a null terminated list of the fields that are present.  */
 
-  for (syn = syntax->syntax; *syn != '\0'; ++syn)
+  for (syn = CGEN_SYNTAX_STRING (syntax); *syn != '\0'; ++syn)
     {
       if (CGEN_SYNTAX_CHAR_P (*syn))
 	continue;
@@ -677,10 +290,10 @@ insert_insn_normal (insn, fields, buffer)
    or NULL if an error occured (an error message will have already been
    printed).  */
 
-const struct cgen_insn *
+const CGEN_INSN *
 m32r_cgen_assemble_insn (str, fields, buf, errmsg)
      const char *str;
-     struct cgen_fields *fields;
+     CGEN_FIELDS *fields;
      cgen_insn_t *buf;
      char **errmsg;
 {
@@ -700,7 +313,7 @@ m32r_cgen_assemble_insn (str, fields, buf, errmsg)
   start = str;
   for ( ; ilist != NULL ; ilist = CGEN_ASM_NEXT_INSN (ilist))
     {
-      const struct cgen_insn *insn = ilist->insn;
+      const CGEN_INSN *insn = ilist->insn;
 
 #if 0 /* not needed as unsupported opcodes shouldn't be in the hash lists */
       /* Is this insn supported by the selected cpu?  */
@@ -758,12 +371,15 @@ m32r_cgen_assemble_insn (str, fields, buf, errmsg)
    This lets GAS parse registers for us.
    ??? Interesting idea but not currently used.  */
 
+/* Record each member of OPVALS in the assembler's symbol table.
+   FIXME: Not currently used.  */
+
 void
 m32r_cgen_asm_hash_keywords (opvals)
-     struct cgen_keyword *opvals;
+     CGEN_KEYWORD *opvals;
 {
-  struct cgen_keyword_search search = cgen_keyword_search_init (opvals, NULL);
-  const struct cgen_keyword_entry *ke;
+  CGEN_KEYWORD_SEARCH search = cgen_keyword_search_init (opvals, NULL);
+  const CGEN_KEYWORD_ENTRY *ke;
 
   while ((ke = cgen_keyword_search_next (&search)) != NULL)
     {
diff --git a/opcodes/m32r-dis.c b/opcodes/m32r-dis.c
index 7f290195346..d320d53acb7 100644
--- a/opcodes/m32r-dis.c
+++ b/opcodes/m32r-dis.c
@@ -21,11 +21,12 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
 #include "dis-asm.h"
-#include "m32r-opc.h"
 #include "bfd.h"
+#include "m32r-opc.h"
 
 /* ??? The layout of this stuff is still work in progress.
    For speed in assembly/disassembly, we use inline functions.  That of course
@@ -45,9 +46,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static int print_insn PARAMS ((bfd_vma, disassemble_info *, char *, int));
 
 static int extract_insn_normal
-     PARAMS ((const struct cgen_insn *, void *, cgen_insn_t, struct cgen_fields *));
+     PARAMS ((const CGEN_INSN *, void *, cgen_insn_t, CGEN_FIELDS *));
 static void print_insn_normal
-     PARAMS ((void *, const struct cgen_insn *, struct cgen_fields *, bfd_vma, int));
+     PARAMS ((void *, const CGEN_INSN *, CGEN_FIELDS *, bfd_vma, int));
+
+CGEN_INLINE void
+m32r_cgen_print_operand
+     PARAMS ((int opindex, disassemble_info * info, CGEN_FIELDS * fields, void const * attrs, bfd_vma pc, int length));
+
 
 /* Default extraction routine.
 
@@ -56,11 +62,14 @@ static void print_insn_normal
 
 static int
 extract_normal (buf_ctrl, insn_value, attrs, start, length, shift, total_length, valuep)
-     void *buf_ctrl;
-     cgen_insn_t insn_value;
+     void *       buf_ctrl;
+     cgen_insn_t  insn_value;
      unsigned int attrs;
-     int start, length, shift, total_length;
-     long *valuep;
+     int          start;
+     int          length;
+     int          shift;
+     int          total_length;
+     long *       valuep;
 {
   long value;
 
@@ -85,7 +94,7 @@ extract_normal (buf_ctrl, insn_value, attrs, start, length, shift, total_length,
   else
     value <<= shift;
 
-  *valuep = value;
+  * valuep = value;
   return 1;
 }
 
@@ -93,13 +102,13 @@ extract_normal (buf_ctrl, insn_value, attrs, start, length, shift, total_length,
 
 static void
 print_normal (dis_info, value, attrs, pc, length)
-     void *dis_info;
-     long value;
-     unsigned int attrs;
+     void *        dis_info;
+     long          value;
+     unsigned int  attrs;
      unsigned long pc; /* FIXME: should be bfd_vma */
-     int length;
+     int           length;
 {
-  disassemble_info *info = dis_info;
+  disassemble_info * info = dis_info;
 
   /* Print the operand as directed by the attributes.  */
   if (attrs & CGEN_ATTR_MASK (CGEN_OPERAND_FAKE))
@@ -120,264 +129,19 @@ print_normal (dis_info, value, attrs, pc, length)
 
 static void
 print_keyword (dis_info, keyword_table, value, attrs)
-     void *dis_info;
-     struct cgen_keyword *keyword_table;
-     long value;
-     CGEN_ATTR *attrs;
+     void *         dis_info;
+     CGEN_KEYWORD * keyword_table;
+     long           value;
+     CGEN_ATTR *    attrs;
 {
-  disassemble_info *info = dis_info;
-  const struct cgen_keyword_entry *ke;
+  disassemble_info * info = dis_info;
+  const CGEN_KEYWORD_ENTRY * ke;
 
   ke = cgen_keyword_lookup_value (keyword_table, value);
-  if (ke != NULL)
-    (*info->fprintf_func) (info->stream, "%s", ke->name);
-  else
-    (*info->fprintf_func) (info->stream, "???");
+  info->fprintf_func (info->stream, "%s", ke == NULL ? "???" : ke->name);
 }
 
 /* -- disassembler routines inserted here */
-/* -- dis.c */
-
-#undef CGEN_PRINT_INSN
-#define CGEN_PRINT_INSN my_print_insn
-
-static int
-my_print_insn (pc, info, buf, buflen)
-     bfd_vma pc;
-     disassemble_info *info;
-     char *buf;
-     int buflen;
-{
-  unsigned long insn_value;
-
-  /* 32 bit insn?  */
-  if ((pc & 3) == 0 && (buf[0] & 0x80) != 0)
-    return print_insn (pc, info, buf, buflen);
-
-  /* Print the first insn.  */
-  if ((pc & 3) == 0)
-    {
-      if (print_insn (pc, info, buf, 16) == 0)
-	(*info->fprintf_func) (info->stream, UNKNOWN_INSN_MSG);
-      buf += 2;
-    }
-
-  if (buf[0] & 0x80)
-    {
-      /* Parallel.  */
-      (*info->fprintf_func) (info->stream, " || ");
-      buf[0] &= 0x7f;
-    }
-  else
-    (*info->fprintf_func) (info->stream, " -> ");
-
-  /* The "& 3" is to ensure the branch address is computed correctly
-     [if it is a branch].  */
-  if (print_insn (pc & ~ (bfd_vma) 3, info, buf, 16) == 0)
-    (*info->fprintf_func) (info->stream, UNKNOWN_INSN_MSG);
-
-  return (pc & 3) ? 2 : 4;
-}
-
-/* -- */
-
-/* Main entry point for operand extraction.
-
-   This function is basically just a big switch statement.  Earlier versions
-   used tables to look up the function to use, but
-   - if the table contains both assembler and disassembler functions then
-     the disassembler contains much of the assembler and vice-versa,
-   - there's a lot of inlining possibilities as things grow,
-   - using a switch statement avoids the function call overhead.
-
-   This function could be moved into `print_insn_normal', but keeping it
-   separate makes clear the interface between `print_insn_normal' and each of
-   the handlers.
-*/
-
-CGEN_INLINE int
-m32r_cgen_extract_operand (opindex, buf_ctrl, insn_value, fields)
-     int opindex;
-     void *buf_ctrl;
-     cgen_insn_t insn_value;
-     struct cgen_fields *fields;
-{
-  int length;
-
-  switch (opindex)
-    {
-    case 0 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r2);
-      break;
-    case 1 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r1);
-      break;
-    case 2 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r1);
-      break;
-    case 3 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r2);
-      break;
-    case 4 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r2);
-      break;
-    case 5 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r1);
-      break;
-    case 6 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0, 8, 8, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_simm8);
-      break;
-    case 7 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0, 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_simm16);
-      break;
-    case 8 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm4);
-      break;
-    case 9 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 11, 5, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm5);
-      break;
-    case 10 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm16);
-      break;
-    case 11 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_hi16);
-      break;
-    case 12 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0, 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_simm16);
-      break;
-    case 13 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm16);
-      break;
-    case 14 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_ABS_ADDR)|(1<<CGEN_OPERAND_UNSIGNED), 8, 24, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm24);
-      break;
-    case 15 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 8, 8, 2, CGEN_FIELDS_BITSIZE (fields), &fields->f_disp8);
-      break;
-    case 16 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 16, 16, 2, CGEN_FIELDS_BITSIZE (fields), &fields->f_disp16);
-      break;
-    case 17 :
-      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 8, 24, 2, CGEN_FIELDS_BITSIZE (fields), &fields->f_disp24);
-      break;
-
-    default :
-      fprintf (stderr, "Unrecognized field %d while decoding insn.\n",
-	       opindex);
-      abort ();
-    }
-
-  return length;
-}
-
-/* Main entry point for printing operands.
-
-   This function is basically just a big switch statement.  Earlier versions
-   used tables to look up the function to use, but
-   - if the table contains both assembler and disassembler functions then
-     the disassembler contains much of the assembler and vice-versa,
-   - there's a lot of inlining possibilities as things grow,
-   - using a switch statement avoids the function call overhead.
-
-   This function could be moved into `print_insn_normal', but keeping it
-   separate makes clear the interface between `print_insn_normal' and each of
-   the handlers.
-*/
-
-CGEN_INLINE void
-m32r_cgen_print_operand (opindex, info, fields, attrs, pc, length)
-     int opindex;
-     disassemble_info *info;
-     struct cgen_fields *fields;
-     int attrs;
-     bfd_vma pc;
-     int length;
-{
-  switch (opindex)
-    {
-    case 0 :
-      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED));
-      break;
-    case 1 :
-      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED));
-      break;
-    case 2 :
-      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED));
-      break;
-    case 3 :
-      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED));
-      break;
-    case 4 :
-      print_keyword (info, & m32r_cgen_opval_h_cr, fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED));
-      break;
-    case 5 :
-      print_keyword (info, & m32r_cgen_opval_h_cr, fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED));
-      break;
-    case 6 :
-      print_normal (info, fields->f_simm8, 0, pc, length);
-      break;
-    case 7 :
-      print_normal (info, fields->f_simm16, 0, pc, length);
-      break;
-    case 8 :
-      print_normal (info, fields->f_uimm4, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
-      break;
-    case 9 :
-      print_normal (info, fields->f_uimm5, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
-      break;
-    case 10 :
-      print_normal (info, fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
-      break;
-    case 11 :
-      print_normal (info, fields->f_hi16, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
-      break;
-    case 12 :
-      print_normal (info, fields->f_simm16, 0, pc, length);
-      break;
-    case 13 :
-      print_normal (info, fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
-      break;
-    case 14 :
-      print_normal (info, fields->f_uimm24, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_ABS_ADDR)|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
-      break;
-    case 15 :
-      print_normal (info, fields->f_disp8, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), pc, length);
-      break;
-    case 16 :
-      print_normal (info, fields->f_disp16, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), pc, length);
-      break;
-    case 17 :
-      print_normal (info, fields->f_disp24, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), pc, length);
-      break;
-
-    default :
-      fprintf (stderr, "Unrecognized field %d while printing insn.\n",
-	       opindex);
-    abort ();
-  }
-}
-
-cgen_extract_fn *m32r_cgen_extract_handlers[] = {
-  0, /* default */
-  extract_insn_normal,
-};
-
-cgen_print_fn *m32r_cgen_print_handlers[] = {
-  0, /* default */
-  print_insn_normal,
-};
-
-
-void
-m32r_cgen_init_dis (mach, endian)
-     int mach;
-     enum cgen_endian endian;
-{
-  m32r_cgen_init_tables (mach);
-  cgen_set_cpu (& m32r_cgen_opcode_data, mach, endian);
-  cgen_dis_init ();
-}
-
 
 /* Default insn extractor.
 
@@ -387,42 +151,33 @@ m32r_cgen_init_dis (mach, endian)
 
 static int
 extract_insn_normal (insn, buf_ctrl, insn_value, fields)
-     const struct cgen_insn *insn;
-     void *buf_ctrl;
-     cgen_insn_t insn_value;
-     struct cgen_fields *fields;
+     const CGEN_INSN *  insn;
+     void *             buf_ctrl;
+     cgen_insn_t        insn_value;
+     CGEN_FIELDS *      fields;
 {
-  const struct cgen_syntax *syntax = CGEN_INSN_SYNTAX (insn);
-  const unsigned char *syn;
+  const CGEN_SYNTAX *   syntax = CGEN_INSN_SYNTAX (insn);
+  const unsigned char * syn;
 
-  /* ??? Some of the operand extract routines need to know the insn length,
-     which might be computed as we go.  Set a default value and it'll be
-     modified as necessary.  */
   CGEN_FIELDS_BITSIZE (fields) = CGEN_INSN_BITSIZE (insn);
 
   CGEN_INIT_EXTRACT ();
 
-  for (syn = syntax->syntax; *syn; ++syn)
+  for (syn = CGEN_SYNTAX_STRING (syntax); * syn; ++ syn)
     {
       int length;
 
-      if (CGEN_SYNTAX_CHAR_P (*syn))
+      if (CGEN_SYNTAX_CHAR_P (* syn))
 	continue;
 
-      length = m32r_cgen_extract_operand (CGEN_SYNTAX_FIELD (*syn),
+      length = m32r_cgen_extract_operand (CGEN_SYNTAX_FIELD (* syn),
 					   buf_ctrl, insn_value, fields);
       if (length == 0)
 	return 0;
     }
 
-  /* We recognized and successfully extracted this insn.
-     If a length is recorded with this insn, it has a fixed length.
-     Otherwise we require the syntax string to have a fake operand which
-     sets the `length' field in `flds'.  */
-  /* FIXME: wip */
-  if (syntax->length > 0)
-    return syntax->length;
-  return fields->length;
+  /* We recognized and successfully extracted this insn.  */
+  return CGEN_INSN_BITSIZE (insn);
 }
 
 /* Default insn printer.
@@ -433,28 +188,33 @@ extract_insn_normal (insn, buf_ctrl, insn_value, fields)
 
 static void
 print_insn_normal (dis_info, insn, fields, pc, length)
-     void *dis_info;
-     const struct cgen_insn *insn;
-     struct cgen_fields *fields;
-     bfd_vma pc;
-     int length;
+     void *             dis_info;
+     const CGEN_INSN *  insn;
+     CGEN_FIELDS *      fields;
+     bfd_vma            pc;
+     int                length;
 {
-  const struct cgen_syntax *syntax = CGEN_INSN_SYNTAX (insn);
-  disassemble_info *info = dis_info;
-  const unsigned char *syn;
+  const CGEN_SYNTAX *   syntax = CGEN_INSN_SYNTAX (insn);
+  disassemble_info *    info = dis_info;
+  const unsigned char * syn;
 
   CGEN_INIT_PRINT ();
 
-  for (syn = syntax->syntax; *syn; ++syn)
+  for (syn = CGEN_SYNTAX_STRING (syntax); * syn; ++ syn)
     {
-      if (CGEN_SYNTAX_CHAR_P (*syn))
+      if (CGEN_SYNTAX_MNEMONIC_P (* syn))
+	{
+	  info->fprintf_func (info->stream, "%s", CGEN_INSN_MNEMONIC (insn));
+	  continue;
+	}
+      if (CGEN_SYNTAX_CHAR_P (* syn))
 	{
-	  (*info->fprintf_func) (info->stream, "%c", CGEN_SYNTAX_CHAR (*syn));
+	  info->fprintf_func (info->stream, "%c", CGEN_SYNTAX_CHAR (* syn));
 	  continue;
 	}
 
       /* We have an operand.  */
-      m32r_cgen_print_operand (CGEN_SYNTAX_FIELD (*syn), info,
+      m32r_cgen_print_operand (CGEN_SYNTAX_FIELD (* syn), info,
 				fields, CGEN_INSN_ATTRS (insn), pc, length);
     }
 }
@@ -471,15 +231,16 @@ print_insn_normal (dis_info, insn, fields, pc, length)
 
 static int
 print_insn (pc, info, buf, buflen)
-     bfd_vma pc;
-     disassemble_info *info;
-     char *buf;
-     int buflen;
+     bfd_vma            pc;
+     disassemble_info * info;
+     char *             buf;
+     int                buflen;
 {
-  int i;
-  unsigned long insn_value;
-  const CGEN_INSN_LIST *insn_list;
-
+  int                    i;
+  unsigned long          insn_value;
+  const CGEN_INSN_LIST * insn_list;
+  int                    extra_bytes;
+  
   switch (buflen)
     {
     case 8:
@@ -495,16 +256,52 @@ print_insn (pc, info, buf, buflen)
       abort ();
     }
 
+  /* Special case - a 32 bit instruction which is actually two 16 bit instructions
+     being executed in parallel.  */
+  if (buflen == 32
+      && ((insn_value & 0x80008000) == 0x00008000))
+    {
+      if (info->endian == BFD_ENDIAN_BIG)
+	{
+	  static char buf2 [4];
+	  
+	  print_insn (pc, info, buf, 16);
+
+	  info->fprintf_func (info->stream, " || ");
+
+	  buf2 [0] = buf [2] & ~ 0x80;
+	  buf2 [1] = buf [3];
+	  buf2 [2] = 0;
+	  buf2 [3] = 0;
+	  buf = buf2;
+	  
+	  insn_value <<= 17;
+	  insn_value >>= 1;
+	}
+      else
+	{
+	  print_insn (pc, info, buf + 2, 16);
+
+	  info->fprintf_func (info->stream, " || ");
+
+	  insn_value &= 0x7fff;
+	}
+
+      pc += 2;
+      extra_bytes = 2;
+    }
+  else
+    extra_bytes = 0;
+  
   /* The instructions are stored in hash lists.
      Pick the first one and keep trying until we find the right one.  */
 
   insn_list = CGEN_DIS_LOOKUP_INSN (buf, insn_value);
+
   while (insn_list != NULL)
     {
-      const CGEN_INSN *insn = insn_list->insn;
-      const struct cgen_syntax *syntax = CGEN_INSN_SYNTAX (insn);
-      struct cgen_fields fields;
-      int length;
+      const CGEN_INSN *   insn = insn_list->insn;
+      unsigned long       value;
 
 #if 0 /* not needed as insn shouldn't be in hash lists if not supported */
       /* Supported by this cpu?  */
@@ -512,28 +309,43 @@ print_insn (pc, info, buf, buflen)
 	continue;
 #endif
 
+      /* If we are looking at a 16 bit insn we may have to adjust the value being examined.  */
+      value = insn_value;
+      if (CGEN_INSN_BITSIZE (insn) == 16)
+	{
+	/* If this is a big endian target,
+	   and we have read 32 bits for the instruction value,
+	   then we must examine the top 16 bits, not the bottom.  */
+	  if (buflen == 32 && info->endian == BFD_ENDIAN_BIG)
+	    value >>= 16;
+	}
+      
       /* Basic bit mask must be correct.  */
       /* ??? May wish to allow target to defer this check until the extract
 	 handler.  */
-      if ((insn_value & syntax->mask) == syntax->value)
+      if ((value & CGEN_INSN_MASK (insn)) == CGEN_INSN_VALUE (insn))
 	{
+	  CGEN_FIELDS fields;
+	  int         length;
+	  
 	  /* Printing is handled in two passes.  The first pass parses the
 	     machine insn and extracts the fields.  The second pass prints
 	     them.  */
 
-	  length = (*CGEN_EXTRACT_FN (insn)) (insn, NULL, insn_value, &fields);
+	  length = CGEN_EXTRACT_FN (insn) (insn, NULL, value, & fields);
 	  if (length > 0)
 	    {
-	      (*CGEN_PRINT_FN (insn)) (info, insn, &fields, pc, length);
+	      CGEN_PRINT_FN (insn) (info, insn, & fields, pc, length);
+	      
 	      /* length is in bits, result is in bytes */
-	      return length / 8;
+	      return (length / 8) + extra_bytes;
 	    }
 	}
-
+      
       insn_list = CGEN_DIS_NEXT_INSN (insn_list);
     }
 
-  return 0;
+  return extra_bytes;
 }
 
 /* Main entry point.
@@ -542,44 +354,58 @@ print_insn (pc, info, buf, buflen)
 
 int
 print_insn_m32r (pc, info)
-     bfd_vma pc;
-     disassemble_info *info;
+     bfd_vma            pc;
+     disassemble_info * info;
 {
-  char buffer[CGEN_MAX_INSN_SIZE];
-  int status, length;
-  static int initialized = 0;
-  static int current_mach = 0;
-  static int current_big_p = 0;
-  int mach = info->mach;
-  int big_p = info->endian == BFD_ENDIAN_BIG;
+  char       buffer [CGEN_MAX_INSN_SIZE];
+  int        status;
+  int        length;
+  static int initialized    = 0;
+  static int current_mach   = 0;
+  static int current_bigend = 0;
+  int        mach           = info->mach;
+  int        bigend         = info->endian == BFD_ENDIAN_BIG;
 
   /* If we haven't initialized yet, or if we've switched cpu's, initialize.  */
-  if (!initialized || mach != current_mach || big_p != current_big_p)
+  if (!initialized || mach != current_mach || bigend != current_bigend)
     {
-      initialized = 1;
-      current_mach = mach;
-      current_big_p = big_p;
-      m32r_cgen_init_dis (mach, big_p ? CGEN_ENDIAN_BIG : CGEN_ENDIAN_LITTLE);
+      initialized    = 1;
+      current_mach   = mach;
+      current_bigend = bigend;
+      
+      m32r_cgen_init_dis (mach, bigend ? CGEN_ENDIAN_BIG : CGEN_ENDIAN_LITTLE);
     }
 
   /* Read enough of the insn so we can look it up in the hash lists.  */
 
-  status = (*info->read_memory_func) (pc, buffer, CGEN_BASE_INSN_SIZE, info);
+  status = info->read_memory_func (pc, buffer, CGEN_BASE_INSN_SIZE, info);
   if (status != 0)
     {
-      (*info->memory_error_func) (status, pc, info);
+      /* Try reading a 16 bit instruction.  */
+      info->bytes_per_chunk = 2;
+      status = info->read_memory_func (pc, buffer, CGEN_BASE_INSN_SIZE / 2, info);
+      buffer [2] = buffer [3] = 0;
+    }
+  if (status != 0)
+    {
+      info->memory_error_func (status, pc, info);
       return -1;
     }
 
   /* We try to have as much common code as possible.
      But at this point some targets need to take over.  */
   /* ??? Some targets may need a hook elsewhere.  Try to avoid this,
-     but if not possible, try to move this hook elsewhere rather than
+     but if not possible try to move this hook elsewhere rather than
      have two hooks.  */
   length = CGEN_PRINT_INSN (pc, info, buffer, CGEN_BASE_INSN_BITSIZE);
+  
   if (length)
     return length;
 
-  (*info->fprintf_func) (info->stream, UNKNOWN_INSN_MSG);
+  info->fprintf_func (info->stream, UNKNOWN_INSN_MSG);
+  
   return CGEN_DEFAULT_INSN_SIZE;
 }
+
+/* Get the generate machine specific code.  */
+#include "m32r-dis.in"
diff --git a/opcodes/m32r-dis.in b/opcodes/m32r-dis.in
new file mode 100644
index 00000000000..3e5fb7fe4df
--- /dev/null
+++ b/opcodes/m32r-dis.in
@@ -0,0 +1,252 @@
+/* -- dis.c */
+
+#undef CGEN_PRINT_INSN
+#define CGEN_PRINT_INSN my_print_insn
+
+static int
+my_print_insn (pc, info, buf, buflen)
+     bfd_vma pc;
+     disassemble_info *info;
+     char *buf;
+     int buflen;
+{
+  /* 32 bit insn?  */
+  if ((pc & 3) == 0 && (buf[0] & 0x80) != 0)
+    return print_insn (pc, info, buf, buflen);
+
+  /* Print the first insn.  */
+  if ((pc & 3) == 0)
+    {
+      if (print_insn (pc, info, buf, 16) == 0)
+	(*info->fprintf_func) (info->stream, UNKNOWN_INSN_MSG);
+      buf += 2;
+    }
+
+  if (buf[0] & 0x80)
+    {
+      /* Parallel.  */
+      (*info->fprintf_func) (info->stream, " || ");
+      buf[0] &= 0x7f;
+    }
+  else
+    (*info->fprintf_func) (info->stream, " -> ");
+
+  /* The "& 3" is to ensure the branch address is computed correctly
+     [if it is a branch].  */
+  if (print_insn (pc & ~ (bfd_vma) 3, info, buf, 16) == 0)
+    (*info->fprintf_func) (info->stream, UNKNOWN_INSN_MSG);
+
+  return (pc & 3) ? 2 : 4;
+}
+
+/* -- */
+
+/* Main entry point for operand extraction.
+
+   This function is basically just a big switch statement.  Earlier versions
+   used tables to look up the function to use, but
+   - if the table contains both assembler and disassembler functions then
+     the disassembler contains much of the assembler and vice-versa,
+   - there's a lot of inlining possibilities as things grow,
+   - using a switch statement avoids the function call overhead.
+
+   This function could be moved into `print_insn_normal', but keeping it
+   separate makes clear the interface between `print_insn_normal' and each of
+   the handlers.
+*/
+
+CGEN_INLINE int
+m32r_cgen_extract_operand (opindex, buf_ctrl, insn_value, fields)
+     int opindex;
+     void *buf_ctrl;
+     cgen_insn_t insn_value;
+     CGEN_FIELDS *fields;
+{
+  int length;
+
+  switch (opindex)
+    {
+    case M32R_OPERAND_SR :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r2);
+      break;
+    case M32R_OPERAND_DR :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r1);
+      break;
+    case M32R_OPERAND_SRC1 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r1);
+      break;
+    case M32R_OPERAND_SRC2 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r2);
+      break;
+    case M32R_OPERAND_SCR :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r2);
+      break;
+    case M32R_OPERAND_DCR :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_r1);
+      break;
+    case M32R_OPERAND_SIMM8 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0, 8, 8, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_simm8);
+      break;
+    case M32R_OPERAND_SIMM16 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0, 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_simm16);
+      break;
+    case M32R_OPERAND_UIMM4 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 4, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm4);
+      break;
+    case M32R_OPERAND_UIMM5 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 11, 5, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm5);
+      break;
+    case M32R_OPERAND_UIMM16 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm16);
+      break;
+    case M32R_OPERAND_ACC_S :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 2, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_acc_s);
+      break;
+    case M32R_OPERAND_ACC :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 8, 1, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_acc);
+      break;
+    case M32R_OPERAND_HI16 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_hi16);
+      break;
+    case M32R_OPERAND_SLO16 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0, 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_simm16);
+      break;
+    case M32R_OPERAND_ULO16 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm16);
+      break;
+    case M32R_OPERAND_UIMM24 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_ABS_ADDR)|(1<<CGEN_OPERAND_UNSIGNED), 8, 24, 0, CGEN_FIELDS_BITSIZE (fields), &fields->f_uimm24);
+      break;
+    case M32R_OPERAND_DISP8 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 8, 8, 2, CGEN_FIELDS_BITSIZE (fields), &fields->f_disp8);
+      break;
+    case M32R_OPERAND_DISP16 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 16, 16, 2, CGEN_FIELDS_BITSIZE (fields), &fields->f_disp16);
+      break;
+    case M32R_OPERAND_DISP24 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), 8, 24, 2, CGEN_FIELDS_BITSIZE (fields), &fields->f_disp24);
+      break;
+
+    default :
+      fprintf (stderr, "Unrecognized field %d while decoding insn.\n",
+	       opindex);
+      abort ();
+    }
+
+  return length;
+}
+
+/* Main entry point for printing operands.
+
+   This function is basically just a big switch statement.  Earlier versions
+   used tables to look up the function to use, but
+   - if the table contains both assembler and disassembler functions then
+     the disassembler contains much of the assembler and vice-versa,
+   - there's a lot of inlining possibilities as things grow,
+   - using a switch statement avoids the function call overhead.
+
+   This function could be moved into `print_insn_normal', but keeping it
+   separate makes clear the interface between `print_insn_normal' and each of
+   the handlers.
+*/
+
+CGEN_INLINE void
+m32r_cgen_print_operand (opindex, info, fields, attrs, pc, length)
+     int opindex;
+     disassemble_info *info;
+     CGEN_FIELDS *fields;
+     void const * attrs;
+     bfd_vma pc;
+     int length;
+{
+  switch (opindex)
+    {
+    case M32R_OPERAND_SR :
+      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_DR :
+      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_SRC1 :
+      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_SRC2 :
+      print_keyword (info, & m32r_cgen_opval_h_gr, fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_SCR :
+      print_keyword (info, & m32r_cgen_opval_h_cr, fields->f_r2, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_DCR :
+      print_keyword (info, & m32r_cgen_opval_h_cr, fields->f_r1, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_SIMM8 :
+      print_normal (info, fields->f_simm8, 0, pc, length);
+      break;
+    case M32R_OPERAND_SIMM16 :
+      print_normal (info, fields->f_simm16, 0, pc, length);
+      break;
+    case M32R_OPERAND_UIMM4 :
+      print_normal (info, fields->f_uimm4, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
+      break;
+    case M32R_OPERAND_UIMM5 :
+      print_normal (info, fields->f_uimm5, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
+      break;
+    case M32R_OPERAND_UIMM16 :
+      print_normal (info, fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
+      break;
+    case M32R_OPERAND_ACC_S :
+      print_keyword (info, & m32r_cgen_opval_h_accums, fields->f_acc_s, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_ACC :
+      print_keyword (info, & m32r_cgen_opval_h_accums, fields->f_acc, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+    case M32R_OPERAND_HI16 :
+      print_normal (info, fields->f_hi16, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
+      break;
+    case M32R_OPERAND_SLO16 :
+      print_normal (info, fields->f_simm16, 0, pc, length);
+      break;
+    case M32R_OPERAND_ULO16 :
+      print_normal (info, fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
+      break;
+    case M32R_OPERAND_UIMM24 :
+      print_normal (info, fields->f_uimm24, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_ABS_ADDR)|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
+      break;
+    case M32R_OPERAND_DISP8 :
+      print_normal (info, fields->f_disp8, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), pc, length);
+      break;
+    case M32R_OPERAND_DISP16 :
+      print_normal (info, fields->f_disp16, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), pc, length);
+      break;
+    case M32R_OPERAND_DISP24 :
+      print_normal (info, fields->f_disp24, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), pc, length);
+      break;
+
+    default :
+      fprintf (stderr, "Unrecognized field %d while printing insn.\n",
+	       opindex);
+    abort ();
+  }
+}
+
+cgen_extract_fn *m32r_cgen_extract_handlers[] = {
+  0, /* default */
+  extract_insn_normal,
+};
+
+cgen_print_fn *m32r_cgen_print_handlers[] = {
+  0, /* default */
+  print_insn_normal,
+};
+
+
+void
+m32r_cgen_init_dis (mach, endian)
+     int mach;
+     enum cgen_endian endian;
+{
+  m32r_cgen_init_tables (mach);
+  cgen_set_cpu (& m32r_cgen_opcode_data, mach, endian);
+  cgen_dis_init ();
+}
+
diff --git a/opcodes/m32r-opc.c b/opcodes/m32r-opc.c
index 9e1cc88b61a..36ce392c83f 100644
--- a/opcodes/m32r-opc.c
+++ b/opcodes/m32r-opc.c
@@ -1,4 +1,4 @@
-/* CGEN support code for m32r.
+/* CGEN opcode support for m32r.
 
 This file is machine generated.
 
@@ -23,24 +23,72 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 
-#include "config.h"
+#include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
 #include "libiberty.h"
 #include "bfd.h"
 #include "m32r-opc.h"
 
-struct cgen_keyword_entry m32r_cgen_opval_mach_entries[] = {
-  { "m32r", 0 },
-  { "test", 1 }
+/* Attributes.  */
+
+static const CGEN_ATTR_ENTRY MACH_attr[] = {
+  { "m32r", MACH_M32R },
+  { "m32rx", MACH_M32RX },
+  { 0, 0 }
+};
+
+static const CGEN_ATTR_ENTRY PIPE_attr[] = {
+  { "NONE", PIPE_NONE },
+  { "O", PIPE_O },
+  { "S", PIPE_S },
+  { "OS", PIPE_OS },
+  { 0, 0 }
+};
+
+const CGEN_ATTR_TABLE m32r_cgen_operand_attr_table[] = {
+  { "ABS-ADDR", NULL },
+  { "FAKE", NULL },
+  { "NEGATIVE", NULL },
+  { "PC", NULL },
+  { "PCREL-ADDR", NULL },
+  { "RELAX", NULL },
+  { "RELOC", NULL },
+  { "SIGN-OPT", NULL },
+  { "UNSIGNED", NULL },
+  { 0, 0 }
+};
+
+const CGEN_ATTR_TABLE m32r_cgen_insn_attr_table[] = {
+  { "MACH", & MACH_attr[0] },
+  { "PIPE", & PIPE_attr[0] },
+  { "ALIAS", NULL },
+  { "COND-CTI", NULL },
+  { "FILL-SLOT", NULL },
+  { "PARALLEL", NULL },
+  { "RELAX", NULL },
+  { "RELAX-BC", NULL },
+  { "RELAX-BCL", NULL },
+  { "RELAX-BL", NULL },
+  { "RELAX-BNC", NULL },
+  { "RELAX-BNCL", NULL },
+  { "RELAX-BRA", NULL },
+  { "RELAXABLE", NULL },
+  { "UNCOND-CTI", NULL },
+  { 0, 0 }
 };
 
-struct cgen_keyword m32r_cgen_opval_mach = {
+CGEN_KEYWORD_ENTRY m32r_cgen_opval_mach_entries[] = {
+  { "m32r", MACH_M32R },
+  { "m32rx", MACH_M32RX }
+};
+
+CGEN_KEYWORD m32r_cgen_opval_mach = {
   & m32r_cgen_opval_mach_entries[0],
   2
 };
 
-struct cgen_keyword_entry m32r_cgen_opval_h_gr_entries[] = {
+CGEN_KEYWORD_ENTRY m32r_cgen_opval_h_gr_entries[] = {
   { "fp", 13 },
   { "lr", 14 },
   { "sp", 15 },
@@ -62,12 +110,12 @@ struct cgen_keyword_entry m32r_cgen_opval_h_gr_entries[] = {
   { "r15", 15 }
 };
 
-struct cgen_keyword m32r_cgen_opval_h_gr = {
+CGEN_KEYWORD m32r_cgen_opval_h_gr = {
   & m32r_cgen_opval_h_gr_entries[0],
   19
 };
 
-struct cgen_keyword_entry m32r_cgen_opval_h_cr_entries[] = {
+CGEN_KEYWORD_ENTRY m32r_cgen_opval_h_cr_entries[] = {
   { "psw", 0 },
   { "cbr", 1 },
   { "spi", 2 },
@@ -82,14 +130,24 @@ struct cgen_keyword_entry m32r_cgen_opval_h_cr_entries[] = {
   { "cr6", 6 }
 };
 
-struct cgen_keyword m32r_cgen_opval_h_cr = {
+CGEN_KEYWORD m32r_cgen_opval_h_cr = {
   & m32r_cgen_opval_h_cr_entries[0],
   12
 };
 
+CGEN_KEYWORD_ENTRY m32r_cgen_opval_h_accums_entries[] = {
+  { "a0", 0 },
+  { "a1", 1 }
+};
+
+CGEN_KEYWORD m32r_cgen_opval_h_accums = {
+  & m32r_cgen_opval_h_accums_entries[0],
+  2
+};
+
 
 static CGEN_HW_ENTRY m32r_cgen_hw_entries[] = {
-  { & m32r_cgen_hw_entries[1], "pc", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[1], "h-pc", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
   { & m32r_cgen_hw_entries[2], "h-memory", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
   { & m32r_cgen_hw_entries[3], "h-sint", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
   { & m32r_cgen_hw_entries[4], "h-uint", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
@@ -101,18 +159,22 @@ static CGEN_HW_ENTRY m32r_cgen_hw_entries[] = {
   { & m32r_cgen_hw_entries[10], "h-gr", CGEN_ASM_KEYWORD /*FIXME*/, & m32r_cgen_opval_h_gr },
   { & m32r_cgen_hw_entries[11], "h-cr", CGEN_ASM_KEYWORD /*FIXME*/, & m32r_cgen_opval_h_cr },
   { & m32r_cgen_hw_entries[12], "h-accum", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
-  { & m32r_cgen_hw_entries[13], "h-cond", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
-  { & m32r_cgen_hw_entries[14], "h-sm", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
-  { & m32r_cgen_hw_entries[15], "h-bsm", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
-  { & m32r_cgen_hw_entries[16], "h-ie", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
-  { & m32r_cgen_hw_entries[17], "h-bie", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
-  { & m32r_cgen_hw_entries[18], "h-bcond", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[13], "h-accums", CGEN_ASM_KEYWORD /*FIXME*/, & m32r_cgen_opval_h_accums },
+  { & m32r_cgen_hw_entries[14], "h-abort", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[15], "h-cond", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[16], "h-sm", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[17], "h-bsm", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[18], "h-ie", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[19], "h-bie", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
+  { & m32r_cgen_hw_entries[20], "h-bcond", CGEN_ASM_KEYWORD /*FIXME*/, 0 },
   { NULL, "h-bpc", CGEN_ASM_KEYWORD /*FIXME*/, 0 }
 };
 
 
-const struct cgen_operand m32r_cgen_operand_table[CGEN_NUM_OPERANDS] =
+const CGEN_OPERAND m32r_cgen_operand_table[CGEN_NUM_OPERANDS] =
 {
+/* pc: program counter */
+  { "pc", 0, 0, { 0, 0|(1<<CGEN_OPERAND_FAKE)|(1<<CGEN_OPERAND_PC), { 0 } }  },
 /* sr: source register */
   { "sr", 12, 4, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* dr: destination register */
@@ -135,6 +197,10 @@ const struct cgen_operand m32r_cgen_operand_table[CGEN_NUM_OPERANDS] =
   { "uimm5", 11, 5, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* uimm16: 16 bit unsigned immediate */
   { "uimm16", 16, 16, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+/* acc-s: accumulator register */
+  { "acc-s", 12, 2, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+/* acc: accumulator reg (d) */
+  { "acc", 8, 1, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* hi16: high 16 bit immediate, sign optional */
   { "hi16", 16, 16, { 0, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* slo16: 16 bit signed immediate, for low() */
@@ -149,650 +215,1176 @@ const struct cgen_operand m32r_cgen_operand_table[CGEN_NUM_OPERANDS] =
   { "disp16", 16, 16, { 0, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), { 0 } }  },
 /* disp24: 24 bit displacement */
   { "disp24", 8, 24, { 0, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), { 0 } }  },
+/* condbit: condition bit */
+  { "condbit", 0, 0, { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
+/* accum: accumulator */
+  { "accum", 0, 0, { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
+/* abort-parallel-execution: abort parallel execution */
+  { "abort-parallel-execution", 0, 0, { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
+};
+
+#define OP 1 /* syntax value for mnemonic */
+
+static const CGEN_SYNTAX syntax_table[] = {
+/* <op> $dr,$sr */
+/*   0 */  { OP, ' ', 130, ',', 129, 0 },
+/* <op> $dr,$sr,$slo16 */
+/*   1 */  { OP, ' ', 130, ',', 129, ',', 143, 0 },
+/* <op> $dr,$sr,$uimm16 */
+/*   2 */  { OP, ' ', 130, ',', 129, ',', 139, 0 },
+/* <op> $dr,$sr,$ulo16 */
+/*   3 */  { OP, ' ', 130, ',', 129, ',', 144, 0 },
+/* <op> $dr,$simm8 */
+/*   4 */  { OP, ' ', 130, ',', 135, 0 },
+/* <op> $dr,$sr,$simm16 */
+/*   5 */  { OP, ' ', 130, ',', 129, ',', 136, 0 },
+/* <op> $disp8 */
+/*   6 */  { OP, ' ', 146, 0 },
+/* <op> $disp24 */
+/*   7 */  { OP, ' ', 148, 0 },
+/* <op> $src1,$src2,$disp16 */
+/*   8 */  { OP, ' ', 131, ',', 132, ',', 147, 0 },
+/* <op> $src2,$disp16 */
+/*   9 */  { OP, ' ', 132, ',', 147, 0 },
+/* <op> $src1,$src2 */
+/*  10 */  { OP, ' ', 131, ',', 132, 0 },
+/* <op> $src2,$simm16 */
+/*  11 */  { OP, ' ', 132, ',', 136, 0 },
+/* <op> $src2,$uimm16 */
+/*  12 */  { OP, ' ', 132, ',', 139, 0 },
+/* <op> $src2 */
+/*  13 */  { OP, ' ', 132, 0 },
+/* <op> $sr */
+/*  14 */  { OP, ' ', 129, 0 },
+/* <op> $dr,@$sr */
+/*  15 */  { OP, ' ', 130, ',', '@', 129, 0 },
+/* <op> $dr,@($sr) */
+/*  16 */  { OP, ' ', 130, ',', '@', '(', 129, ')', 0 },
+/* <op> $dr,@($slo16,$sr) */
+/*  17 */  { OP, ' ', 130, ',', '@', '(', 143, ',', 129, ')', 0 },
+/* <op> $dr,@($sr,$slo16) */
+/*  18 */  { OP, ' ', 130, ',', '@', '(', 129, ',', 143, ')', 0 },
+/* <op> $dr,@$sr+ */
+/*  19 */  { OP, ' ', 130, ',', '@', 129, '+', 0 },
+/* <op> $dr,$uimm24 */
+/*  20 */  { OP, ' ', 130, ',', 145, 0 },
+/* <op> $dr,$slo16 */
+/*  21 */  { OP, ' ', 130, ',', 143, 0 },
+/* <op> $src1,$src2,$acc */
+/*  22 */  { OP, ' ', 131, ',', 132, ',', 141, 0 },
+/* <op> $dr */
+/*  23 */  { OP, ' ', 130, 0 },
+/* <op> $dr,$accs */
+/*  24 */  { OP, ' ', 130, ',', 141, 0 },
+/* <op> $dr,$scr */
+/*  25 */  { OP, ' ', 130, ',', 133, 0 },
+/* <op> $src1 */
+/*  26 */  { OP, ' ', 131, 0 },
+/* <op> $src1,$accs */
+/*  27 */  { OP, ' ', 131, ',', 141, 0 },
+/* <op> $sr,$dcr */
+/*  28 */  { OP, ' ', 129, ',', 134, 0 },
+/* <op> */
+/*  29 */  { OP, 0 },
+/* <op> $acc-s */
+/*  30 */  { OP, ' ', 141, 0 },
+/* <op> $dr,$hi16 */
+/*  31 */  { OP, ' ', 130, ',', 142, 0 },
+/* <op> $dr,$uimm5 */
+/*  32 */  { OP, ' ', 130, ',', 138, 0 },
+/* <op> $src1,@$src2 */
+/*  33 */  { OP, ' ', 131, ',', '@', 132, 0 },
+/* <op> $src1,@($src2) */
+/*  34 */  { OP, ' ', 131, ',', '@', '(', 132, ')', 0 },
+/* <op> $src1,@($slo16,$src2) */
+/*  35 */  { OP, ' ', 131, ',', '@', '(', 143, ',', 132, ')', 0 },
+/* <op> $src1,@($src2,$slo16) */
+/*  36 */  { OP, ' ', 131, ',', '@', '(', 132, ',', 143, ')', 0 },
+/* <op> $src1,@+$src2 */
+/*  37 */  { OP, ' ', 131, ',', '@', '+', 132, 0 },
+/* <op> $src1,@-$src2 */
+/*  38 */  { OP, ' ', 131, ',', '@', '-', 132, 0 },
+/* <op> $uimm4 */
+/*  39 */  { OP, ' ', 137, 0 },
+/* <op> $dr,$src2 */
+/*  40 */  { OP, ' ', 130, ',', 132, 0 },
+};
+
+#undef OP
+
+static const CGEN_FORMAT format_table[] = {
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr. */
+/*   0 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.slo16. */
+/*   1 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-uimm16.uimm16. */
+/*   2 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-uimm16.ulo16. */
+/*   3 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-simm8.simm8. */
+/*   4 */  { 16, 16, 0xf000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.simm16. */
+/*   5 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.number.f-disp8.disp8. */
+/*   6 */  { 16, 16, 0xff00 },
+/* f-op1.number.f-r1.number.f-disp24.disp24. */
+/*   7 */  { 32, 32, 0xff000000 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2.f-disp16.disp16. */
+/*   8 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2.f-disp16.disp16. */
+/*   9 */  { 32, 32, 0xfff00000 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2. */
+/*  10 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2.f-simm16.simm16. */
+/*  11 */  { 32, 32, 0xfff00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2.f-uimm16.uimm16. */
+/*  12 */  { 32, 32, 0xfff00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2. */
+/*  13 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.number. */
+/*  14 */  { 32, 32, 0xf0f0ffff },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.sr. */
+/*  15 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.dr.f-uimm24.uimm24. */
+/*  16 */  { 32, 32, 0xf0000000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.number.f-simm16.slo16. */
+/*  17 */  { 32, 32, 0xf0ff0000 },
+/* f-op1.number.f-r1.src1.f-acc.acc.f-op23.number.f-r2.src2. */
+/*  18 */  { 16, 16, 0xf070 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.number. */
+/*  19 */  { 16, 16, 0xf0ff },
+/* f-op1.number.f-r1.dr.f-op2.number.f-acc-s.acc-s.f-op3.number. */
+/*  20 */  { 16, 16, 0xf0f3 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.scr. */
+/*  21 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.number. */
+/*  22 */  { 16, 16, 0xf0ff },
+/* f-op1.number.f-r1.src1.f-op2.number.f-acc-s.acc-s.f-op3.number. */
+/*  23 */  { 16, 16, 0xf0f3 },
+/* f-op1.number.f-r1.dcr.f-op2.number.f-r2.sr. */
+/*  24 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.number. */
+/*  25 */  { 16, 16, 0xffff },
+/* f-op1.number.f-r1.number.f-op2.number.f-acc-s.acc-s.f-op3.number. */
+/*  26 */  { 16, 16, 0xfff3 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.number.f-hi16.hi16. */
+/*  27 */  { 32, 32, 0xf0ff0000 },
+/* f-op1.number.f-r1.dr.f-shift-op2.number.f-uimm5.uimm5. */
+/*  28 */  { 16, 16, 0xf0e0 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2.f-simm16.slo16. */
+/*  29 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-uimm4.uimm4. */
+/*  30 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.src2.f-uimm16.number. */
+/*  31 */  { 32, 32, 0xf0f0ffff },
 };
 
-const struct cgen_insn m32r_cgen_insn_table_entries[CGEN_NUM_INSNS] = {
+#define A(a) (1 << CGEN_CAT3 (CGEN_INSN,_,a))
+#define SYN(n) (& syntax_table[n])
+#define FMT(n) (& format_table[n])
+
+const CGEN_INSN m32r_cgen_insn_table_entries[CGEN_NUM_INSNS] = {
 /* null first entry, end of all hash chains */
-  { { 0 }, { 0 } },
+  { { 0 }, 0 },
 /* add $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "add $dr,$sr", "add", "add", {'a', 'd', 'd', ' ', 129, ',', 128, }, 0xf0f0, 0xa0, 16 }
+    { 1, 1, 1, 1 },
+    "add", "add", SYN (0), FMT (0), 0xa0,
+    { 2, 0|A(PARALLEL), { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* add3 $dr,$sr,$slo16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "add3 $dr,$sr,$slo16", "add3", "add3", {'a', 'd', 'd', '3', ' ', 129, ',', 128, ',', 140, }, 0xf0f00000, 0x80a00000, 32 }
+    { 1, 1, 1, 1 },
+    "add3", "add3", SYN (1), FMT (1), 0x80a00000,
+    { 2, 0, { 0 } }
   },
 /* and $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "and $dr,$sr", "and", "and", {'a', 'n', 'd', ' ', 129, ',', 128, }, 0xf0f0, 0xc0, 16 }
+    { 1, 1, 1, 1 },
+    "and", "and", SYN (0), FMT (0), 0xc0,
+    { 2, 0|A(PARALLEL), { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* and3 $dr,$sr,$uimm16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "and3 $dr,$sr,$uimm16", "and3", "and3", {'a', 'n', 'd', '3', ' ', 129, ',', 128, ',', 138, }, 0xf0f00000, 0x80c00000, 32 }
+    { 1, 1, 1, 1 },
+    "and3", "and3", SYN (2), FMT (2), 0x80c00000,
+    { 2, 0, { 0 } }
   },
 /* or $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "or $dr,$sr", "or", "or", {'o', 'r', ' ', 129, ',', 128, }, 0xf0f0, 0xe0, 16 }
+    { 1, 1, 1, 1 },
+    "or", "or", SYN (0), FMT (0), 0xe0,
+    { 2, 0|A(PARALLEL), { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* or3 $dr,$sr,$ulo16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "or3 $dr,$sr,$ulo16", "or3", "or3", {'o', 'r', '3', ' ', 129, ',', 128, ',', 141, }, 0xf0f00000, 0x80e00000, 32 }
+    { 1, 1, 1, 1 },
+    "or3", "or3", SYN (3), FMT (3), 0x80e00000,
+    { 2, 0, { 0 } }
   },
 /* xor $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "xor $dr,$sr", "xor", "xor", {'x', 'o', 'r', ' ', 129, ',', 128, }, 0xf0f0, 0xd0, 16 }
+    { 1, 1, 1, 1 },
+    "xor", "xor", SYN (0), FMT (0), 0xd0,
+    { 2, 0|A(PARALLEL), { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* xor3 $dr,$sr,$uimm16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "xor3 $dr,$sr,$uimm16", "xor3", "xor3", {'x', 'o', 'r', '3', ' ', 129, ',', 128, ',', 138, }, 0xf0f00000, 0x80d00000, 32 }
+    { 1, 1, 1, 1 },
+    "xor3", "xor3", SYN (2), FMT (2), 0x80d00000,
+    { 2, 0, { 0 } }
   },
 /* addi $dr,$simm8 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "addi $dr,$simm8", "addi", "addi", {'a', 'd', 'd', 'i', ' ', 129, ',', 134, }, 0xf000, 0x4000, 16 }
+    { 1, 1, 1, 1 },
+    "addi", "addi", SYN (4), FMT (4), 0x4000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* addv $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "addv $dr,$sr", "addv", "addv", {'a', 'd', 'd', 'v', ' ', 129, ',', 128, }, 0xf0f0, 0x80, 16 }
+    { 1, 1, 1, 1 },
+    "addv", "addv", SYN (0), FMT (0), 0x80,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* addv3 $dr,$sr,$simm16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "addv3 $dr,$sr,$simm16", "addv3", "addv3", {'a', 'd', 'd', 'v', '3', ' ', 129, ',', 128, ',', 135, }, 0xf0f00000, 0x80800000, 32 }
+    { 1, 1, 1, 1 },
+    "addv3", "addv3", SYN (5), FMT (5), 0x80800000,
+    { 2, 0, { 0 } }
   },
 /* addx $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "addx $dr,$sr", "addx", "addx", {'a', 'd', 'd', 'x', ' ', 129, ',', 128, }, 0xf0f0, 0x90, 16 }
+    { 1, 1, 1, 1 },
+    "addx", "addx", SYN (0), FMT (0), 0x90,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* bc $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_RELAX_BC)|(1<<CGEN_INSN_RELAXABLE)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bc $disp8", "bc8", "bc", {'b', 'c', ' ', 143, }, 0xff00, 0x7c00, 16 }
+    { 1, 1, 1, 1 },
+    "bc8", "bc", SYN (6), FMT (6), 0x7c00,
+    { 2, 0|A(RELAX_BC)|A(RELAXABLE)|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bc.s $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bc.s $disp8", "bc8.s", "bc", {'b', 'c', '.', 's', ' ', 143, }, 0xff00, 0x7c00, 16 }
+    { 1, 1, 1, 1 },
+    "bc8.s", "bc.s", SYN (6), FMT (6), 0x7c00,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bc $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_RELAX_BC)|(1<<CGEN_INSN_RELAX)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bc $disp24", "bc24", "bc", {'b', 'c', ' ', 145, }, 0xff000000, 0xfc000000, 32 }
+    { 1, 1, 1, 1 },
+    "bc24", "bc", SYN (7), FMT (7), 0xfc000000,
+    { 2, 0|A(RELAX_BC)|A(RELAX)|A(COND_CTI), { 0 } }
   },
 /* bc.l $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bc.l $disp24", "bc24.l", "bc", {'b', 'c', '.', 'l', ' ', 145, }, 0xff000000, 0xfc000000, 32 }
+    { 1, 1, 1, 1 },
+    "bc24.l", "bc.l", SYN (7), FMT (7), 0xfc000000,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { 0 } }
   },
 /* beq $src1,$src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "beq $src1,$src2,$disp16", "beq", "beq", {'b', 'e', 'q', ' ', 130, ',', 131, ',', 144, }, 0xf0f00000, 0xb0000000, 32 }
+    { 1, 1, 1, 1 },
+    "beq", "beq", SYN (8), FMT (8), 0xb0000000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* beqz $src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "beqz $src2,$disp16", "beqz", "beqz", {'b', 'e', 'q', 'z', ' ', 131, ',', 144, }, 0xfff00000, 0xb0800000, 32 }
+    { 1, 1, 1, 1 },
+    "beqz", "beqz", SYN (9), FMT (9), 0xb0800000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* bgez $src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bgez $src2,$disp16", "bgez", "bgez", {'b', 'g', 'e', 'z', ' ', 131, ',', 144, }, 0xfff00000, 0xb0b00000, 32 }
+    { 1, 1, 1, 1 },
+    "bgez", "bgez", SYN (9), FMT (9), 0xb0b00000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* bgtz $src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bgtz $src2,$disp16", "bgtz", "bgtz", {'b', 'g', 't', 'z', ' ', 131, ',', 144, }, 0xfff00000, 0xb0d00000, 32 }
+    { 1, 1, 1, 1 },
+    "bgtz", "bgtz", SYN (9), FMT (9), 0xb0d00000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* blez $src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "blez $src2,$disp16", "blez", "blez", {'b', 'l', 'e', 'z', ' ', 131, ',', 144, }, 0xfff00000, 0xb0c00000, 32 }
+    { 1, 1, 1, 1 },
+    "blez", "blez", SYN (9), FMT (9), 0xb0c00000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* bltz $src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bltz $src2,$disp16", "bltz", "bltz", {'b', 'l', 't', 'z', ' ', 131, ',', 144, }, 0xfff00000, 0xb0a00000, 32 }
+    { 1, 1, 1, 1 },
+    "bltz", "bltz", SYN (9), FMT (9), 0xb0a00000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* bnez $src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bnez $src2,$disp16", "bnez", "bnez", {'b', 'n', 'e', 'z', ' ', 131, ',', 144, }, 0xfff00000, 0xb0900000, 32 }
+    { 1, 1, 1, 1 },
+    "bnez", "bnez", SYN (9), FMT (9), 0xb0900000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* bl $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_FILL_SLOT)|(1<<CGEN_INSN_RELAX_BL)|(1<<CGEN_INSN_RELAXABLE)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bl $disp8", "bl8", "bl", {'b', 'l', ' ', 143, }, 0xff00, 0x7e00, 16 }
+    { 1, 1, 1, 1 },
+    "bl8", "bl", SYN (6), FMT (6), 0x7e00,
+    { 2, 0|A(FILL_SLOT)|A(RELAX_BL)|A(RELAXABLE)|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bl.s $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_FILL_SLOT)|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bl.s $disp8", "bl8.s", "bl", {'b', 'l', '.', 's', ' ', 143, }, 0xff00, 0x7e00, 16 }
+    { 1, 1, 1, 1 },
+    "bl8.s", "bl.s", SYN (6), FMT (6), 0x7e00,
+    { 2, 0|A(FILL_SLOT)|A(ALIAS)|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bl $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_RELAX_BL)|(1<<CGEN_INSN_RELAX)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bl $disp24", "bl24", "bl", {'b', 'l', ' ', 145, }, 0xff000000, 0xfe000000, 32 }
+    { 1, 1, 1, 1 },
+    "bl24", "bl", SYN (7), FMT (7), 0xfe000000,
+    { 2, 0|A(RELAX_BL)|A(RELAX)|A(UNCOND_CTI), { 0 } }
   },
 /* bl.l $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bl.l $disp24", "bl24.l", "bl", {'b', 'l', '.', 'l', ' ', 145, }, 0xff000000, 0xfe000000, 32 }
+    { 1, 1, 1, 1 },
+    "bl24.l", "bl.l", SYN (7), FMT (7), 0xfe000000,
+    { 2, 0|A(ALIAS)|A(UNCOND_CTI), { 0 } }
+  },
+/* bcl $disp8 */
+  {
+    { 1, 1, 1, 1 },
+    "bcl8", "bcl", SYN (6), FMT (6), 0x7800,
+    { 2, 0|A(RELAX_BCL)|A(RELAXABLE)|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* bcl.s $disp8 */
+  {
+    { 1, 1, 1, 1 },
+    "bcl8.s", "bcl.s", SYN (6), FMT (6), 0x7800,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* bcl $disp24 */
+  {
+    { 1, 1, 1, 1 },
+    "bcl24", "bcl", SYN (7), FMT (7), 0xf8000000,
+    { 2, 0|A(RELAX_BCL)|A(RELAX)|A(COND_CTI), { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* bcl.l $disp24 */
+  {
+    { 1, 1, 1, 1 },
+    "bcl24.l", "bcl.l", SYN (7), FMT (7), 0xf8000000,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* bnc $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_RELAX_BNC)|(1<<CGEN_INSN_RELAXABLE)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bnc $disp8", "bnc8", "bnc", {'b', 'n', 'c', ' ', 143, }, 0xff00, 0x7d00, 16 }
+    { 1, 1, 1, 1 },
+    "bnc8", "bnc", SYN (6), FMT (6), 0x7d00,
+    { 2, 0|A(RELAX_BNC)|A(RELAXABLE)|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bnc.s $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bnc.s $disp8", "bnc8.s", "bnc", {'b', 'n', 'c', '.', 's', ' ', 143, }, 0xff00, 0x7d00, 16 }
+    { 1, 1, 1, 1 },
+    "bnc8.s", "bnc.s", SYN (6), FMT (6), 0x7d00,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bnc $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_RELAX_BNC)|(1<<CGEN_INSN_RELAX)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bnc $disp24", "bnc24", "bnc", {'b', 'n', 'c', ' ', 145, }, 0xff000000, 0xfd000000, 32 }
+    { 1, 1, 1, 1 },
+    "bnc24", "bnc", SYN (7), FMT (7), 0xfd000000,
+    { 2, 0|A(RELAX_BNC)|A(RELAX)|A(COND_CTI), { 0 } }
   },
 /* bnc.l $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bnc.l $disp24", "bnc24.l", "bnc", {'b', 'n', 'c', '.', 'l', ' ', 145, }, 0xff000000, 0xfd000000, 32 }
+    { 1, 1, 1, 1 },
+    "bnc24.l", "bnc.l", SYN (7), FMT (7), 0xfd000000,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { 0 } }
   },
 /* bne $src1,$src2,$disp16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_COND_CTI), { 0 } } },
-    { "bne $src1,$src2,$disp16", "bne", "bne", {'b', 'n', 'e', ' ', 130, ',', 131, ',', 144, }, 0xf0f00000, 0xb0100000, 32 }
+    { 1, 1, 1, 1 },
+    "bne", "bne", SYN (8), FMT (8), 0xb0100000,
+    { 2, 0|A(COND_CTI), { 0 } }
   },
 /* bra $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_RELAX_BRA)|(1<<CGEN_INSN_RELAXABLE)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bra $disp8", "bra8", "bra", {'b', 'r', 'a', ' ', 143, }, 0xff00, 0x7f00, 16 }
+    { 1, 1, 1, 1 },
+    "bra8", "bra", SYN (6), FMT (6), 0x7f00,
+    { 2, 0|A(FILL_SLOT)|A(RELAX_BRA)|A(RELAXABLE)|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bra.s $disp8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bra.s $disp8", "bra8.s", "bra", {'b', 'r', 'a', '.', 's', ' ', 143, }, 0xff00, 0x7f00, 16 }
+    { 1, 1, 1, 1 },
+    "bra8.s", "bra.s", SYN (6), FMT (6), 0x7f00,
+    { 2, 0|A(ALIAS)|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* bra $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_RELAX_BRA)|(1<<CGEN_INSN_RELAX)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bra $disp24", "bra24", "bra", {'b', 'r', 'a', ' ', 145, }, 0xff000000, 0xff000000, 32 }
+    { 1, 1, 1, 1 },
+    "bra24", "bra", SYN (7), FMT (7), 0xff000000,
+    { 2, 0|A(RELAX_BRA)|A(RELAX)|A(UNCOND_CTI), { 0 } }
   },
 /* bra.l $disp24 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "bra.l $disp24", "bra24.l", "bra", {'b', 'r', 'a', '.', 'l', ' ', 145, }, 0xff000000, 0xff000000, 32 }
+    { 1, 1, 1, 1 },
+    "bra24.l", "bra.l", SYN (7), FMT (7), 0xff000000,
+    { 2, 0|A(ALIAS)|A(UNCOND_CTI), { 0 } }
+  },
+/* bncl $disp8 */
+  {
+    { 1, 1, 1, 1 },
+    "bncl8", "bncl", SYN (6), FMT (6), 0x7900,
+    { 2, 0|A(RELAX_BNCL)|A(RELAXABLE)|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* bncl.s $disp8 */
+  {
+    { 1, 1, 1, 1 },
+    "bncl8.s", "bncl.s", SYN (6), FMT (6), 0x7900,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* bncl $disp24 */
+  {
+    { 1, 1, 1, 1 },
+    "bncl24", "bncl", SYN (7), FMT (7), 0xf9000000,
+    { 2, 0|A(RELAX_BNC)|A(RELAX)|A(COND_CTI), { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* bncl.l $disp24 */
+  {
+    { 1, 1, 1, 1 },
+    "bncl24.l", "bncl.l", SYN (7), FMT (7), 0xf9000000,
+    { 2, 0|A(ALIAS)|A(COND_CTI), { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* cmp $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "cmp $src1,$src2", "cmp", "cmp", {'c', 'm', 'p', ' ', 130, ',', 131, }, 0xf0f0, 0x40, 16 }
+    { 1, 1, 1, 1 },
+    "cmp", "cmp", SYN (10), FMT (10), 0x40,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* cmpi $src2,$simm16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "cmpi $src2,$simm16", "cmpi", "cmpi", {'c', 'm', 'p', 'i', ' ', 131, ',', 135, }, 0xfff00000, 0x80400000, 32 }
+    { 1, 1, 1, 1 },
+    "cmpi", "cmpi", SYN (11), FMT (11), 0x80400000,
+    { 2, 0, { 0 } }
   },
 /* cmpu $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "cmpu $src1,$src2", "cmpu", "cmpu", {'c', 'm', 'p', 'u', ' ', 130, ',', 131, }, 0xf0f0, 0x50, 16 }
+    { 1, 1, 1, 1 },
+    "cmpu", "cmpu", SYN (10), FMT (10), 0x50,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
+  },
+/* cmpui $src2,$uimm16 */
+  {
+    { 1, 1, 1, 1 },
+    "cmpui", "cmpui", SYN (12), FMT (12), 0x80500000,
+    { 2, 0, { [CGEN_INSN_MACH] = (1 << MACH_M32R) | (1 << MACH_M32RX) } }
   },
-/* cmpui $src2,$simm16 */
+/* cmpeq $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "cmpui $src2,$simm16", "cmpui", "cmpui", {'c', 'm', 'p', 'u', 'i', ' ', 131, ',', 135, }, 0xfff00000, 0x80500000, 32 }
+    { 1, 1, 1, 1 },
+    "cmpeq", "cmpeq", SYN (10), FMT (10), 0x60,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* cmpz $src2 */
+  {
+    { 1, 1, 1, 1 },
+    "cmpz", "cmpz", SYN (13), FMT (13), 0x70,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* div $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "div $dr,$sr", "div", "div", {'d', 'i', 'v', ' ', 129, ',', 128, }, 0xf0f0ffff, 0x90000000, 32 }
+    { 1, 1, 1, 1 },
+    "div", "div", SYN (0), FMT (14), 0x90000000,
+    { 2, 0, { 0 } }
   },
 /* divu $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "divu $dr,$sr", "divu", "divu", {'d', 'i', 'v', 'u', ' ', 129, ',', 128, }, 0xf0f0ffff, 0x90100000, 32 }
+    { 1, 1, 1, 1 },
+    "divu", "divu", SYN (0), FMT (14), 0x90100000,
+    { 2, 0, { 0 } }
   },
 /* rem $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "rem $dr,$sr", "rem", "rem", {'r', 'e', 'm', ' ', 129, ',', 128, }, 0xf0f0ffff, 0x90200000, 32 }
+    { 1, 1, 1, 1 },
+    "rem", "rem", SYN (0), FMT (14), 0x90200000,
+    { 2, 0, { 0 } }
   },
 /* remu $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "remu $dr,$sr", "remu", "remu", {'r', 'e', 'm', 'u', ' ', 129, ',', 128, }, 0xf0f0ffff, 0x90300000, 32 }
+    { 1, 1, 1, 1 },
+    "remu", "remu", SYN (0), FMT (14), 0x90300000,
+    { 2, 0, { 0 } }
+  },
+/* jc $sr */
+  {
+    { 1, 1, 1, 1 },
+    "jc", "jc", SYN (14), FMT (15), 0x1cc0,
+    { 2, 0|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* jnc $sr */
+  {
+    { 1, 1, 1, 1 },
+    "jnc", "jnc", SYN (14), FMT (15), 0x1cc0,
+    { 2, 0|A(COND_CTI), { [CGEN_INSN_PIPE] = PIPE_O, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* jl $sr */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_FILL_SLOT)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "jl $sr", "jl", "jl", {'j', 'l', ' ', 128, }, 0xfff0, 0x1ec0, 16 }
+    { 1, 1, 1, 1 },
+    "jl", "jl", SYN (14), FMT (15), 0x1ec0,
+    { 2, 0|A(FILL_SLOT)|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* jmp $sr */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "jmp $sr", "jmp", "jmp", {'j', 'm', 'p', ' ', 128, }, 0xfff0, 0x1fc0, 16 }
+    { 1, 1, 1, 1 },
+    "jmp", "jmp", SYN (14), FMT (15), 0x1fc0,
+    { 2, 0|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ld $dr,@$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ld $dr,@$sr", "ld", "ld", {'l', 'd', ' ', 129, ',', '@', 128, }, 0xf0f0, 0x20c0, 16 }
+    { 1, 1, 1, 1 },
+    "ld", "ld", SYN (15), FMT (0), 0x20c0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ld $dr,@($sr) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ld $dr,@($sr)", "ld-2", "ld", {'l', 'd', ' ', 129, ',', '@', '(', 128, ')', }, 0xf0f0, 0x20c0, 16 }
+    { 1, 1, 1, 1 },
+    "ld-2", "ld", SYN (16), FMT (0), 0x20c0,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ld $dr,@($slo16,$sr) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ld $dr,@($slo16,$sr)", "ld-d", "ld", {'l', 'd', ' ', 129, ',', '@', '(', 140, ',', 128, ')', }, 0xf0f00000, 0xa0c00000, 32 }
+    { 1, 1, 1, 1 },
+    "ld-d", "ld", SYN (17), FMT (1), 0xa0c00000,
+    { 2, 0, { 0 } }
   },
 /* ld $dr,@($sr,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ld $dr,@($sr,$slo16)", "ld-d2", "ld", {'l', 'd', ' ', 129, ',', '@', '(', 128, ',', 140, ')', }, 0xf0f00000, 0xa0c00000, 32 }
+    { 1, 1, 1, 1 },
+    "ld-d2", "ld", SYN (18), FMT (1), 0xa0c00000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* ldb $dr,@$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldb $dr,@$sr", "ldb", "ldb", {'l', 'd', 'b', ' ', 129, ',', '@', 128, }, 0xf0f0, 0x2080, 16 }
+    { 1, 1, 1, 1 },
+    "ldb", "ldb", SYN (15), FMT (0), 0x2080,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ldb $dr,@($sr) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldb $dr,@($sr)", "ldb-2", "ldb", {'l', 'd', 'b', ' ', 129, ',', '@', '(', 128, ')', }, 0xf0f0, 0x2080, 16 }
+    { 1, 1, 1, 1 },
+    "ldb-2", "ldb", SYN (16), FMT (0), 0x2080,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ldb $dr,@($slo16,$sr) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldb $dr,@($slo16,$sr)", "ldb-d", "ldb", {'l', 'd', 'b', ' ', 129, ',', '@', '(', 140, ',', 128, ')', }, 0xf0f00000, 0xa0800000, 32 }
+    { 1, 1, 1, 1 },
+    "ldb-d", "ldb", SYN (17), FMT (1), 0xa0800000,
+    { 2, 0, { 0 } }
   },
 /* ldb $dr,@($sr,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldb $dr,@($sr,$slo16)", "ldb-d2", "ldb", {'l', 'd', 'b', ' ', 129, ',', '@', '(', 128, ',', 140, ')', }, 0xf0f00000, 0xa0800000, 32 }
+    { 1, 1, 1, 1 },
+    "ldb-d2", "ldb", SYN (18), FMT (1), 0xa0800000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* ldh $dr,@$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldh $dr,@$sr", "ldh", "ldh", {'l', 'd', 'h', ' ', 129, ',', '@', 128, }, 0xf0f0, 0x20a0, 16 }
+    { 1, 1, 1, 1 },
+    "ldh", "ldh", SYN (15), FMT (0), 0x20a0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ldh $dr,@($sr) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldh $dr,@($sr)", "ldh-2", "ldh", {'l', 'd', 'h', ' ', 129, ',', '@', '(', 128, ')', }, 0xf0f0, 0x20a0, 16 }
+    { 1, 1, 1, 1 },
+    "ldh-2", "ldh", SYN (16), FMT (0), 0x20a0,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ldh $dr,@($slo16,$sr) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldh $dr,@($slo16,$sr)", "ldh-d", "ldh", {'l', 'd', 'h', ' ', 129, ',', '@', '(', 140, ',', 128, ')', }, 0xf0f00000, 0xa0a00000, 32 }
+    { 1, 1, 1, 1 },
+    "ldh-d", "ldh", SYN (17), FMT (1), 0xa0a00000,
+    { 2, 0, { 0 } }
   },
 /* ldh $dr,@($sr,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldh $dr,@($sr,$slo16)", "ldh-d2", "ldh", {'l', 'd', 'h', ' ', 129, ',', '@', '(', 128, ',', 140, ')', }, 0xf0f00000, 0xa0a00000, 32 }
+    { 1, 1, 1, 1 },
+    "ldh-d2", "ldh", SYN (18), FMT (1), 0xa0a00000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* ldub $dr,@$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldub $dr,@$sr", "ldub", "ldub", {'l', 'd', 'u', 'b', ' ', 129, ',', '@', 128, }, 0xf0f0, 0x2090, 16 }
+    { 1, 1, 1, 1 },
+    "ldub", "ldub", SYN (15), FMT (0), 0x2090,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ldub $dr,@($sr) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldub $dr,@($sr)", "ldub-2", "ldub", {'l', 'd', 'u', 'b', ' ', 129, ',', '@', '(', 128, ')', }, 0xf0f0, 0x2090, 16 }
+    { 1, 1, 1, 1 },
+    "ldub-2", "ldub", SYN (16), FMT (0), 0x2090,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ldub $dr,@($slo16,$sr) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldub $dr,@($slo16,$sr)", "ldub-d", "ldub", {'l', 'd', 'u', 'b', ' ', 129, ',', '@', '(', 140, ',', 128, ')', }, 0xf0f00000, 0xa0900000, 32 }
+    { 1, 1, 1, 1 },
+    "ldub-d", "ldub", SYN (17), FMT (1), 0xa0900000,
+    { 2, 0, { 0 } }
   },
 /* ldub $dr,@($sr,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldub $dr,@($sr,$slo16)", "ldub-d2", "ldub", {'l', 'd', 'u', 'b', ' ', 129, ',', '@', '(', 128, ',', 140, ')', }, 0xf0f00000, 0xa0900000, 32 }
+    { 1, 1, 1, 1 },
+    "ldub-d2", "ldub", SYN (18), FMT (1), 0xa0900000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* lduh $dr,@$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "lduh $dr,@$sr", "lduh", "lduh", {'l', 'd', 'u', 'h', ' ', 129, ',', '@', 128, }, 0xf0f0, 0x20b0, 16 }
+    { 1, 1, 1, 1 },
+    "lduh", "lduh", SYN (15), FMT (0), 0x20b0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* lduh $dr,@($sr) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "lduh $dr,@($sr)", "lduh-2", "lduh", {'l', 'd', 'u', 'h', ' ', 129, ',', '@', '(', 128, ')', }, 0xf0f0, 0x20b0, 16 }
+    { 1, 1, 1, 1 },
+    "lduh-2", "lduh", SYN (16), FMT (0), 0x20b0,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* lduh $dr,@($slo16,$sr) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "lduh $dr,@($slo16,$sr)", "lduh-d", "lduh", {'l', 'd', 'u', 'h', ' ', 129, ',', '@', '(', 140, ',', 128, ')', }, 0xf0f00000, 0xa0b00000, 32 }
+    { 1, 1, 1, 1 },
+    "lduh-d", "lduh", SYN (17), FMT (1), 0xa0b00000,
+    { 2, 0, { 0 } }
   },
 /* lduh $dr,@($sr,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "lduh $dr,@($sr,$slo16)", "lduh-d2", "lduh", {'l', 'd', 'u', 'h', ' ', 129, ',', '@', '(', 128, ',', 140, ')', }, 0xf0f00000, 0xa0b00000, 32 }
+    { 1, 1, 1, 1 },
+    "lduh-d2", "lduh", SYN (18), FMT (1), 0xa0b00000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* ld $dr,@$sr+ */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ld $dr,@$sr+", "ld-plus", "ld", {'l', 'd', ' ', 129, ',', '@', 128, '+', }, 0xf0f0, 0x20e0, 16 }
+    { 1, 1, 1, 1 },
+    "ld-plus", "ld", SYN (19), FMT (0), 0x20e0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* ld24 $dr,$uimm24 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ld24 $dr,$uimm24", "ld24", "ld24", {'l', 'd', '2', '4', ' ', 129, ',', 142, }, 0xf0000000, 0xe0000000, 32 }
+    { 1, 1, 1, 1 },
+    "ld24", "ld24", SYN (20), FMT (16), 0xe0000000,
+    { 2, 0, { 0 } }
   },
 /* ldi $dr,$simm8 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldi $dr,$simm8", "ldi8", "ldi", {'l', 'd', 'i', ' ', 129, ',', 134, }, 0xf000, 0x6000, 16 }
+    { 1, 1, 1, 1 },
+    "ldi8", "ldi", SYN (4), FMT (4), 0x6000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* ldi8 $dr,$simm8 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldi8 $dr,$simm8", "ldi8a", "ldi8", {'l', 'd', 'i', '8', ' ', 129, ',', 134, }, 0xf000, 0x6000, 16 }
+    { 1, 1, 1, 1 },
+    "ldi8a", "ldi8", SYN (4), FMT (4), 0x6000,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* ldi $dr,$slo16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "ldi $dr,$slo16", "ldi16", "ldi", {'l', 'd', 'i', ' ', 129, ',', 140, }, 0xf0ff0000, 0x90f00000, 32 }
+    { 1, 1, 1, 1 },
+    "ldi16", "ldi", SYN (21), FMT (17), 0x90f00000,
+    { 2, 0, { 0 } }
   },
 /* ldi16 $dr,$slo16 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "ldi16 $dr,$slo16", "ldi16a", "ldi16", {'l', 'd', 'i', '1', '6', ' ', 129, ',', 140, }, 0xf0ff0000, 0x90f00000, 32 }
+    { 1, 1, 1, 1 },
+    "ldi16a", "ldi16", SYN (21), FMT (17), 0x90f00000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* lock $dr,@$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "lock $dr,@$sr", "lock", "lock", {'l', 'o', 'c', 'k', ' ', 129, ',', '@', 128, }, 0xf0f0, 0x20d0, 16 }
+    { 1, 1, 1, 1 },
+    "lock", "lock", SYN (15), FMT (0), 0x20d0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* machi $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "machi $src1,$src2", "machi", "machi", {'m', 'a', 'c', 'h', 'i', ' ', 130, ',', 131, }, 0xf0f0, 0x3040, 16 }
+    { 1, 1, 1, 1 },
+    "machi", "machi", SYN (10), FMT (10), 0x3040,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* machi $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "machi-a", "machi", SYN (22), FMT (18), 0x3040,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* maclo $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "maclo $src1,$src2", "maclo", "maclo", {'m', 'a', 'c', 'l', 'o', ' ', 130, ',', 131, }, 0xf0f0, 0x3050, 16 }
+    { 1, 1, 1, 1 },
+    "maclo", "maclo", SYN (10), FMT (10), 0x3050,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* maclo $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "maclo-a", "maclo", SYN (22), FMT (18), 0x3050,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* macwhi $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "macwhi $src1,$src2", "macwhi", "macwhi", {'m', 'a', 'c', 'w', 'h', 'i', ' ', 130, ',', 131, }, 0xf0f0, 0x3060, 16 }
+    { 1, 1, 1, 1 },
+    "macwhi", "macwhi", SYN (10), FMT (10), 0x3060,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* macwhi $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "macwhi-a", "macwhi", SYN (22), FMT (18), 0x3060,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* macwlo $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "macwlo $src1,$src2", "macwlo", "macwlo", {'m', 'a', 'c', 'w', 'l', 'o', ' ', 130, ',', 131, }, 0xf0f0, 0x3070, 16 }
+    { 1, 1, 1, 1 },
+    "macwlo", "macwlo", SYN (10), FMT (10), 0x3070,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* macwlo $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "macwlo-a", "macwlo", SYN (22), FMT (18), 0x3070,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mul $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mul $dr,$sr", "mul", "mul", {'m', 'u', 'l', ' ', 129, ',', 128, }, 0xf0f0, 0x1060, 16 }
+    { 1, 1, 1, 1 },
+    "mul", "mul", SYN (0), FMT (0), 0x1060,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
   },
 /* mulhi $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mulhi $src1,$src2", "mulhi", "mulhi", {'m', 'u', 'l', 'h', 'i', ' ', 130, ',', 131, }, 0xf0f0, 0x3000, 16 }
+    { 1, 1, 1, 1 },
+    "mulhi", "mulhi", SYN (10), FMT (10), 0x3000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mulhi $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "mulhi-a", "mulhi", SYN (22), FMT (18), 0x3000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mullo $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mullo $src1,$src2", "mullo", "mullo", {'m', 'u', 'l', 'l', 'o', ' ', 130, ',', 131, }, 0xf0f0, 0x3010, 16 }
+    { 1, 1, 1, 1 },
+    "mullo", "mullo", SYN (10), FMT (10), 0x3010,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mullo $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "mullo-a", "mullo", SYN (22), FMT (18), 0x3010,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mulwhi $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mulwhi $src1,$src2", "mulwhi", "mulwhi", {'m', 'u', 'l', 'w', 'h', 'i', ' ', 130, ',', 131, }, 0xf0f0, 0x3020, 16 }
+    { 1, 1, 1, 1 },
+    "mulwhi", "mulwhi", SYN (10), FMT (10), 0x3020,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mulwhi $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "mulwhi-a", "mulwhi", SYN (22), FMT (18), 0x3020,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mulwlo $src1,$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mulwlo $src1,$src2", "mulwlo", "mulwlo", {'m', 'u', 'l', 'w', 'l', 'o', ' ', 130, ',', 131, }, 0xf0f0, 0x3030, 16 }
+    { 1, 1, 1, 1 },
+    "mulwlo", "mulwlo", SYN (10), FMT (10), 0x3030,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mulwlo $src1,$src2,$acc */
+  {
+    { 1, 1, 1, 1 },
+    "mulwlo-a", "mulwlo", SYN (22), FMT (18), 0x3030,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mv $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mv $dr,$sr", "mv", "mv", {'m', 'v', ' ', 129, ',', 128, }, 0xf0f0, 0x1080, 16 }
+    { 1, 1, 1, 1 },
+    "mv", "mv", SYN (0), FMT (0), 0x1080,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* mvfachi $dr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mvfachi $dr", "mvfachi", "mvfachi", {'m', 'v', 'f', 'a', 'c', 'h', 'i', ' ', 129, }, 0xf0ff, 0x50f0, 16 }
+    { 1, 1, 1, 1 },
+    "mvfachi", "mvfachi", SYN (23), FMT (19), 0x50f0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mvfachi $dr,$accs */
+  {
+    { 1, 1, 1, 1 },
+    "mvfachi-a", "mvfachi", SYN (24), FMT (20), 0x50f0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mvfaclo $dr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mvfaclo $dr", "mvfaclo", "mvfaclo", {'m', 'v', 'f', 'a', 'c', 'l', 'o', ' ', 129, }, 0xf0ff, 0x50f1, 16 }
+    { 1, 1, 1, 1 },
+    "mvfaclo", "mvfaclo", SYN (23), FMT (19), 0x50f1,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mvfaclo $dr,$acc-s */
+  {
+    { 1, 1, 1, 1 },
+    "mvfaclo-a", "mvfaclo", SYN (24), FMT (20), 0x50f1,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mvfacmi $dr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mvfacmi $dr", "mvfacmi", "mvfacmi", {'m', 'v', 'f', 'a', 'c', 'm', 'i', ' ', 129, }, 0xf0ff, 0x50f2, 16 }
+    { 1, 1, 1, 1 },
+    "mvfacmi", "mvfacmi", SYN (23), FMT (19), 0x50f2,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mvfacmi $dr,$acc-s */
+  {
+    { 1, 1, 1, 1 },
+    "mvfacmi-a", "mvfacmi", SYN (24), FMT (20), 0x50f2,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mvfc $dr,$scr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mvfc $dr,$scr", "mvfc", "mvfc", {'m', 'v', 'f', 'c', ' ', 129, ',', 132, }, 0xf0f0, 0x1090, 16 }
+    { 1, 1, 1, 1 },
+    "mvfc", "mvfc", SYN (25), FMT (21), 0x1090,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* mvtachi $src1 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mvtachi $src1", "mvtachi", "mvtachi", {'m', 'v', 't', 'a', 'c', 'h', 'i', ' ', 130, }, 0xf0ff, 0x5070, 16 }
+    { 1, 1, 1, 1 },
+    "mvtachi", "mvtachi", SYN (26), FMT (22), 0x5070,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mvtachi $src1,$acc-s */
+  {
+    { 1, 1, 1, 1 },
+    "mvtachi-a", "mvtachi", SYN (27), FMT (23), 0x5070,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mvtaclo $src1 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mvtaclo $src1", "mvtaclo", "mvtaclo", {'m', 'v', 't', 'a', 'c', 'l', 'o', ' ', 130, }, 0xf0ff, 0x5071, 16 }
+    { 1, 1, 1, 1 },
+    "mvtaclo", "mvtaclo", SYN (26), FMT (22), 0x5071,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* mvtaclo $src1,$acc-s */
+  {
+    { 1, 1, 1, 1 },
+    "mvtaclo-a", "mvtaclo", SYN (27), FMT (23), 0x5071,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* mvtc $sr,$dcr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "mvtc $sr,$dcr", "mvtc", "mvtc", {'m', 'v', 't', 'c', ' ', 128, ',', 133, }, 0xf0f0, 0x10a0, 16 }
+    { 1, 1, 1, 1 },
+    "mvtc", "mvtc", SYN (28), FMT (24), 0x10a0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* neg $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "neg $dr,$sr", "neg", "neg", {'n', 'e', 'g', ' ', 129, ',', 128, }, 0xf0f0, 0x30, 16 }
+    { 1, 1, 1, 1 },
+    "neg", "neg", SYN (0), FMT (0), 0x30,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* nop */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "nop", "nop", "nop", {'n', 'o', 'p', }, 0xffff, 0x7000, 16 }
+    { 1, 1, 1, 1 },
+    "nop", "nop", SYN (29), FMT (25), 0x7000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* not $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "not $dr,$sr", "not", "not", {'n', 'o', 't', ' ', 129, ',', 128, }, 0xf0f0, 0xb0, 16 }
+    { 1, 1, 1, 1 },
+    "not", "not", SYN (0), FMT (0), 0xb0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* rac */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "rac", "rac", "rac", {'r', 'a', 'c', }, 0xffff, 0x5090, 16 }
+    { 1, 1, 1, 1 },
+    "rac", "rac", SYN (29), FMT (25), 0x5090,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* rac $acc-s */
+  {
+    { 1, 1, 1, 1 },
+    "rac-a", "rac", SYN (30), FMT (26), 0x5090,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* rach */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "rach", "rach", "rach", {'r', 'a', 'c', 'h', }, 0xffff, 0x5080, 16 }
+    { 1, 1, 1, 1 },
+    "rach", "rach", SYN (29), FMT (25), 0x5080,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S } }
+  },
+/* rach $acc-s */
+  {
+    { 1, 1, 1, 1 },
+    "rach-a", "rach", SYN (30), FMT (26), 0x5080,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 /* rte */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "rte", "rte", "rte", {'r', 't', 'e', }, 0xffff, 0x10d6, 16 }
+    { 1, 1, 1, 1 },
+    "rte", "rte", SYN (29), FMT (25), 0x10d6,
+    { 2, 0|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* seth $dr,$hi16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "seth $dr,$hi16", "seth", "seth", {'s', 'e', 't', 'h', ' ', 129, ',', 139, }, 0xf0ff0000, 0xd0c00000, 32 }
+    { 1, 1, 1, 1 },
+    "seth", "seth", SYN (31), FMT (27), 0xd0c00000,
+    { 2, 0, { 0 } }
   },
 /* sll $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "sll $dr,$sr", "sll", "sll", {'s', 'l', 'l', ' ', 129, ',', 128, }, 0xf0f0, 0x1040, 16 }
+    { 1, 1, 1, 1 },
+    "sll", "sll", SYN (0), FMT (0), 0x1040,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* sll3 $dr,$sr,$simm16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "sll3 $dr,$sr,$simm16", "sll3", "sll3", {'s', 'l', 'l', '3', ' ', 129, ',', 128, ',', 135, }, 0xf0f00000, 0x90c00000, 32 }
+    { 1, 1, 1, 1 },
+    "sll3", "sll3", SYN (5), FMT (5), 0x90c00000,
+    { 2, 0, { 0 } }
   },
 /* slli $dr,$uimm5 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "slli $dr,$uimm5", "slli", "slli", {'s', 'l', 'l', 'i', ' ', 129, ',', 137, }, 0xf0e0, 0x5040, 16 }
+    { 1, 1, 1, 1 },
+    "slli", "slli", SYN (32), FMT (28), 0x5040,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* sra $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "sra $dr,$sr", "sra", "sra", {'s', 'r', 'a', ' ', 129, ',', 128, }, 0xf0f0, 0x1020, 16 }
+    { 1, 1, 1, 1 },
+    "sra", "sra", SYN (0), FMT (0), 0x1020,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* sra3 $dr,$sr,$simm16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "sra3 $dr,$sr,$simm16", "sra3", "sra3", {'s', 'r', 'a', '3', ' ', 129, ',', 128, ',', 135, }, 0xf0f00000, 0x90a00000, 32 }
+    { 1, 1, 1, 1 },
+    "sra3", "sra3", SYN (5), FMT (5), 0x90a00000,
+    { 2, 0, { 0 } }
   },
 /* srai $dr,$uimm5 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "srai $dr,$uimm5", "srai", "srai", {'s', 'r', 'a', 'i', ' ', 129, ',', 137, }, 0xf0e0, 0x5020, 16 }
+    { 1, 1, 1, 1 },
+    "srai", "srai", SYN (32), FMT (28), 0x5020,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* srl $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "srl $dr,$sr", "srl", "srl", {'s', 'r', 'l', ' ', 129, ',', 128, }, 0xf0f0, 0x1000, 16 }
+    { 1, 1, 1, 1 },
+    "srl", "srl", SYN (0), FMT (0), 0x1000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* srl3 $dr,$sr,$simm16 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "srl3 $dr,$sr,$simm16", "srl3", "srl3", {'s', 'r', 'l', '3', ' ', 129, ',', 128, ',', 135, }, 0xf0f00000, 0x90800000, 32 }
+    { 1, 1, 1, 1 },
+    "srl3", "srl3", SYN (5), FMT (5), 0x90800000,
+    { 2, 0, { 0 } }
   },
 /* srli $dr,$uimm5 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "srli $dr,$uimm5", "srli", "srli", {'s', 'r', 'l', 'i', ' ', 129, ',', 137, }, 0xf0e0, 0x5000, 16 }
+    { 1, 1, 1, 1 },
+    "srli", "srli", SYN (32), FMT (28), 0x5000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* st $src1,@$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "st $src1,@$src2", "st", "st", {'s', 't', ' ', 130, ',', '@', 131, }, 0xf0f0, 0x2040, 16 }
+    { 1, 1, 1, 1 },
+    "st", "st", SYN (33), FMT (10), 0x2040,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* st $src1,@($src2) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "st $src1,@($src2)", "st-2", "st", {'s', 't', ' ', 130, ',', '@', '(', 131, ')', }, 0xf0f0, 0x2040, 16 }
+    { 1, 1, 1, 1 },
+    "st-2", "st", SYN (34), FMT (10), 0x2040,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* st $src1,@($slo16,$src2) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "st $src1,@($slo16,$src2)", "st-d", "st", {'s', 't', ' ', 130, ',', '@', '(', 140, ',', 131, ')', }, 0xf0f00000, 0xa0400000, 32 }
+    { 1, 1, 1, 1 },
+    "st-d", "st", SYN (35), FMT (29), 0xa0400000,
+    { 2, 0, { 0 } }
   },
 /* st $src1,@($src2,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "st $src1,@($src2,$slo16)", "st-d2", "st", {'s', 't', ' ', 130, ',', '@', '(', 131, ',', 140, ')', }, 0xf0f00000, 0xa0400000, 32 }
+    { 1, 1, 1, 1 },
+    "st-d2", "st", SYN (36), FMT (29), 0xa0400000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* stb $src1,@$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "stb $src1,@$src2", "stb", "stb", {'s', 't', 'b', ' ', 130, ',', '@', 131, }, 0xf0f0, 0x2000, 16 }
+    { 1, 1, 1, 1 },
+    "stb", "stb", SYN (33), FMT (10), 0x2000,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* stb $src1,@($src2) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "stb $src1,@($src2)", "stb-2", "stb", {'s', 't', 'b', ' ', 130, ',', '@', '(', 131, ')', }, 0xf0f0, 0x2000, 16 }
+    { 1, 1, 1, 1 },
+    "stb-2", "stb", SYN (34), FMT (10), 0x2000,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* stb $src1,@($slo16,$src2) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "stb $src1,@($slo16,$src2)", "stb-d", "stb", {'s', 't', 'b', ' ', 130, ',', '@', '(', 140, ',', 131, ')', }, 0xf0f00000, 0xa0000000, 32 }
+    { 1, 1, 1, 1 },
+    "stb-d", "stb", SYN (35), FMT (29), 0xa0000000,
+    { 2, 0, { 0 } }
   },
 /* stb $src1,@($src2,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "stb $src1,@($src2,$slo16)", "stb-d2", "stb", {'s', 't', 'b', ' ', 130, ',', '@', '(', 131, ',', 140, ')', }, 0xf0f00000, 0xa0000000, 32 }
+    { 1, 1, 1, 1 },
+    "stb-d2", "stb", SYN (36), FMT (29), 0xa0000000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* sth $src1,@$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "sth $src1,@$src2", "sth", "sth", {'s', 't', 'h', ' ', 130, ',', '@', 131, }, 0xf0f0, 0x2020, 16 }
+    { 1, 1, 1, 1 },
+    "sth", "sth", SYN (33), FMT (10), 0x2020,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* sth $src1,@($src2) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "sth $src1,@($src2)", "sth-2", "sth", {'s', 't', 'h', ' ', 130, ',', '@', '(', 131, ')', }, 0xf0f0, 0x2020, 16 }
+    { 1, 1, 1, 1 },
+    "sth-2", "sth", SYN (34), FMT (10), 0x2020,
+    { 2, 0|A(ALIAS), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* sth $src1,@($slo16,$src2) */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "sth $src1,@($slo16,$src2)", "sth-d", "sth", {'s', 't', 'h', ' ', 130, ',', '@', '(', 140, ',', 131, ')', }, 0xf0f00000, 0xa0200000, 32 }
+    { 1, 1, 1, 1 },
+    "sth-d", "sth", SYN (35), FMT (29), 0xa0200000,
+    { 2, 0, { 0 } }
   },
 /* sth $src1,@($src2,$slo16) */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "sth $src1,@($src2,$slo16)", "sth-d2", "sth", {'s', 't', 'h', ' ', 130, ',', '@', '(', 131, ',', 140, ')', }, 0xf0f00000, 0xa0200000, 32 }
+    { 1, 1, 1, 1 },
+    "sth-d2", "sth", SYN (36), FMT (29), 0xa0200000,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* st $src1,@+$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "st $src1,@+$src2", "st-plus", "st", {'s', 't', ' ', 130, ',', '@', '+', 131, }, 0xf0f0, 0x2060, 16 }
+    { 1, 1, 1, 1 },
+    "st-plus", "st", SYN (37), FMT (10), 0x2060,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* st $src1,@-$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "st $src1,@-$src2", "st-minus", "st", {'s', 't', ' ', 130, ',', '@', '-', 131, }, 0xf0f0, 0x2070, 16 }
+    { 1, 1, 1, 1 },
+    "st-minus", "st", SYN (38), FMT (10), 0x2070,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* sub $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "sub $dr,$sr", "sub", "sub", {'s', 'u', 'b', ' ', 129, ',', 128, }, 0xf0f0, 0x20, 16 }
+    { 1, 1, 1, 1 },
+    "sub", "sub", SYN (0), FMT (0), 0x20,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* subv $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "subv $dr,$sr", "subv", "subv", {'s', 'u', 'b', 'v', ' ', 129, ',', 128, }, 0xf0f0, 0x0, 16 }
+    { 1, 1, 1, 1 },
+    "subv", "subv", SYN (0), FMT (0), 0x0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* subx $dr,$sr */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "subx $dr,$sr", "subx", "subx", {'s', 'u', 'b', 'x', ' ', 129, ',', 128, }, 0xf0f0, 0x10, 16 }
+    { 1, 1, 1, 1 },
+    "subx", "subx", SYN (0), FMT (0), 0x10,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS } }
   },
 /* trap $uimm4 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_FILL_SLOT)|(1<<CGEN_INSN_UNCOND_CTI), { 0 } } },
-    { "trap $uimm4", "trap", "trap", {'t', 'r', 'a', 'p', ' ', 136, }, 0xfff0, 0x10f0, 16 }
+    { 1, 1, 1, 1 },
+    "trap", "trap", SYN (39), FMT (30), 0x10f0,
+    { 2, 0|A(FILL_SLOT)|A(UNCOND_CTI), { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* unlock $src1,@$src2 */
   {
-    { 1, 1, 1, 1, { 0, 0, { 0 } } },
-    { "unlock $src1,@$src2", "unlock", "unlock", {'u', 'n', 'l', 'o', 'c', 'k', ' ', 130, ',', '@', 131, }, 0xf0f0, 0x2050, 16 }
+    { 1, 1, 1, 1 },
+    "unlock", "unlock", SYN (33), FMT (10), 0x2050,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O } }
   },
 /* push $src1 */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "push $src1", "push", "push", {'p', 'u', 's', 'h', ' ', 130, }, 0xf0ff, 0x207f, 16 }
+    { 1, 1, 1, 1 },
+    "push", "push", SYN (26), FMT (22), 0x207f,
+    { 2, 0|A(ALIAS), { 0 } }
   },
 /* pop $dr */
   {
-    { 1, 1, 1, 1, { 0, 0|(1<<CGEN_INSN_ALIAS), { 0 } } },
-    { "pop $dr", "pop", "pop", {'p', 'o', 'p', ' ', 129, }, 0xf0ff, 0x20ef, 16 }
+    { 1, 1, 1, 1 },
+    "pop", "pop", SYN (23), FMT (19), 0x20ef,
+    { 2, 0|A(ALIAS), { 0 } }
+  },
+/* satb $dr,$src2 */
+  {
+    { 1, 1, 1, 1 },
+    "satb", "satb", SYN (40), FMT (31), 0x80000100,
+    { 2, 0, { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* sath $dr,$src2 */
+  {
+    { 1, 1, 1, 1 },
+    "sath", "sath", SYN (40), FMT (31), 0x80000200,
+    { 2, 0, { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* sat $dr,$src2 */
+  {
+    { 1, 1, 1, 1 },
+    "sat", "sat", SYN (40), FMT (31), 0x80000000,
+    { 2, 0, { [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* pcmpbz $src2 */
+  {
+    { 1, 1, 1, 1 },
+    "pcmpbz", "pcmpbz", SYN (13), FMT (13), 0x370,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_OS, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* sadd */
+  {
+    { 1, 1, 1, 1 },
+    "sadd", "sadd", SYN (29), FMT (25), 0x50e4,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* macwu1 $src1,$src2 */
+  {
+    { 1, 1, 1, 1 },
+    "macwu1", "macwu1", SYN (10), FMT (10), 0x50b0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* msblo $src1,$src2 */
+  {
+    { 1, 1, 1, 1 },
+    "msblo", "msblo", SYN (10), FMT (10), 0x50d0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* mulwu1 $src1,$src2 */
+  {
+    { 1, 1, 1, 1 },
+    "mulwu1", "mulwu1", SYN (10), FMT (10), 0x50a0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* machl1 $src1,$src2 */
+  {
+    { 1, 1, 1, 1 },
+    "machl1", "machl1", SYN (10), FMT (10), 0x50c0,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_S, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* sc */
+  {
+    { 1, 1, 1, 1 },
+    "sc", "sc", SYN (29), FMT (25), 0x7401,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
+  },
+/* snc */
+  {
+    { 1, 1, 1, 1 },
+    "snc", "snc", SYN (29), FMT (25), 0x7501,
+    { 2, 0, { [CGEN_INSN_PIPE] = PIPE_O, [CGEN_INSN_MACH] = 1 << MACH_M32RX } }
   },
 };
 
+#undef A
+#undef SYN
+#undef FMT
+
 CGEN_INSN_TABLE m32r_cgen_insn_table = {
   & m32r_cgen_insn_table_entries[0],
+  sizeof (CGEN_INSN),
   CGEN_NUM_INSNS,
   NULL,
   m32r_cgen_asm_hash_insn, CGEN_ASM_HASH_SIZE,
@@ -834,62 +1426,68 @@ CGEN_INLINE void
 m32r_cgen_set_operand (opindex, valuep, fields)
      int opindex;
      const long *valuep;
-     struct cgen_fields *fields;
+     CGEN_FIELDS *fields;
 {
   switch (opindex)
     {
-    case 0 :
+    case M32R_OPERAND_SR :
       fields->f_r2 = *valuep;
       break;
-    case 1 :
+    case M32R_OPERAND_DR :
       fields->f_r1 = *valuep;
       break;
-    case 2 :
+    case M32R_OPERAND_SRC1 :
       fields->f_r1 = *valuep;
       break;
-    case 3 :
+    case M32R_OPERAND_SRC2 :
       fields->f_r2 = *valuep;
       break;
-    case 4 :
+    case M32R_OPERAND_SCR :
       fields->f_r2 = *valuep;
       break;
-    case 5 :
+    case M32R_OPERAND_DCR :
       fields->f_r1 = *valuep;
       break;
-    case 6 :
+    case M32R_OPERAND_SIMM8 :
       fields->f_simm8 = *valuep;
       break;
-    case 7 :
+    case M32R_OPERAND_SIMM16 :
       fields->f_simm16 = *valuep;
       break;
-    case 8 :
+    case M32R_OPERAND_UIMM4 :
       fields->f_uimm4 = *valuep;
       break;
-    case 9 :
+    case M32R_OPERAND_UIMM5 :
       fields->f_uimm5 = *valuep;
       break;
-    case 10 :
+    case M32R_OPERAND_UIMM16 :
       fields->f_uimm16 = *valuep;
       break;
-    case 11 :
+    case M32R_OPERAND_ACC_S :
+      fields->f_acc_s = *valuep;
+      break;
+    case M32R_OPERAND_ACC :
+      fields->f_acc = *valuep;
+      break;
+    case M32R_OPERAND_HI16 :
       fields->f_hi16 = *valuep;
       break;
-    case 12 :
+    case M32R_OPERAND_SLO16 :
       fields->f_simm16 = *valuep;
       break;
-    case 13 :
+    case M32R_OPERAND_ULO16 :
       fields->f_uimm16 = *valuep;
       break;
-    case 14 :
+    case M32R_OPERAND_UIMM24 :
       fields->f_uimm24 = *valuep;
       break;
-    case 15 :
+    case M32R_OPERAND_DISP8 :
       fields->f_disp8 = *valuep;
       break;
-    case 16 :
+    case M32R_OPERAND_DISP16 :
       fields->f_disp16 = *valuep;
       break;
-    case 17 :
+    case M32R_OPERAND_DISP24 :
       fields->f_disp24 = *valuep;
       break;
 
@@ -905,64 +1503,70 @@ m32r_cgen_set_operand (opindex, valuep, fields)
 CGEN_INLINE long
 m32r_cgen_get_operand (opindex, fields)
      int opindex;
-     const struct cgen_fields *fields;
+     const CGEN_FIELDS *fields;
 {
   long value;
 
   switch (opindex)
     {
-    case 0 :
+    case M32R_OPERAND_SR :
       value = fields->f_r2;
       break;
-    case 1 :
+    case M32R_OPERAND_DR :
       value = fields->f_r1;
       break;
-    case 2 :
+    case M32R_OPERAND_SRC1 :
       value = fields->f_r1;
       break;
-    case 3 :
+    case M32R_OPERAND_SRC2 :
       value = fields->f_r2;
       break;
-    case 4 :
+    case M32R_OPERAND_SCR :
       value = fields->f_r2;
       break;
-    case 5 :
+    case M32R_OPERAND_DCR :
       value = fields->f_r1;
       break;
-    case 6 :
+    case M32R_OPERAND_SIMM8 :
       value = fields->f_simm8;
       break;
-    case 7 :
+    case M32R_OPERAND_SIMM16 :
       value = fields->f_simm16;
       break;
-    case 8 :
+    case M32R_OPERAND_UIMM4 :
       value = fields->f_uimm4;
       break;
-    case 9 :
+    case M32R_OPERAND_UIMM5 :
       value = fields->f_uimm5;
       break;
-    case 10 :
+    case M32R_OPERAND_UIMM16 :
       value = fields->f_uimm16;
       break;
-    case 11 :
+    case M32R_OPERAND_ACC_S :
+      value = fields->f_acc_s;
+      break;
+    case M32R_OPERAND_ACC :
+      value = fields->f_acc;
+      break;
+    case M32R_OPERAND_HI16 :
       value = fields->f_hi16;
       break;
-    case 12 :
+    case M32R_OPERAND_SLO16 :
       value = fields->f_simm16;
       break;
-    case 13 :
+    case M32R_OPERAND_ULO16 :
       value = fields->f_uimm16;
       break;
-    case 14 :
+    case M32R_OPERAND_UIMM24 :
       value = fields->f_uimm24;
       break;
-    case 15 :
+    case M32R_OPERAND_DISP8 :
       value = fields->f_disp8;
       break;
-    case 16 :
+    case M32R_OPERAND_DISP16 :
       value = fields->f_disp16;
       break;
-    case 17 :
+    case M32R_OPERAND_DISP24 :
       value = fields->f_disp24;
       break;
 
diff --git a/opcodes/m32r-opc.h b/opcodes/m32r-opc.h
new file mode 100644
index 00000000000..0c8f2f02991
--- /dev/null
+++ b/opcodes/m32r-opc.h
@@ -0,0 +1,234 @@
+/* Instruction description for m32r.
+
+This file is machine generated.
+
+Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+
+This file is part of the GNU Binutils and/or GDB, the GNU debugger.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef m32r_OPC_H
+#define m32r_OPC_H
+
+#define CGEN_ARCH m32r
+/* Given symbol S, return m32r_cgen_<s>.  */
+#define CGEN_SYM(s) CGEN_CAT3 (m32r,_cgen_,s)
+
+#define CGEN_WORD_BITSIZE 32
+#define CGEN_DEFAULT_INSN_BITSIZE 32
+#define CGEN_BASE_INSN_BITSIZE 32
+#define CGEN_MAX_INSN_BITSIZE 32
+#define CGEN_DEFAULT_INSN_SIZE (CGEN_DEFAULT_INSN_BITSIZE / 8)
+#define CGEN_BASE_INSN_SIZE (CGEN_BASE_INSN_BITSIZE / 8)
+#define CGEN_MAX_INSN_SIZE (CGEN_MAX_INSN_BITSIZE / 8)
+#define CGEN_INT_INSN
+
+/* +1 because the first entry is reserved (null) */
+#define CGEN_NUM_INSNS (165 + 1)
+#define CGEN_NUM_OPERANDS (24)
+
+/* Number of non-boolean attributes. */
+#define CGEN_MAX_INSN_ATTRS 2
+#define CGEN_MAX_OPERAND_ATTRS 0
+
+/* FIXME: Need to compute CGEN_MAX_SYNTAX_BYTES.  */
+
+/* CGEN_MNEMONIC_OPERANDS is defined if mnemonics have operands.
+   e.g. In "b,a foo" the ",a" is an operand.  If mnemonics have operands
+   we can't hash on everything up to the space.  */
+#define CGEN_MNEMONIC_OPERANDS
+
+/* Number of architecture variants.  */
+#define MAX_MACHS 2
+
+/* Enums.  */
+
+/* Enum declaration for insn format enums.  */
+typedef enum insn_op1 {
+  OP1_0 = 0, OP1_1 = 1, OP1_2 = 2, OP1_3 = 3,
+  OP1_4 = 4, OP1_5 = 5, OP1_6 = 6, OP1_7 = 7,
+  OP1_8 = 8, OP1_9 = 9, OP1_10 = 10, OP1_11 = 11,
+  OP1_12 = 12, OP1_13 = 13, OP1_14 = 14, OP1_15 = 15
+} INSN_OP1;
+
+/* Enum declaration for op2 enums.  */
+typedef enum insn_op2 {
+  OP2_0 = 0, OP2_1 = 1, OP2_2 = 2, OP2_3 = 3,
+  OP2_4 = 4, OP2_5 = 5, OP2_6 = 6, OP2_7 = 7,
+  OP2_8 = 8, OP2_9 = 9, OP2_10 = 10, OP2_11 = 11,
+  OP2_12 = 12, OP2_13 = 13, OP2_14 = 14, OP2_15 = 15
+} INSN_OP2;
+
+/* Enum declaration for m32r operand types.  */
+typedef enum cgen_operand_type {
+  M32R_OPERAND_PC = 0, M32R_OPERAND_SR = 1, M32R_OPERAND_DR = 2, M32R_OPERAND_SRC1 = 3,
+  M32R_OPERAND_SRC2 = 4, M32R_OPERAND_SCR = 5, M32R_OPERAND_DCR = 6, M32R_OPERAND_SIMM8 = 7,
+  M32R_OPERAND_SIMM16 = 8, M32R_OPERAND_UIMM4 = 9, M32R_OPERAND_UIMM5 = 10, M32R_OPERAND_UIMM16 = 11,
+  M32R_OPERAND_ACC_S = 12, M32R_OPERAND_ACC = 13, M32R_OPERAND_HI16 = 14, M32R_OPERAND_SLO16 = 15,
+  M32R_OPERAND_ULO16 = 16, M32R_OPERAND_UIMM24 = 17, M32R_OPERAND_DISP8 = 18, M32R_OPERAND_DISP16 = 19,
+  M32R_OPERAND_DISP24 = 20, M32R_OPERAND_CONDBIT = 21, M32R_OPERAND_ACCUM = 22, M32R_OPERAND_ABORT_PARALLEL_EXECUTION = 23
+} CGEN_OPERAND_TYPE;
+
+/* Non-boolean attributes.  */
+
+/* Enum declaration for machine type selection.  */
+typedef enum mach_attr {
+  MACH_M32R = 0, MACH_M32RX = 1
+} MACH_ATTR;
+
+/* Enum declaration for parallel execution pipeline selection.  */
+typedef enum pipe_attr {
+  PIPE_NONE = 0, PIPE_O = 1, PIPE_S = 2, PIPE_OS = 3
+} PIPE_ATTR;
+
+/* Operand and instruction attribute indices.  */
+
+/* Enum declaration for cgen_operand attrs.  */
+typedef enum cgen_operand_attr {
+  CGEN_OPERAND_ABS_ADDR, CGEN_OPERAND_FAKE, CGEN_OPERAND_NEGATIVE, CGEN_OPERAND_PC,
+  CGEN_OPERAND_PCREL_ADDR, CGEN_OPERAND_RELAX, CGEN_OPERAND_RELOC, CGEN_OPERAND_SIGN_OPT,
+  CGEN_OPERAND_UNSIGNED
+} CGEN_OPERAND_ATTR;
+
+/* Enum declaration for cgen_insn attrs.  */
+typedef enum cgen_insn_attr {
+  CGEN_INSN_MACH, CGEN_INSN_PIPE, CGEN_INSN_ALIAS, CGEN_INSN_COND_CTI,
+  CGEN_INSN_FILL_SLOT, CGEN_INSN_PARALLEL, CGEN_INSN_RELAX, CGEN_INSN_RELAX_BC,
+  CGEN_INSN_RELAX_BCL, CGEN_INSN_RELAX_BL, CGEN_INSN_RELAX_BNC, CGEN_INSN_RELAX_BNCL,
+  CGEN_INSN_RELAX_BRA, CGEN_INSN_RELAXABLE, CGEN_INSN_UNCOND_CTI
+} CGEN_INSN_ATTR;
+
+/* Insn types are used by the simulator.  */
+/* Enum declaration for m32r instruction types.  */
+typedef enum cgen_insn_type {
+  M32R_INSN_ILLEGAL, M32R_INSN_ADD, M32R_INSN_ADD3, M32R_INSN_AND,
+  M32R_INSN_AND3, M32R_INSN_OR, M32R_INSN_OR3, M32R_INSN_XOR,
+  M32R_INSN_XOR3, M32R_INSN_ADDI, M32R_INSN_ADDV, M32R_INSN_ADDV3,
+  M32R_INSN_ADDX, M32R_INSN_BC8, M32R_INSN_BC8_S, M32R_INSN_BC24,
+  M32R_INSN_BC24_L, M32R_INSN_BEQ, M32R_INSN_BEQZ, M32R_INSN_BGEZ,
+  M32R_INSN_BGTZ, M32R_INSN_BLEZ, M32R_INSN_BLTZ, M32R_INSN_BNEZ,
+  M32R_INSN_BL8, M32R_INSN_BL8_S, M32R_INSN_BL24, M32R_INSN_BL24_L,
+  M32R_INSN_BCL8, M32R_INSN_BCL8_S, M32R_INSN_BCL24, M32R_INSN_BCL24_L,
+  M32R_INSN_BNC8, M32R_INSN_BNC8_S, M32R_INSN_BNC24, M32R_INSN_BNC24_L,
+  M32R_INSN_BNE, M32R_INSN_BRA8, M32R_INSN_BRA8_S, M32R_INSN_BRA24,
+  M32R_INSN_BRA24_L, M32R_INSN_BNCL8, M32R_INSN_BNCL8_S, M32R_INSN_BNCL24,
+  M32R_INSN_BNCL24_L, M32R_INSN_CMP, M32R_INSN_CMPI, M32R_INSN_CMPU,
+  M32R_INSN_CMPUI, M32R_INSN_CMPEQ, M32R_INSN_CMPZ, M32R_INSN_DIV,
+  M32R_INSN_DIVU, M32R_INSN_REM, M32R_INSN_REMU, M32R_INSN_JC,
+  M32R_INSN_JNC, M32R_INSN_JL, M32R_INSN_JMP, M32R_INSN_LD,
+  M32R_INSN_LD_2, M32R_INSN_LD_D, M32R_INSN_LD_D2, M32R_INSN_LDB,
+  M32R_INSN_LDB_2, M32R_INSN_LDB_D, M32R_INSN_LDB_D2, M32R_INSN_LDH,
+  M32R_INSN_LDH_2, M32R_INSN_LDH_D, M32R_INSN_LDH_D2, M32R_INSN_LDUB,
+  M32R_INSN_LDUB_2, M32R_INSN_LDUB_D, M32R_INSN_LDUB_D2, M32R_INSN_LDUH,
+  M32R_INSN_LDUH_2, M32R_INSN_LDUH_D, M32R_INSN_LDUH_D2, M32R_INSN_LD_PLUS,
+  M32R_INSN_LD24, M32R_INSN_LDI8, M32R_INSN_LDI8A, M32R_INSN_LDI16,
+  M32R_INSN_LDI16A, M32R_INSN_LOCK, M32R_INSN_MACHI, M32R_INSN_MACHI_A,
+  M32R_INSN_MACLO, M32R_INSN_MACLO_A, M32R_INSN_MACWHI, M32R_INSN_MACWHI_A,
+  M32R_INSN_MACWLO, M32R_INSN_MACWLO_A, M32R_INSN_MUL, M32R_INSN_MULHI,
+  M32R_INSN_MULHI_A, M32R_INSN_MULLO, M32R_INSN_MULLO_A, M32R_INSN_MULWHI,
+  M32R_INSN_MULWHI_A, M32R_INSN_MULWLO, M32R_INSN_MULWLO_A, M32R_INSN_MV,
+  M32R_INSN_MVFACHI, M32R_INSN_MVFACHI_A, M32R_INSN_MVFACLO, M32R_INSN_MVFACLO_A,
+  M32R_INSN_MVFACMI, M32R_INSN_MVFACMI_A, M32R_INSN_MVFC, M32R_INSN_MVTACHI,
+  M32R_INSN_MVTACHI_A, M32R_INSN_MVTACLO, M32R_INSN_MVTACLO_A, M32R_INSN_MVTC,
+  M32R_INSN_NEG, M32R_INSN_NOP, M32R_INSN_NOT, M32R_INSN_RAC,
+  M32R_INSN_RAC_A, M32R_INSN_RACH, M32R_INSN_RACH_A, M32R_INSN_RTE,
+  M32R_INSN_SETH, M32R_INSN_SLL, M32R_INSN_SLL3, M32R_INSN_SLLI,
+  M32R_INSN_SRA, M32R_INSN_SRA3, M32R_INSN_SRAI, M32R_INSN_SRL,
+  M32R_INSN_SRL3, M32R_INSN_SRLI, M32R_INSN_ST, M32R_INSN_ST_2,
+  M32R_INSN_ST_D, M32R_INSN_ST_D2, M32R_INSN_STB, M32R_INSN_STB_2,
+  M32R_INSN_STB_D, M32R_INSN_STB_D2, M32R_INSN_STH, M32R_INSN_STH_2,
+  M32R_INSN_STH_D, M32R_INSN_STH_D2, M32R_INSN_ST_PLUS, M32R_INSN_ST_MINUS,
+  M32R_INSN_SUB, M32R_INSN_SUBV, M32R_INSN_SUBX, M32R_INSN_TRAP,
+  M32R_INSN_UNLOCK, M32R_INSN_PUSH, M32R_INSN_POP, M32R_INSN_SATB,
+  M32R_INSN_SATH, M32R_INSN_SAT, M32R_INSN_PCMPBZ, M32R_INSN_SADD,
+  M32R_INSN_MACWU1, M32R_INSN_MSBLO, M32R_INSN_MULWU1, M32R_INSN_MACHL1,
+  M32R_INSN_SC, M32R_INSN_SNC, M32R_INSN_MAX
+} CGEN_INSN_TYPE;
+
+/* Index of `illegal' insn place holder.  */
+#define CGEN_INSN_ILLEGAL M32R_INSN_ILLEGAL
+/* Total number of insns in table.  */
+#define CGEN_MAX_INSNS ((int) M32R_INSN_MAX)
+
+/* cgen.h uses things we just defined.  */
+#include "opcode/cgen.h"
+
+/* This struct records data prior to insertion or after extraction.  */
+typedef struct cgen_fields {
+  long f_nil;
+  long f_op1;
+  long f_op2;
+  long f_cond;
+  long f_r1;
+  long f_r2;
+  long f_simm8;
+  long f_simm16;
+  long f_shift_op2;
+  long f_uimm4;
+  long f_uimm5;
+  long f_uimm16;
+  long f_uimm24;
+  long f_hi16;
+  long f_disp8;
+  long f_disp16;
+  long f_disp24;
+  long f_op23;
+  long f_op3;
+  long f_acc;
+  long f_acc_s;
+  int length;
+} CGEN_FIELDS;
+
+/* Attributes.  */
+extern const CGEN_ATTR_TABLE m32r_cgen_operand_attr_table[];
+extern const CGEN_ATTR_TABLE m32r_cgen_insn_attr_table[];
+
+extern CGEN_KEYWORD m32r_cgen_opval_mach;
+extern CGEN_KEYWORD m32r_cgen_opval_h_gr;
+extern CGEN_KEYWORD m32r_cgen_opval_h_cr;
+extern CGEN_KEYWORD m32r_cgen_opval_h_accums;
+
+#define CGEN_INIT_PARSE() \
+{\
+}
+#define CGEN_INIT_INSERT() \
+{\
+}
+#define CGEN_INIT_EXTRACT() \
+{\
+}
+#define CGEN_INIT_PRINT() \
+{\
+}
+
+/* -- opc.h */
+
+#undef CGEN_DIS_HASH_SIZE
+#define CGEN_DIS_HASH_SIZE 256
+#undef CGEN_DIS_HASH
+#define X(b) (((unsigned char *) (b))[0] & 0xf0)
+#define CGEN_DIS_HASH(buffer, insn) \
+(X (buffer) | \
+ (X (buffer) == 0x40 || X (buffer) == 0xe0 || X (buffer) == 0x60 || X (buffer) == 0x50 ? 0 \
+  : X (buffer) == 0x70 || X (buffer) == 0xf0 ? (((unsigned char *) (buffer))[0] & 0xf) \
+  : ((((unsigned char *) (buffer))[1] & 0xf0) >> 4)))
+
+/* -- */
+
+
+#endif /* m32r_OPC_H */