From: Doug Evans <dje@google.com>
Date: Thu, 12 Feb 1998 03:13:21 +0000 (+0000)
Subject: 	* cgen-opc.in: New file.
X-Git-Tag: gdb-4_18~3401
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab0bd0493ad0dbb544fec8f46b03a0887c594bec;p=external%2Fbinutils.git

	* cgen-opc.in: New file.
	* cgen.sh: Translate @ARCH@.  Cat cgen-opc.in into @arch@-opc.c.
	* Makefile.am (CGENFILES): Add cgen-opc.in.
	* Makefile.in: Regenerate.

	* cgen-opc.c (cgen_set_cpu): Delete init of hw list `next' chain.
	(cgen_hw_lookup): Make result const.

	* cgen-dis.in (*): Use PTR instead of void *.
	(print_insn): Delete unused vars `i', `syntax'.

	* m32r-opc.h, m32r-opc.c, m32r-asm.c, m32r-dis.c: Regenerate.
---

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index b53c650..9cd333c 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -15,7 +15,7 @@
 
 Do-first:
 
-cygnus_files="cgen.sh cgen-asm.in cgen-dis.in"
+cygnus_files="cgen.sh cgen-asm.in cgen-dis.in cgen-opc.in"
 
 if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
 	keep_these_too="${cygnus_files} ${keep_these_too}"
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 8bb9eab..be2e312 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,7 +1,23 @@
+Wed Feb 11 18:58:34 1998  Doug Evans  <devans@seba.cygnus.com>
+
+	* cgen-opc.in: New file.
+	* cgen.sh: Translate @ARCH@.  Cat cgen-opc.in into @arch@-opc.c.
+	* Makefile.am (CGENFILES): Add cgen-opc.in.
+	* Makefile.in: Regenerate.
+
+	* cgen-opc.c (cgen_set_cpu): Delete init of hw list `next' chain.
+	(cgen_hw_lookup): Make result const.
+
+	* cgen-dis.in (*): Use PTR instead of void *.
+	(print_insn): Delete unused vars `i', `syntax'.
+
+	* m32r-opc.h, m32r-opc.c, m32r-asm.c, m32r-dis.c: Regenerate.
+
 start-sanitize-sky
 Tue Feb 10 14:56:24 1998  Doug Evans  <devans@canuck.cygnus.com>
 
 	* dvp-opc.c (*): pke,gpuif renamed to vif,gif.
+	(vif_opcodes): Update renamed insns.
 	* dvp-dis.c (*): Likewise.
 
 end-sanitize-sky
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 570469c..4fc2e46 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -55,6 +55,7 @@ CFILES = \
 	sh-dis.c \
 	sparc-dis.c \
 	sparc-opc.c \
+	tic30-dis.c \
 	w65-dis.c \
 	z8k-dis.c \
 	z8kgen.c
@@ -99,6 +100,7 @@ ALL_MACHINES = \
 	sh-dis.lo \
 	sparc-dis.lo \
 	sparc-opc.lo \
+	tic30-dis.lo \
 	$(start-sanitize-tic80) \
 	tic80-dis.lo \
 	tic80-opc.lo \
@@ -158,7 +160,7 @@ CGENFILES = $(CGENDIR)/object.scm $(CGENDIR)/utils.scm \
 	$(CGENDIR)/ifield.scm $(CGENDIR)/iformat.scm \
 	$(CGENDIR)/operand.scm $(CGENDIR)/insn.scm \
 	$(CGENDIR)/opcodes.scm $(CGENDIR)/cgen-opc.scm \
-	cgen-asm.in cgen-dis.in
+	cgen-opc.in cgen-asm.in cgen-dis.in
 # The end marker is written this way to pass through automake unscathed.
 ENDSAN = end-sanitize-cygnus
 
@@ -243,7 +245,8 @@ alpha-dis.lo: alpha-dis.c $(INCDIR)/ansidecl.h sysdep.h \
 alpha-opc.lo: alpha-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/alpha.h \
   $(BFD_H)
 arm-dis.lo: arm-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \
-  $(INCDIR)/ansidecl.h arm-opc.h
+  $(INCDIR)/ansidecl.h arm-opc.h $(INCDIR)/coff/internal.h \
+  $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/libiberty.h \
   $(BFD_H) $(INCDIR)/opcode/cgen.h
 cgen-dis.lo: cgen-dis.c sysdep.h config.h $(INCDIR)/libiberty.h \
@@ -301,6 +304,8 @@ sparc-dis.lo: sparc-dis.c $(INCDIR)/ansidecl.h sysdep.h \
   config.h $(INCDIR)/opcode/sparc.h $(INCDIR)/dis-asm.h \
   $(BFD_H) $(INCDIR)/libiberty.h
 sparc-opc.lo: sparc-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/sparc.h
+tic30-dis.lo: tic30-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \
+  $(INCDIR)/ansidecl.h $(INCDIR)/opcode/tic30.h
 w65-dis.lo: w65-dis.c w65-opc.h $(INCDIR)/dis-asm.h \
   $(BFD_H) $(INCDIR)/ansidecl.h
 z8k-dis.lo: z8k-dis.c sysdep.h config.h $(INCDIR)/dis-asm.h \
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index deb5f12..6e55b1c 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -65,6 +65,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+NM = @NM@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -125,6 +126,7 @@ CFILES = \
 	sh-dis.c \
 	sparc-dis.c \
 	sparc-opc.c \
+	tic30-dis.c \
 	w65-dis.c \
 	z8k-dis.c \
 	z8kgen.c
@@ -169,6 +171,7 @@ ALL_MACHINES = \
 	sh-dis.lo \
 	sparc-dis.lo \
 	sparc-opc.lo \
+	tic30-dis.lo \
 	$(start-sanitize-tic80) \
 	tic80-dis.lo \
 	tic80-opc.lo \
@@ -218,7 +221,7 @@ CGENFILES = $(CGENDIR)/object.scm $(CGENDIR)/utils.scm \
 	$(CGENDIR)/ifield.scm $(CGENDIR)/iformat.scm \
 	$(CGENDIR)/operand.scm $(CGENDIR)/insn.scm \
 	$(CGENDIR)/opcodes.scm $(CGENDIR)/cgen-opc.scm \
-	cgen-asm.in cgen-dis.in
+	cgen-opc.in cgen-asm.in cgen-dis.in
 # The end marker is written this way to pass through automake unscathed.
 ENDSAN = end-sanitize-cygnus
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -599,7 +602,8 @@ alpha-dis.lo: alpha-dis.c $(INCDIR)/ansidecl.h sysdep.h \
 alpha-opc.lo: alpha-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/alpha.h \
   $(BFD_H)
 arm-dis.lo: arm-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \
-  $(INCDIR)/ansidecl.h arm-opc.h
+  $(INCDIR)/ansidecl.h arm-opc.h $(INCDIR)/coff/internal.h \
+  $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/libiberty.h \
   $(BFD_H) $(INCDIR)/opcode/cgen.h
 cgen-dis.lo: cgen-dis.c sysdep.h config.h $(INCDIR)/libiberty.h \
@@ -657,6 +661,8 @@ sparc-dis.lo: sparc-dis.c $(INCDIR)/ansidecl.h sysdep.h \
   config.h $(INCDIR)/opcode/sparc.h $(INCDIR)/dis-asm.h \
   $(BFD_H) $(INCDIR)/libiberty.h
 sparc-opc.lo: sparc-opc.c $(INCDIR)/ansidecl.h $(INCDIR)/opcode/sparc.h
+tic30-dis.lo: tic30-dis.c $(INCDIR)/dis-asm.h $(BFD_H) \
+  $(INCDIR)/ansidecl.h $(INCDIR)/opcode/tic30.h
 w65-dis.lo: w65-dis.c w65-opc.h $(INCDIR)/dis-asm.h \
   $(BFD_H) $(INCDIR)/ansidecl.h
 z8k-dis.lo: z8k-dis.c sysdep.h config.h $(INCDIR)/dis-asm.h \
diff --git a/opcodes/cgen-dis.in b/opcodes/cgen-dis.in
index af3dfc6..0724b44 100644
--- a/opcodes/cgen-dis.in
+++ b/opcodes/cgen-dis.in
@@ -57,7 +57,7 @@ static void print_insn_normal
 
 static int
 extract_normal (buf_ctrl, insn_value, attrs, start, length, shift, total_length, valuep)
-     void *buf_ctrl;
+     PTR buf_ctrl;
      cgen_insn_t insn_value;
      unsigned int attrs;
      int start, length, shift, total_length;
@@ -94,7 +94,7 @@ 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;
+     PTR dis_info;
      long value;
      unsigned int attrs;
      unsigned long pc; /* FIXME: should be bfd_vma */
@@ -121,7 +121,7 @@ print_normal (dis_info, value, attrs, pc, length)
 
 static void
 print_keyword (dis_info, keyword_table, value, attrs)
-     void *dis_info;
+     PTR dis_info;
      CGEN_KEYWORD *keyword_table;
      long value;
      CGEN_ATTR *attrs;
@@ -147,7 +147,7 @@ print_keyword (dis_info, keyword_table, value, attrs)
 static int
 extract_insn_normal (insn, buf_ctrl, insn_value, fields)
      const CGEN_INSN *insn;
-     void *buf_ctrl;
+     PTR buf_ctrl;
      cgen_insn_t insn_value;
      CGEN_FIELDS *fields;
 {
@@ -177,13 +177,13 @@ extract_insn_normal (insn, buf_ctrl, insn_value, fields)
 
 /* Default insn printer.
 
-   DIS_INFO is defined as `void *' so the disassembler needn't know anything
+   DIS_INFO is defined as `PTR' so the disassembler needn't know anything
    about disassemble_info.
 */
 
 static void
 print_insn_normal (dis_info, insn, fields, pc, length)
-     void *dis_info;
+     PTR dis_info;
      const CGEN_INSN *insn;
      CGEN_FIELDS *fields;
      bfd_vma pc;
@@ -215,7 +215,7 @@ print_insn_normal (dis_info, insn, fields, pc, length)
 }
 
 /* Default value for CGEN_PRINT_INSN.
-   Given BUFLEN bytes (target byte order) read into BUF, look up the
+   Given BUFLEN bits (target byte order) read into BUF, look up the
    insn in the instruction table and disassemble it.
 
    The result is the size of the insn in bytes.  */
@@ -231,7 +231,6 @@ print_insn (pc, info, buf, buflen)
      char *buf;
      int buflen;
 {
-  int i;
   unsigned long insn_value;
   const CGEN_INSN_LIST *insn_list;
 
@@ -257,7 +256,6 @@ print_insn (pc, info, buf, buflen)
   while (insn_list != NULL)
     {
       const CGEN_INSN *insn = insn_list->insn;
-      const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
       CGEN_FIELDS fields;
       int length;
 
diff --git a/opcodes/cgen-opc.in b/opcodes/cgen-opc.in
new file mode 100644
index 0000000..d88df31
--- /dev/null
+++ b/opcodes/cgen-opc.in
@@ -0,0 +1,143 @@
+/* Generic opcode table support for targets using CGEN. -*- C -*-
+   CGEN: Cpu tools GENerator
+
+This file is used to generate @arch@-opc.c.
+
+Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of the GNU Binutils and GDB, the GNU debugger.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include "sysdep.h"
+#include <stdio.h>
+#include "ansidecl.h"
+#include "libiberty.h"
+#include "bfd.h"
+#include "symcat.h"
+#include "@arch@-opc.h"
+
+/* Look up instruction INSN_VALUE and extract its fields.
+   If non-null INSN is the insn table entry.
+   Otherwise INSN_VALUE is examined to compute it.
+   LENGTH is the bit length of INSN_VALUE if known, otherwise 0.
+   The result a pointer to the insn table entry, or NULL if the instruction
+   wasn't recognized.  */
+
+const CGEN_INSN *
+@arch@_cgen_lookup_insn (insn, insn_value, length, fields)
+     const CGEN_INSN *insn;
+     cgen_insn_t insn_value;
+     int length;
+     CGEN_FIELDS *fields;
+{
+  char buf[4];
+
+  if (!insn)
+    {
+      const CGEN_INSN_LIST *insn_list;
+
+#ifdef CGEN_INT_INSN
+      switch (length)
+	{
+	case 8:
+	  buf[0] = insn_value;
+	  break;
+	case 16:
+	  if (cgen_current_endian == CGEN_ENDIAN_BIG)
+	    bfd_putb16 (insn_value, buf);
+	  else
+	    bfd_putl16 (insn_value, buf);
+	  break;
+	case 32:
+	  if (cgen_current_endian == CGEN_ENDIAN_BIG)
+	    bfd_putb32 (insn_value, buf);
+	  else
+	    bfd_putl32 (insn_value, buf);
+	  break;
+	default:
+	  abort ();
+	}
+#else
+      abort (); /* FIXME: unfinished */
+#endif
+
+      /* 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)
+	{
+	  insn = insn_list->insn;
+
+	  /* Basic bit mask must be correct.  */
+	  /* ??? May wish to allow target to defer this check until the extract
+	     handler.  */
+	  if ((insn_value & CGEN_INSN_MASK (insn)) == CGEN_INSN_VALUE (insn))
+	    {
+	      length = (*CGEN_EXTRACT_FN (insn)) (insn, NULL, insn_value, fields);
+	      if (length > 0)
+		return insn;
+	    }
+
+	  insn_list = CGEN_DIS_NEXT_INSN (insn_list);
+	}
+    }
+  else
+    {
+      length = (*CGEN_EXTRACT_FN (insn)) (insn, NULL, insn_value, fields);
+      if (length > 0)
+	return insn;
+    }
+
+  return NULL;
+}
+
+/* Fill in the operand instances used by insn INSN_VALUE.
+   If non-null INS is the insn table entry.
+   Otherwise INSN_VALUE is examined to compute it.
+   LENGTH is the number of bits in INSN_VALUE if known, otherwise 0.
+   INDICES is a pointer to a buffer of MAX_OPERANDS ints to be filled in.
+   The result a pointer to the insn table entry, or NULL if the instruction
+   wasn't recognized.  */
+
+const CGEN_INSN *
+@arch@_cgen_get_insn_operands (insn, insn_value, length, indices)
+     const CGEN_INSN *insn;
+     cgen_insn_t insn_value;
+     int length;
+     int *indices;
+{
+  CGEN_FIELDS fields;
+  const CGEN_OPERAND_INSTANCE *opinst;
+  int i;
+
+  insn = @arch@_cgen_lookup_insn (insn, insn_value, length, &fields);
+  if (! insn)
+    return NULL;
+
+  for (i = 0, opinst = CGEN_INSN_OPERANDS (insn);
+       CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
+       ++i, ++opinst)
+    {
+      const CGEN_OPERAND *op = CGEN_OPERAND_INSTANCE_OPERAND (opinst);
+      if (op == NULL)
+	indices[i] = CGEN_OPERAND_INSTANCE_INDEX (opinst);
+      else
+	indices[i] = @arch@_cgen_get_operand (CGEN_OPERAND_INDEX (op), &fields);
+    }
+
+  return insn;
+}
diff --git a/opcodes/m32r-asm.c b/opcodes/m32r-asm.c
index ce0bef0..318fa2d 100644
--- a/opcodes/m32r-asm.c
+++ b/opcodes/m32r-asm.c
@@ -304,26 +304,46 @@ m32r_cgen_parse_operand (opindex, strp, fields)
     case M32R_OPERAND_UIMM16 :
       errmsg = cgen_parse_unsigned_integer (strp, 11, 0, 65535, &fields->f_uimm16);
       break;
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_IMM1 :
+      errmsg = cgen_parse_unsigned_integer (strp, 12, 0, 1, &fields->f_imm1);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCD :
+      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_accums, & fields->f_accd);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCS :
+      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_accums, & fields->f_accs);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACC :
+      errmsg = cgen_parse_keyword (strp, & m32r_cgen_opval_h_accums, & fields->f_acc);
+      break;
+/* end-sanitize-m32rx */
     case M32R_OPERAND_HI16 :
-      errmsg = parse_h_hi16 (strp, 12, 0, 65535, &fields->f_hi16);
+      errmsg = parse_h_hi16 (strp, 16, 0, 65535, &fields->f_hi16);
       break;
     case M32R_OPERAND_SLO16 :
-      errmsg = parse_h_slo16 (strp, 13, -32768, 32767, &fields->f_simm16);
+      errmsg = parse_h_slo16 (strp, 17, -32768, 32767, &fields->f_simm16);
       break;
     case M32R_OPERAND_ULO16 :
-      errmsg = parse_h_ulo16 (strp, 14, 0, 65535, &fields->f_uimm16);
+      errmsg = parse_h_ulo16 (strp, 18, 0, 65535, &fields->f_uimm16);
       break;
     case M32R_OPERAND_UIMM24 :
-      errmsg = cgen_parse_address (strp, 15, 0, NULL, & fields->f_uimm24);
+      errmsg = cgen_parse_address (strp, 19, 0, NULL, & fields->f_uimm24);
       break;
     case M32R_OPERAND_DISP8 :
-      errmsg = cgen_parse_address (strp, 16, 0, NULL, & fields->f_disp8);
+      errmsg = cgen_parse_address (strp, 20, 0, NULL, & fields->f_disp8);
       break;
     case M32R_OPERAND_DISP16 :
-      errmsg = cgen_parse_address (strp, 17, 0, NULL, & fields->f_disp16);
+      errmsg = cgen_parse_address (strp, 21, 0, NULL, & fields->f_disp16);
       break;
     case M32R_OPERAND_DISP24 :
-      errmsg = cgen_parse_address (strp, 18, 0, NULL, & fields->f_disp24);
+      errmsg = cgen_parse_address (strp, 22, 0, NULL, & fields->f_disp24);
       break;
 
     default :
@@ -390,6 +410,26 @@ m32r_cgen_insert_operand (opindex, fields, buffer)
     case M32R_OPERAND_UIMM16 :
       insert_normal (fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
       break;
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_IMM1 :
+      insert_normal (fields->f_imm1, 0|(1<<CGEN_OPERAND_UNSIGNED), 15, 1, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCD :
+      insert_normal (fields->f_accd, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 2, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCS :
+      insert_normal (fields->f_accs, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 2, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACC :
+      insert_normal (fields->f_acc, 0|(1<<CGEN_OPERAND_UNSIGNED), 8, 1, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
+      break;
+/* end-sanitize-m32rx */
     case M32R_OPERAND_HI16 :
       insert_normal (fields->f_hi16, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), 16, 16, 0, CGEN_FIELDS_BITSIZE (fields), buffer);
       break;
@@ -470,6 +510,26 @@ m32r_cgen_validate_operand (opindex, fields)
     case M32R_OPERAND_UIMM16 :
       errmsg = cgen_validate_unsigned_integer (fields->f_uimm16, 0, 65535);
       break;
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_IMM1 :
+      errmsg = cgen_validate_unsigned_integer (fields->f_imm1, 0, 1);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCD :
+      /* nothing to do */
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCS :
+      /* nothing to do */
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACC :
+      /* nothing to do */
+      break;
+/* end-sanitize-m32rx */
     case M32R_OPERAND_HI16 :
       errmsg = cgen_validate_unsigned_integer (fields->f_hi16, 0, 65535);
       break;
diff --git a/opcodes/m32r-dis.c b/opcodes/m32r-dis.c
index d0b9733..9b467eb 100644
--- a/opcodes/m32r-dis.c
+++ b/opcodes/m32r-dis.c
@@ -57,7 +57,7 @@ static void print_insn_normal
 
 static int
 extract_normal (buf_ctrl, insn_value, attrs, start, length, shift, total_length, valuep)
-     void *buf_ctrl;
+     PTR buf_ctrl;
      cgen_insn_t insn_value;
      unsigned int attrs;
      int start, length, shift, total_length;
@@ -94,7 +94,7 @@ 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;
+     PTR dis_info;
      long value;
      unsigned int attrs;
      unsigned long pc; /* FIXME: should be bfd_vma */
@@ -121,7 +121,7 @@ print_normal (dis_info, value, attrs, pc, length)
 
 static void
 print_keyword (dis_info, keyword_table, value, attrs)
-     void *dis_info;
+     PTR dis_info;
      CGEN_KEYWORD *keyword_table;
      long value;
      CGEN_ATTR *attrs;
@@ -197,7 +197,7 @@ my_print_insn (pc, info, buf, buflen)
 CGEN_INLINE int
 m32r_cgen_extract_operand (opindex, buf_ctrl, insn_value, fields)
      int opindex;
-     void * buf_ctrl;
+     PTR buf_ctrl;
      cgen_insn_t insn_value;
      CGEN_FIELDS * fields;
 {
@@ -238,6 +238,26 @@ m32r_cgen_extract_operand (opindex, buf_ctrl, insn_value, fields)
     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;
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_IMM1 :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 15, 1, 0, CGEN_FIELDS_BITSIZE (fields), & fields->f_imm1);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCD :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 4, 2, 0, CGEN_FIELDS_BITSIZE (fields), & fields->f_accd);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCS :
+      length = extract_normal (NULL /*FIXME*/, insn_value, 0|(1<<CGEN_OPERAND_UNSIGNED), 12, 2, 0, CGEN_FIELDS_BITSIZE (fields), & fields->f_accs);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    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;
+/* end-sanitize-m32rx */
     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;
@@ -327,6 +347,26 @@ m32r_cgen_print_operand (opindex, info, fields, attrs, pc, length)
     case M32R_OPERAND_UIMM16 :
       print_normal (info, fields->f_uimm16, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
       break;
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_IMM1 :
+      print_normal (info, fields->f_imm1, 0|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCD :
+      print_keyword (info, & m32r_cgen_opval_h_accums, fields->f_accd, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCS :
+      print_keyword (info, & m32r_cgen_opval_h_accums, fields->f_accs, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACC :
+      print_keyword (info, & m32r_cgen_opval_h_accums, fields->f_acc, 0|(1<<CGEN_OPERAND_UNSIGNED));
+      break;
+/* end-sanitize-m32rx */
     case M32R_OPERAND_HI16 :
       print_normal (info, fields->f_hi16, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), pc, length);
       break;
@@ -389,7 +429,7 @@ m32r_cgen_init_dis (mach, endian)
 static int
 extract_insn_normal (insn, buf_ctrl, insn_value, fields)
      const CGEN_INSN *insn;
-     void *buf_ctrl;
+     PTR buf_ctrl;
      cgen_insn_t insn_value;
      CGEN_FIELDS *fields;
 {
@@ -419,13 +459,13 @@ extract_insn_normal (insn, buf_ctrl, insn_value, fields)
 
 /* Default insn printer.
 
-   DIS_INFO is defined as `void *' so the disassembler needn't know anything
+   DIS_INFO is defined as `PTR' so the disassembler needn't know anything
    about disassemble_info.
 */
 
 static void
 print_insn_normal (dis_info, insn, fields, pc, length)
-     void *dis_info;
+     PTR dis_info;
      const CGEN_INSN *insn;
      CGEN_FIELDS *fields;
      bfd_vma pc;
@@ -473,7 +513,6 @@ print_insn (pc, info, buf, buflen)
      char *buf;
      int buflen;
 {
-  int i;
   unsigned long insn_value;
   const CGEN_INSN_LIST *insn_list;
 
@@ -499,7 +538,6 @@ print_insn (pc, info, buf, buflen)
   while (insn_list != NULL)
     {
       const CGEN_INSN *insn = insn_list->insn;
-      const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
       CGEN_FIELDS fields;
       int length;
 
diff --git a/opcodes/m32r-opc.c b/opcodes/m32r-opc.c
index 38ad0de..3a32276 100644
--- a/opcodes/m32r-opc.c
+++ b/opcodes/m32r-opc.c
@@ -1,10 +1,11 @@
-/* CGEN opcode support for m32r.
+/* Generic opcode table support for targets using CGEN. -*- C -*-
+   CGEN: Cpu tools GENerator
 
-This file is machine generated with CGEN.
+This file is used to generate m32r-opc.c.
 
-Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+Copyright (C) 1998 Free Software Foundation, Inc.
 
-This file is part of the GNU Binutils and/or GDB, the GNU debugger.
+This file is part of the GNU Binutils and 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
@@ -16,20 +17,130 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-
+You should have received a copy of the GNU General Public 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 "libiberty.h"
 #include "bfd.h"
+#include "symcat.h"
 #include "m32r-opc.h"
 
+/* Look up instruction INSN_VALUE and extract its fields.
+   If non-null INSN is the insn table entry.
+   Otherwise INSN_VALUE is examined to compute it.
+   LENGTH is the bit length of INSN_VALUE if known, otherwise 0.
+   The result a pointer to the insn table entry, or NULL if the instruction
+   wasn't recognized.  */
+
+const CGEN_INSN *
+m32r_cgen_lookup_insn (insn, insn_value, length, fields)
+     const CGEN_INSN *insn;
+     cgen_insn_t insn_value;
+     int length;
+     CGEN_FIELDS *fields;
+{
+  char buf[4];
+
+  if (!insn)
+    {
+      const CGEN_INSN_LIST *insn_list;
+
+#ifdef CGEN_INT_INSN
+      switch (length)
+	{
+	case 8:
+	  buf[0] = insn_value;
+	  break;
+	case 16:
+	  if (cgen_current_endian == CGEN_ENDIAN_BIG)
+	    bfd_putb16 (insn_value, buf);
+	  else
+	    bfd_putl16 (insn_value, buf);
+	  break;
+	case 32:
+	  if (cgen_current_endian == CGEN_ENDIAN_BIG)
+	    bfd_putb32 (insn_value, buf);
+	  else
+	    bfd_putl32 (insn_value, buf);
+	  break;
+	default:
+	  abort ();
+	}
+#else
+      abort (); /* FIXME: unfinished */
+#endif
+
+      /* 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)
+	{
+	  insn = insn_list->insn;
+
+	  /* Basic bit mask must be correct.  */
+	  /* ??? May wish to allow target to defer this check until the extract
+	     handler.  */
+	  if ((insn_value & CGEN_INSN_MASK (insn)) == CGEN_INSN_VALUE (insn))
+	    {
+	      length = (*CGEN_EXTRACT_FN (insn)) (insn, NULL, insn_value, fields);
+	      if (length > 0)
+		return insn;
+	    }
+
+	  insn_list = CGEN_DIS_NEXT_INSN (insn_list);
+	}
+    }
+  else
+    {
+      length = (*CGEN_EXTRACT_FN (insn)) (insn, NULL, insn_value, fields);
+      if (length > 0)
+	return insn;
+    }
+
+  return NULL;
+}
+
+/* Fill in the operand instances used by insn INSN_VALUE.
+   If non-null INS is the insn table entry.
+   Otherwise INSN_VALUE is examined to compute it.
+   LENGTH is the number of bits in INSN_VALUE if known, otherwise 0.
+   INDICES is a pointer to a buffer of MAX_OPERANDS ints to be filled in.
+   The result a pointer to the insn table entry, or NULL if the instruction
+   wasn't recognized.  */
+
+const CGEN_INSN *
+m32r_cgen_get_insn_operands (insn, insn_value, length, indices)
+     const CGEN_INSN *insn;
+     cgen_insn_t insn_value;
+     int length;
+     int *indices;
+{
+  CGEN_FIELDS fields;
+  const CGEN_OPERAND_INSTANCE *opinst;
+  int i;
+
+  insn = m32r_cgen_lookup_insn (insn, insn_value, length, &fields);
+  if (! insn)
+    return NULL;
+
+  for (i = 0, opinst = CGEN_INSN_OPERANDS (insn);
+       CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
+       ++i, ++opinst)
+    {
+      const CGEN_OPERAND *op = CGEN_OPERAND_INSTANCE_OPERAND (opinst);
+      if (op == NULL)
+	indices[i] = CGEN_OPERAND_INSTANCE_INDEX (opinst);
+      else
+	indices[i] = m32r_cgen_get_operand (CGEN_OPERAND_INDEX (op), &fields);
+    }
+
+  return insn;
+}
 /* Attributes.  */
 
 static const CGEN_ATTR_ENTRY MACH_attr[] =
@@ -42,6 +153,20 @@ static const CGEN_ATTR_ENTRY MACH_attr[] =
   { 0, 0 }
 };
 
+static const CGEN_ATTR_ENTRY WRITE_LR_attr[] =
+{
+  { "NO", WRITE_LR_NO },
+  { "YES", WRITE_LR_YES },
+  { 0, 0 }
+};
+
+static const CGEN_ATTR_ENTRY WRITE_SRC_attr[] =
+{
+  { "NO", WRITE_SRC_NO },
+  { "YES", WRITE_SRC_YES },
+  { 0, 0 }
+};
+
 /* start-sanitize-m32rx */
 static const CGEN_ATTR_ENTRY PIPE_attr[] =
 {
@@ -73,6 +198,8 @@ const CGEN_ATTR_TABLE m32r_cgen_insn_attr_table[] =
 /* start-sanitize-m32rx */
   { "PIPE", & PIPE_attr[0] },
 /* end-sanitize-m32rx */
+  { "WRITE_LR", & WRITE_LR_attr[0] },
+  { "WRITE_SRC", & WRITE_SRC_attr[0] },
   { "ALIAS", NULL },
   { "COND-CTI", NULL },
   { "FILL-SLOT", NULL },
@@ -149,94 +276,532 @@ CGEN_KEYWORD m32r_cgen_opval_h_accums =
 
 /* end-sanitize-m32rx */
 
-static CGEN_HW_ENTRY m32r_cgen_hw_entries[] =
+/* The hardware table.  */
+
+#define HW_ENT(n) m32r_cgen_hw_entries[n]
+static const CGEN_HW_ENTRY m32r_cgen_hw_entries[] =
 {
-  { "h-pc", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-memory", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-sint", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-uint", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-addr", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-iaddr", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-hi16", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-slo16", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-ulo16", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-gr", CGEN_ASM_KEYWORD, (PTR) & m32r_cgen_opval_h_gr },
-  { "h-cr", CGEN_ASM_KEYWORD, (PTR) & m32r_cgen_opval_h_cr },
-  { "h-accum", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_PC, & HW_ENT (HW_H_PC + 1), "h-pc", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_MEMORY, & HW_ENT (HW_H_MEMORY + 1), "h-memory", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_SINT, & HW_ENT (HW_H_SINT + 1), "h-sint", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_UINT, & HW_ENT (HW_H_UINT + 1), "h-uint", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_ADDR, & HW_ENT (HW_H_ADDR + 1), "h-addr", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_IADDR, & HW_ENT (HW_H_IADDR + 1), "h-iaddr", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_HI16, & HW_ENT (HW_H_HI16 + 1), "h-hi16", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_SLO16, & HW_ENT (HW_H_SLO16 + 1), "h-slo16", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_ULO16, & HW_ENT (HW_H_ULO16 + 1), "h-ulo16", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_GR, & HW_ENT (HW_H_GR + 1), "h-gr", CGEN_ASM_KEYWORD, (PTR) & m32r_cgen_opval_h_gr },
+  { HW_H_CR, & HW_ENT (HW_H_CR + 1), "h-cr", CGEN_ASM_KEYWORD, (PTR) & m32r_cgen_opval_h_cr },
+  { HW_H_ACCUM, & HW_ENT (HW_H_ACCUM + 1), "h-accum", CGEN_ASM_KEYWORD, (PTR) 0 },
 /* start-sanitize-m32rx */
-  { "h-accums", CGEN_ASM_KEYWORD, (PTR) & m32r_cgen_opval_h_accums },
+  { HW_H_ACCUMS, & HW_ENT (HW_H_ACCUMS + 1), "h-accums", CGEN_ASM_KEYWORD, (PTR) & m32r_cgen_opval_h_accums },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
-  { "h-abort", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_ABORT, & HW_ENT (HW_H_ABORT + 1), "h-abort", CGEN_ASM_KEYWORD, (PTR) 0 },
 /* end-sanitize-m32rx */
-  { "h-cond", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-sm", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-bsm", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-ie", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-bie", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-bcond", CGEN_ASM_KEYWORD, (PTR) 0 },
-  { "h-bpc", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_COND, & HW_ENT (HW_H_COND + 1), "h-cond", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_SM, & HW_ENT (HW_H_SM + 1), "h-sm", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_BSM, & HW_ENT (HW_H_BSM + 1), "h-bsm", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_IE, & HW_ENT (HW_H_IE + 1), "h-ie", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_BIE, & HW_ENT (HW_H_BIE + 1), "h-bie", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_BCOND, & HW_ENT (HW_H_BCOND + 1), "h-bcond", CGEN_ASM_KEYWORD, (PTR) 0 },
+  { HW_H_BPC, & HW_ENT (HW_H_BPC + 1), "h-bpc", CGEN_ASM_KEYWORD, (PTR) 0 },
   { 0 }
 };
 
+/* The operand table.  */
+
+#define OP_ENT(op) m32r_cgen_operand_table[SYMCAT2 (M32R_OPERAND_,op)]
 const CGEN_OPERAND m32r_cgen_operand_table[MAX_OPERANDS] =
 {
 /* pc: program counter */
-  { "pc", 0, 0, { 0, 0|(1<<CGEN_OPERAND_FAKE)|(1<<CGEN_OPERAND_PC), { 0 } }  },
+  { "pc", & HW_ENT (HW_H_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 } }  },
+  { "sr", & HW_ENT (HW_H_GR), 12, 4,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* dr: destination register */
-  { "dr", 4, 4, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "dr", & HW_ENT (HW_H_GR), 4, 4,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* src1: source register 1 */
-  { "src1", 4, 4, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "src1", & HW_ENT (HW_H_GR), 4, 4,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* src2: source register 2 */
-  { "src2", 12, 4, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "src2", & HW_ENT (HW_H_GR), 12, 4,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* scr: source control register */
-  { "scr", 12, 4, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "scr", & HW_ENT (HW_H_CR), 12, 4,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* dcr: destination control register */
-  { "dcr", 4, 4, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "dcr", & HW_ENT (HW_H_CR), 4, 4,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* simm8: 8 bit signed immediate */
-  { "simm8", 8, 8, { 0, 0, { 0 } }  },
+  { "simm8", & HW_ENT (HW_H_SINT), 8, 8,
+    { 0, 0, { 0 } }  },
 /* simm16: 16 bit signed immediate */
-  { "simm16", 16, 16, { 0, 0, { 0 } }  },
+  { "simm16", & HW_ENT (HW_H_SINT), 16, 16,
+    { 0, 0, { 0 } }  },
 /* uimm4: 4 bit trap number */
-  { "uimm4", 12, 4, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "uimm4", & HW_ENT (HW_H_UINT), 12, 4,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* uimm5: 5 bit shift count */
-  { "uimm5", 11, 5, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "uimm5", & HW_ENT (HW_H_UINT), 11, 5,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* uimm16: 16 bit unsigned immediate */
-  { "uimm16", 16, 16, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "uimm16", & HW_ENT (HW_H_UINT), 16, 16,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+/* start-sanitize-m32rx */
+/* imm1: 1 bit immediate */
+  { "imm1", & HW_ENT (HW_H_UINT), 15, 1,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+/* accd: accumulator destination register */
+  { "accd", & HW_ENT (HW_H_ACCUMS), 4, 2,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+/* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
-/* accs: accumulator register */
-  { "accs", 12, 2, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+/* accs: accumulator source register */
+  { "accs", & HW_ENT (HW_H_ACCUMS), 12, 2,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* acc: accumulator reg (d) */
-  { "acc", 8, 1, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "acc", & HW_ENT (HW_H_ACCUMS), 8, 1,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* end-sanitize-m32rx */
 /* hi16: high 16 bit immediate, sign optional */
-  { "hi16", 16, 16, { 0, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "hi16", & HW_ENT (HW_H_HI16), 16, 16,
+    { 0, 0|(1<<CGEN_OPERAND_SIGN_OPT)|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* slo16: 16 bit signed immediate, for low() */
-  { "slo16", 16, 16, { 0, 0, { 0 } }  },
+  { "slo16", & HW_ENT (HW_H_SLO16), 16, 16,
+    { 0, 0, { 0 } }  },
 /* ulo16: 16 bit unsigned immediate, for low() */
-  { "ulo16", 16, 16, { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "ulo16", & HW_ENT (HW_H_ULO16), 16, 16,
+    { 0, 0|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* uimm24: 24 bit address */
-  { "uimm24", 8, 24, { 0, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_ABS_ADDR)|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
+  { "uimm24", & HW_ENT (HW_H_ADDR), 8, 24,
+    { 0, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_ABS_ADDR)|(1<<CGEN_OPERAND_UNSIGNED), { 0 } }  },
 /* disp8: 8 bit displacement */
-  { "disp8", 8, 8, { 0, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), { 0 } }  },
+  { "disp8", & HW_ENT (HW_H_IADDR), 8, 8,
+    { 0, 0|(1<<CGEN_OPERAND_RELAX)|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), { 0 } }  },
 /* disp16: 16 bit displacement */
-  { "disp16", 16, 16, { 0, 0|(1<<CGEN_OPERAND_RELOC)|(1<<CGEN_OPERAND_PCREL_ADDR), { 0 } }  },
+  { "disp16", & HW_ENT (HW_H_IADDR), 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 } }  },
+  { "disp24", & HW_ENT (HW_H_IADDR), 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 } }  },
+  { "condbit", & HW_ENT (HW_H_COND), 0, 0,
+    { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
 /* accum: accumulator */
-  { "accum", 0, 0, { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
+  { "accum", & HW_ENT (HW_H_ACCUM), 0, 0,
+    { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
 /* start-sanitize-m32rx */
 /* abort-parallel-execution: abort parallel execution */
-  { "abort-parallel-execution", 0, 0, { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
+  { "abort-parallel-execution", & HW_ENT (HW_H_ABORT), 0, 0,
+    { 0, 0|(1<<CGEN_OPERAND_FAKE), { 0 } }  },
 /* end-sanitize-m32rx */
 };
 
+/* Operand references.  */
+
+static const CGEN_OPERAND_INSTANCE fmt_0_add_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_1_add3_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SLO16), CGEN_MODE_HI, & OP_ENT (SLO16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_2_and3_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_UINT), CGEN_MODE_USI, & OP_ENT (UIMM16), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_3_or3_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ULO16), CGEN_MODE_UHI, & OP_ENT (ULO16), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_4_addi_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SINT), CGEN_MODE_SI, & OP_ENT (SIMM8), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_5_addv3_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SINT), CGEN_MODE_SI, & OP_ENT (SIMM16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_6_addx_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_7_bc8_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP8), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_9_bc24_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP24), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_11_beq_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_12_beqz_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_13_bl8_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP8), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_PC), CGEN_MODE_USI, & OP_ENT (PC), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, 0, 14 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_14_bl24_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP24), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_PC), CGEN_MODE_USI, & OP_ENT (PC), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, 0, 14 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_15_bcl8_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP8), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_PC), CGEN_MODE_USI, & OP_ENT (PC), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, 0, 14 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_16_bcl24_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP24), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_PC), CGEN_MODE_USI, & OP_ENT (PC), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, 0, 14 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_17_bra8_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP8), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_18_bra24_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_IADDR), CGEN_MODE_VM, & OP_ENT (DISP24), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_19_cmp_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_20_cmpi_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SINT), CGEN_MODE_SI, & OP_ENT (SIMM16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_21_cmpui_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_UINT), CGEN_MODE_USI, & OP_ENT (UIMM16), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_22_cmpz_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_23_div_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_24_jc_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_25_jl_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_PC), CGEN_MODE_USI, & OP_ENT (PC), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, 0, 14 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_26_jmp_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_27_ld_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_MEMORY), CGEN_MODE_SI, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_29_ld_d_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_MEMORY), CGEN_MODE_SI, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SLO16), CGEN_MODE_HI, & OP_ENT (SLO16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_31_ldb_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_MEMORY), CGEN_MODE_QI, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_32_ldb_d_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_MEMORY), CGEN_MODE_QI, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SLO16), CGEN_MODE_HI, & OP_ENT (SLO16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_33_ldh_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_MEMORY), CGEN_MODE_HI, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_34_ldh_d_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_MEMORY), CGEN_MODE_HI, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SLO16), CGEN_MODE_HI, & OP_ENT (SLO16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_35_ld24_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ADDR), CGEN_MODE_VM, & OP_ENT (UIMM24), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_36_ldi8_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SINT), CGEN_MODE_SI, & OP_ENT (SIMM8), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_37_ldi16_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SLO16), CGEN_MODE_HI, & OP_ENT (SLO16), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_38_machi_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_39_machi_a_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACC), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACC), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_40_mulhi_a_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACC), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_41_mv_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_42_mvfachi_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_43_mvfachi_a_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCS), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_44_mvfc_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_CR), CGEN_MODE_SI, & OP_ENT (SCR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_45_mvtachi_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_46_mvtachi_a_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCS), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCS), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_47_mvtc_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SR), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_CR), CGEN_MODE_SI, & OP_ENT (DCR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_49_rac_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_50_rac_d_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUM), CGEN_MODE_DI, & OP_ENT (ACCUM), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCD), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_51_rac_ds_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCS), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCD), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_52_rac_dsi_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCS), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_UINT), CGEN_MODE_USI, & OP_ENT (IMM1), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, & OP_ENT (ACCD), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_53_rte_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_BCOND), CGEN_MODE_VM, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_BIE), CGEN_MODE_VM, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_BPC), CGEN_MODE_VM, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_BSM), CGEN_MODE_VM, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_PC), CGEN_MODE_USI, & OP_ENT (PC), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_IE), CGEN_MODE_VM, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_SM), CGEN_MODE_VM, 0, 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_54_seth_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_HI16), CGEN_MODE_UHI, & OP_ENT (HI16), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_55_slli_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_UINT), CGEN_MODE_USI, & OP_ENT (UIMM5), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_57_st_d_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_SLO16), CGEN_MODE_HI, & OP_ENT (SLO16), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_MEMORY), CGEN_MODE_SI, 0, 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_59_trap_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_UINT), CGEN_MODE_USI, & OP_ENT (UIMM4), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_62_satb_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_63_sat_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (DR), 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_64_sadd_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, 0, 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, 0, 1 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, 0, 0 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_65_macwu1_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, 0, 1 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC1), 0 },
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_GR), CGEN_MODE_SI, & OP_ENT (SRC2), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ACCUMS), CGEN_MODE_DI, 0, 1 },
+  { 0 }
+};
+
+static const CGEN_OPERAND_INSTANCE fmt_66_sc_ops[] = {
+  { CGEN_OPERAND_INSTANCE_INPUT, & HW_ENT (HW_H_COND), CGEN_MODE_UBI, & OP_ENT (CONDBIT), 0 },
+  { CGEN_OPERAND_INSTANCE_OUTPUT, & HW_ENT (HW_H_ABORT), CGEN_MODE_UBI, & OP_ENT (ABORT_PARALLEL_EXECUTION), 0 },
+  { 0 }
+};
+
 #define OP 1 /* syntax value for mnemonic */
 
 static const CGEN_SYNTAX syntax_table[] =
@@ -244,17 +809,17 @@ static const CGEN_SYNTAX syntax_table[] =
 /* <op> $dr,$sr */
 /*   0 */  { OP, ' ', 130, ',', 129, 0 },
 /* <op> $dr,$sr,#$slo16 */
-/*   1 */  { OP, ' ', 130, ',', 129, ',', '#', 143, 0 },
+/*   1 */  { OP, ' ', 130, ',', 129, ',', '#', 145, 0 },
 /* <op> $dr,$sr,$slo16 */
-/*   2 */  { OP, ' ', 130, ',', 129, ',', 143, 0 },
+/*   2 */  { OP, ' ', 130, ',', 129, ',', 145, 0 },
 /* <op> $dr,$sr,#$uimm16 */
 /*   3 */  { OP, ' ', 130, ',', 129, ',', '#', 139, 0 },
 /* <op> $dr,$sr,$uimm16 */
 /*   4 */  { OP, ' ', 130, ',', 129, ',', 139, 0 },
 /* <op> $dr,$sr,#$ulo16 */
-/*   5 */  { OP, ' ', 130, ',', 129, ',', '#', 144, 0 },
+/*   5 */  { OP, ' ', 130, ',', 129, ',', '#', 146, 0 },
 /* <op> $dr,$sr,$ulo16 */
-/*   6 */  { OP, ' ', 130, ',', 129, ',', 144, 0 },
+/*   6 */  { OP, ' ', 130, ',', 129, ',', 146, 0 },
 /* <op> $dr,#$simm8 */
 /*   7 */  { OP, ' ', 130, ',', '#', 135, 0 },
 /* <op> $dr,$simm8 */
@@ -264,13 +829,13 @@ static const CGEN_SYNTAX syntax_table[] =
 /* <op> $dr,$sr,$simm16 */
 /*  10 */  { OP, ' ', 130, ',', 129, ',', 136, 0 },
 /* <op> $disp8 */
-/*  11 */  { OP, ' ', 146, 0 },
+/*  11 */  { OP, ' ', 148, 0 },
 /* <op> $disp24 */
-/*  12 */  { OP, ' ', 148, 0 },
+/*  12 */  { OP, ' ', 150, 0 },
 /* <op> $src1,$src2,$disp16 */
-/*  13 */  { OP, ' ', 131, ',', 132, ',', 147, 0 },
+/*  13 */  { OP, ' ', 131, ',', 132, ',', 149, 0 },
 /* <op> $src2,$disp16 */
-/*  14 */  { OP, ' ', 132, ',', 147, 0 },
+/*  14 */  { OP, ' ', 132, ',', 149, 0 },
 /* <op> $src1,$src2 */
 /*  15 */  { OP, ' ', 131, ',', 132, 0 },
 /* <op> $src2,#$simm16 */
@@ -290,137 +855,213 @@ static const CGEN_SYNTAX syntax_table[] =
 /* <op> $dr,@($sr) */
 /*  23 */  { OP, ' ', 130, ',', '@', '(', 129, ')', 0 },
 /* <op> $dr,@($slo16,$sr) */
-/*  24 */  { OP, ' ', 130, ',', '@', '(', 143, ',', 129, ')', 0 },
+/*  24 */  { OP, ' ', 130, ',', '@', '(', 145, ',', 129, ')', 0 },
 /* <op> $dr,@($sr,$slo16) */
-/*  25 */  { OP, ' ', 130, ',', '@', '(', 129, ',', 143, ')', 0 },
+/*  25 */  { OP, ' ', 130, ',', '@', '(', 129, ',', 145, ')', 0 },
 /* <op> $dr,@$sr+ */
 /*  26 */  { OP, ' ', 130, ',', '@', 129, '+', 0 },
 /* <op> $dr,#$uimm24 */
-/*  27 */  { OP, ' ', 130, ',', '#', 145, 0 },
+/*  27 */  { OP, ' ', 130, ',', '#', 147, 0 },
 /* <op> $dr,$uimm24 */
-/*  28 */  { OP, ' ', 130, ',', 145, 0 },
+/*  28 */  { OP, ' ', 130, ',', 147, 0 },
 /* <op> $dr,$slo16 */
-/*  29 */  { OP, ' ', 130, ',', 143, 0 },
+/*  29 */  { OP, ' ', 130, ',', 145, 0 },
 /* <op> $src1,$src2,$acc */
-/*  30 */  { OP, ' ', 131, ',', 132, ',', 141, 0 },
+/*  30 */  { OP, ' ', 131, ',', 132, ',', 143, 0 },
 /* <op> $dr */
 /*  31 */  { OP, ' ', 130, 0 },
 /* <op> $dr,$accs */
-/*  32 */  { OP, ' ', 130, ',', 140, 0 },
+/*  32 */  { OP, ' ', 130, ',', 142, 0 },
 /* <op> $dr,$scr */
 /*  33 */  { OP, ' ', 130, ',', 133, 0 },
 /* <op> $src1 */
 /*  34 */  { OP, ' ', 131, 0 },
 /* <op> $src1,$accs */
-/*  35 */  { OP, ' ', 131, ',', 140, 0 },
+/*  35 */  { OP, ' ', 131, ',', 142, 0 },
 /* <op> $sr,$dcr */
 /*  36 */  { OP, ' ', 129, ',', 134, 0 },
 /* <op> */
 /*  37 */  { OP, 0 },
-/* <op> $accs */
-/*  38 */  { OP, ' ', 140, 0 },
+/* <op> $accd */
+/*  38 */  { OP, ' ', 141, 0 },
+/* <op> $accd,$accs */
+/*  39 */  { OP, ' ', 141, ',', 142, 0 },
+/* <op> $accd,$accs,#$imm1 */
+/*  40 */  { OP, ' ', 141, ',', 142, ',', '#', 140, 0 },
 /* <op> $dr,#$hi16 */
-/*  39 */  { OP, ' ', 130, ',', '#', 142, 0 },
+/*  41 */  { OP, ' ', 130, ',', '#', 144, 0 },
 /* <op> $dr,$hi16 */
-/*  40 */  { OP, ' ', 130, ',', 142, 0 },
+/*  42 */  { OP, ' ', 130, ',', 144, 0 },
 /* <op> $dr,#$uimm5 */
-/*  41 */  { OP, ' ', 130, ',', '#', 138, 0 },
+/*  43 */  { OP, ' ', 130, ',', '#', 138, 0 },
 /* <op> $dr,$uimm5 */
-/*  42 */  { OP, ' ', 130, ',', 138, 0 },
+/*  44 */  { OP, ' ', 130, ',', 138, 0 },
 /* <op> $src1,@$src2 */
-/*  43 */  { OP, ' ', 131, ',', '@', 132, 0 },
+/*  45 */  { OP, ' ', 131, ',', '@', 132, 0 },
 /* <op> $src1,@($src2) */
-/*  44 */  { OP, ' ', 131, ',', '@', '(', 132, ')', 0 },
+/*  46 */  { OP, ' ', 131, ',', '@', '(', 132, ')', 0 },
 /* <op> $src1,@($slo16,$src2) */
-/*  45 */  { OP, ' ', 131, ',', '@', '(', 143, ',', 132, ')', 0 },
+/*  47 */  { OP, ' ', 131, ',', '@', '(', 145, ',', 132, ')', 0 },
 /* <op> $src1,@($src2,$slo16) */
-/*  46 */  { OP, ' ', 131, ',', '@', '(', 132, ',', 143, ')', 0 },
+/*  48 */  { OP, ' ', 131, ',', '@', '(', 132, ',', 145, ')', 0 },
 /* <op> $src1,@+$src2 */
-/*  47 */  { OP, ' ', 131, ',', '@', '+', 132, 0 },
+/*  49 */  { OP, ' ', 131, ',', '@', '+', 132, 0 },
 /* <op> $src1,@-$src2 */
-/*  48 */  { OP, ' ', 131, ',', '@', '-', 132, 0 },
+/*  50 */  { OP, ' ', 131, ',', '@', '-', 132, 0 },
 /* <op> #$uimm4 */
-/*  49 */  { OP, ' ', '#', 137, 0 },
+/*  51 */  { OP, ' ', '#', 137, 0 },
 /* <op> $uimm4 */
-/*  50 */  { OP, ' ', 137, 0 },
+/*  52 */  { OP, ' ', 137, 0 },
 /* <op> $dr,$src2 */
-/*  51 */  { OP, ' ', 130, ',', 132, 0 },
+/*  53 */  { OP, ' ', 130, ',', 132, 0 },
 };
 
 #undef OP
 
 static const CGEN_FORMAT format_table[] = 
 {
-/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr. */
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.dr.SI.sr.SI. */
 /*   0 */  { 16, 16, 0xf0f0 },
-/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.slo16. */
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.slo16.slo16.HI.sr.SI. */
 /*   1 */  { 32, 32, 0xf0f00000 },
-/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-uimm16.uimm16. */
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-uimm16.uimm16.sr.SI.uimm16.USI. */
 /*   2 */  { 32, 32, 0xf0f00000 },
-/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-uimm16.ulo16. */
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-uimm16.ulo16.sr.SI.ulo16.UHI. */
 /*   3 */  { 32, 32, 0xf0f00000 },
-/* f-op1.number.f-r1.dr.f-simm8.simm8. */
+/* f-op1.number.f-r1.dr.f-simm8.simm8.dr.SI.simm8.SI. */
 /*   4 */  { 16, 16, 0xf000 },
-/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.simm16. */
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.simm16.simm16.SI.sr.SI. */
 /*   5 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.condbit.UBI.dr.SI.sr.SI. */
+/*   6 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.number.f-disp8.disp8.condbit.UBI.disp8.VM. */
+/*   7 */  { 16, 16, 0xff00 },
 /* f-op1.number.f-r1.number.f-disp8.disp8. */
-/*   6 */  { 16, 16, 0xff00 },
+/*   8 */  { 16, 16, 0xff00 },
+/* f-op1.number.f-r1.number.f-disp24.disp24.condbit.UBI.disp24.VM. */
+/*   9 */  { 32, 32, 0xff000000 },
 /* 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. */
+/*  10 */  { 32, 32, 0xff000000 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2.f-disp16.disp16.disp16.VM.src1.SI.src2.SI. */
+/*  11 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2.f-disp16.disp16.disp16.VM.src2.SI. */
 /*  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-accs.accs.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-accs.accs.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-disp8.disp8.disp8.VM.pc.USI. */
+/*  13 */  { 16, 16, 0xff00 },
+/* f-op1.number.f-r1.number.f-disp24.disp24.disp24.VM.pc.USI. */
+/*  14 */  { 32, 32, 0xff000000 },
+/* f-op1.number.f-r1.number.f-disp8.disp8.condbit.UBI.disp8.VM.pc.USI. */
+/*  15 */  { 16, 16, 0xff00 },
+/* f-op1.number.f-r1.number.f-disp24.disp24.condbit.UBI.disp24.VM.pc.USI. */
+/*  16 */  { 32, 32, 0xff000000 },
+/* f-op1.number.f-r1.number.f-disp8.disp8.disp8.VM. */
+/*  17 */  { 16, 16, 0xff00 },
+/* f-op1.number.f-r1.number.f-disp24.disp24.disp24.VM. */
+/*  18 */  { 32, 32, 0xff000000 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2.src1.SI.src2.SI. */
+/*  19 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2.f-simm16.simm16.simm16.SI.src2.SI. */
+/*  20 */  { 32, 32, 0xfff00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2.f-uimm16.uimm16.src2.SI.uimm16.USI. */
+/*  21 */  { 32, 32, 0xfff00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.src2.src2.SI. */
+/*  22 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.number.dr.SI.sr.SI. */
+/*  23 */  { 32, 32, 0xf0f0ffff },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.sr.condbit.UBI.sr.SI. */
+/*  24 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.sr.pc.USI.sr.SI. */
+/*  25 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.sr.sr.SI. */
+/*  26 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.h-memory-sr.SI.sr.SI. */
+/*  27 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr. */
+/*  28 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.slo16.h-memory-add-WI-sr-slo16.SI.slo16.HI.sr.SI. */
+/*  29 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.slo16. */
+/*  30 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.h-memory-sr.QI.sr.SI. */
+/*  31 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.slo16.h-memory-add-WI-sr-slo16.QI.slo16.HI.sr.SI. */
+/*  32 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.h-memory-sr.HI.sr.SI. */
+/*  33 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.f-simm16.slo16.h-memory-add-WI-sr-slo16.HI.slo16.HI.sr.SI. */
+/*  34 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.dr.f-uimm24.uimm24.uimm24.VM. */
+/*  35 */  { 32, 32, 0xf0000000 },
+/* f-op1.number.f-r1.dr.f-simm8.simm8.simm8.SI. */
+/*  36 */  { 16, 16, 0xf000 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.number.f-simm16.slo16.slo16.HI. */
+/*  37 */  { 32, 32, 0xf0ff0000 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2.accum.DI.src1.SI.src2.SI. */
+/*  38 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.src1.f-acc.acc.f-op23.number.f-r2.src2.acc.DI.src1.SI.src2.SI. */
+/*  39 */  { 16, 16, 0xf070 },
+/* f-op1.number.f-r1.src1.f-acc.acc.f-op23.number.f-r2.src2.src1.SI.src2.SI. */
+/*  40 */  { 16, 16, 0xf070 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.sr.sr.SI. */
+/*  41 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.number.accum.DI. */
+/*  42 */  { 16, 16, 0xf0ff },
+/* f-op1.number.f-r1.dr.f-op2.number.f-accs.accs.f-op3.number.accs.DI. */
+/*  43 */  { 16, 16, 0xf0f3 },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.scr.scr.SI. */
+/*  44 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.number.accum.DI.src1.SI. */
+/*  45 */  { 16, 16, 0xf0ff },
+/* f-op1.number.f-r1.src1.f-op2.number.f-accs.accs.f-op3.number.accs.DI.src1.SI. */
+/*  46 */  { 16, 16, 0xf0f3 },
+/* f-op1.number.f-r1.dcr.f-op2.number.f-r2.sr.sr.SI. */
+/*  47 */  { 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-accs.accs.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 },
+/*  48 */  { 16, 16, 0xffff },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.number.accum.DI. */
+/*  49 */  { 16, 16, 0xffff },
+/* f-op1.number.f-accd.accd.f-bits67.number.f-op2.number.f-accs.number.f-bit14.number.f-imm1.number.accum.DI. */
+/*  50 */  { 16, 16, 0xf3ff },
+/* f-op1.number.f-accd.accd.f-bits67.number.f-op2.number.f-accs.accs.f-bit14.number.f-imm1.number.accs.DI. */
+/*  51 */  { 16, 16, 0xf3f3 },
+/* f-op1.number.f-accd.accd.f-bits67.number.f-op2.number.f-accs.accs.f-bit14.number.f-imm1.imm1.accs.DI.imm1.USI. */
+/*  52 */  { 16, 16, 0xf3f2 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.number.h-bcond-0.VM.h-bie-0.VM.h-bpc-0.VM.h-bsm-0.VM. */
+/*  53 */  { 16, 16, 0xffff },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.number.f-hi16.hi16.hi16.UHI. */
+/*  54 */  { 32, 32, 0xf0ff0000 },
+/* f-op1.number.f-r1.dr.f-shift-op2.number.f-uimm5.uimm5.dr.SI.uimm5.USI. */
+/*  55 */  { 16, 16, 0xf0e0 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2. */
+/*  56 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2.f-simm16.slo16.slo16.HI.src1.SI.src2.SI. */
+/*  57 */  { 32, 32, 0xf0f00000 },
 /* 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 },
+/*  58 */  { 32, 32, 0xf0f00000 },
+/* f-op1.number.f-r1.number.f-op2.number.f-uimm4.uimm4.uimm4.USI. */
+/*  59 */  { 16, 16, 0xfff0 },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.number. */
+/*  60 */  { 16, 16, 0xf0ff },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.number. */
+/*  61 */  { 16, 16, 0xf0ff },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.src2.f-uimm16.number.src2.SI. */
+/*  62 */  { 32, 32, 0xf0f0ffff },
+/* f-op1.number.f-r1.dr.f-op2.number.f-r2.src2.f-uimm16.number.condbit.UBI.src2.SI. */
+/*  63 */  { 32, 32, 0xf0f0ffff },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.number.h-accums-0.DI.h-accums-1.DI. */
+/*  64 */  { 16, 16, 0xffff },
+/* f-op1.number.f-r1.src1.f-op2.number.f-r2.src2.h-accums-1.DI.src1.SI.src2.SI. */
+/*  65 */  { 16, 16, 0xf0f0 },
+/* f-op1.number.f-r1.number.f-op2.number.f-r2.number.condbit.UBI. */
+/*  66 */  { 16, 16, 0xffff },
 };
 
 #define A(a) (1 << CGEN_CAT3 (CGEN_INSN,_,a))
 #define SYN(n) (& syntax_table[n])
 #define FMT(n) (& format_table[n])
 
+/* The instruction table.  */
+
 const CGEN_INSN m32r_cgen_insn_table_entries[MAX_INSNS] =
 {
   /* null first entry, end of all hash chains */
@@ -429,1148 +1070,1373 @@ const CGEN_INSN m32r_cgen_insn_table_entries[MAX_INSNS] =
   {
     { 1, 1, 1, 1 },
     "add", "add", SYN (0), FMT (0), 0xa0,
-    { 2, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_0_add_ops[0],
+    { 4, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* add3 $dr,$sr,#$slo16 */
   {
     { 1, 1, 1, 1 },
     "add3", "add3", SYN (1), FMT (1), 0x80a00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_1_add3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* add3 $dr,$sr,$slo16 */
   {
     { 1, 1, 1, 1 },
     "add3.a", "add3", SYN (2), FMT (1), 0x80a00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_1_add3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* and $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "and", "and", SYN (0), FMT (0), 0xc0,
-    { 2, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_0_add_ops[0],
+    { 4, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* and3 $dr,$sr,#$uimm16 */
   {
     { 1, 1, 1, 1 },
     "and3", "and3", SYN (3), FMT (2), 0x80c00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_2_and3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* and3 $dr,$sr,$uimm16 */
   {
     { 1, 1, 1, 1 },
     "and3.a", "and3", SYN (4), FMT (2), 0x80c00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_2_and3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* or $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "or", "or", SYN (0), FMT (0), 0xe0,
-    { 2, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_0_add_ops[0],
+    { 4, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* or3 $dr,$sr,#$ulo16 */
   {
     { 1, 1, 1, 1 },
     "or3", "or3", SYN (5), FMT (3), 0x80e00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_3_or3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* or3 $dr,$sr,$ulo16 */
   {
     { 1, 1, 1, 1 },
     "or3.a", "or3", SYN (6), FMT (3), 0x80e00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_3_or3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* xor $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "xor", "xor", SYN (0), FMT (0), 0xd0,
-    { 2, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_0_add_ops[0],
+    { 4, 0|A(PARALLEL), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* xor3 $dr,$sr,#$uimm16 */
   {
     { 1, 1, 1, 1 },
     "xor3", "xor3", SYN (3), FMT (2), 0x80d00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_2_and3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* xor3 $dr,$sr,$uimm16 */
   {
     { 1, 1, 1, 1 },
     "xor3.a", "xor3", SYN (4), FMT (2), 0x80d00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_2_and3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* addi $dr,#$simm8 */
   {
     { 1, 1, 1, 1 },
     "addi", "addi", SYN (7), FMT (4), 0x4000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_4_addi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* addi $dr,$simm8 */
   {
     { 1, 1, 1, 1 },
     "addi.a", "addi", SYN (8), FMT (4), 0x4000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_4_addi_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* addv $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "addv", "addv", SYN (0), FMT (0), 0x80,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* addv3 $dr,$sr,#$simm16 */
   {
     { 1, 1, 1, 1 },
     "addv3", "addv3", SYN (9), FMT (5), 0x80800000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* addv3 $dr,$sr,$simm16 */
   {
     { 1, 1, 1, 1 },
     "addv3.a", "addv3", SYN (10), FMT (5), 0x80800000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* addx $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "addx", "addx", SYN (0), FMT (0), 0x90,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "addx", "addx", SYN (0), FMT (6), 0x90,
+    & fmt_6_addx_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bc $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bc8", "bc", SYN (11), FMT (6), 0x7c00,
-    { 2, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bc8", "bc", SYN (11), FMT (7), 0x7c00,
+    & fmt_7_bc8_ops[0],
+    { 4, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bc.s $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bc8.s", "bc.s", SYN (11), FMT (6), 0x7c00,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bc8.s", "bc.s", SYN (11), FMT (8), 0x7c00,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bc $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bc24", "bc", SYN (12), FMT (7), 0xfc000000,
-    { 2, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bc24", "bc", SYN (12), FMT (9), 0xfc000000,
+    & fmt_9_bc24_ops[0],
+    { 4, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bc.l $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bc24.l", "bc.l", SYN (12), FMT (7), 0xfc000000,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bc24.l", "bc.l", SYN (12), FMT (10), 0xfc000000,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* beq $src1,$src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "beq", "beq", SYN (13), FMT (8), 0xb0000000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "beq", "beq", SYN (13), FMT (11), 0xb0000000,
+    & fmt_11_beq_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* beqz $src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "beqz", "beqz", SYN (14), FMT (9), 0xb0800000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "beqz", "beqz", SYN (14), FMT (12), 0xb0800000,
+    & fmt_12_beqz_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bgez $src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "bgez", "bgez", SYN (14), FMT (9), 0xb0b00000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bgez", "bgez", SYN (14), FMT (12), 0xb0b00000,
+    & fmt_12_beqz_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bgtz $src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "bgtz", "bgtz", SYN (14), FMT (9), 0xb0d00000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bgtz", "bgtz", SYN (14), FMT (12), 0xb0d00000,
+    & fmt_12_beqz_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* blez $src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "blez", "blez", SYN (14), FMT (9), 0xb0c00000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "blez", "blez", SYN (14), FMT (12), 0xb0c00000,
+    & fmt_12_beqz_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bltz $src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "bltz", "bltz", SYN (14), FMT (9), 0xb0a00000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bltz", "bltz", SYN (14), FMT (12), 0xb0a00000,
+    & fmt_12_beqz_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bnez $src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "bnez", "bnez", SYN (14), FMT (9), 0xb0900000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bnez", "bnez", SYN (14), FMT (12), 0xb0900000,
+    & fmt_12_beqz_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bl $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bl8", "bl", SYN (11), FMT (6), 0x7e00,
-    { 2, 0|A(FILL_SLOT)|A(RELAXABLE)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bl8", "bl", SYN (11), FMT (13), 0x7e00,
+    & fmt_13_bl8_ops[0],
+    { 4, 0|A(FILL_SLOT)|A(RELAXABLE)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* bl.s $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bl8.s", "bl.s", SYN (11), FMT (6), 0x7e00,
-    { 2, 0|A(FILL_SLOT)|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bl8.s", "bl.s", SYN (11), FMT (8), 0x7e00,
+    0,
+    { 4, 0|A(FILL_SLOT)|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* bl $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bl24", "bl", SYN (12), FMT (7), 0xfe000000,
-    { 2, 0|A(RELAX)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bl24", "bl", SYN (12), FMT (14), 0xfe000000,
+    & fmt_14_bl24_ops[0],
+    { 4, 0|A(RELAX)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* bl.l $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bl24.l", "bl.l", SYN (12), FMT (7), 0xfe000000,
-    { 2, 0|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bl24.l", "bl.l", SYN (12), FMT (10), 0xfe000000,
+    0,
+    { 4, 0|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* bcl $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bcl8", "bcl", SYN (11), FMT (6), 0x7800,
-    { 2, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O } }
+    "bcl8", "bcl", SYN (11), FMT (15), 0x7800,
+    & fmt_15_bcl8_ops[0],
+    { 4, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* bcl.s $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bcl8.s", "bcl.s", SYN (11), FMT (6), 0x7800,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O } }
+    "bcl8.s", "bcl.s", SYN (11), FMT (8), 0x7800,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* bcl $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bcl24", "bcl", SYN (12), FMT (7), 0xf8000000,
-    { 2, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE } }
+    "bcl24", "bcl", SYN (12), FMT (16), 0xf8000000,
+    & fmt_16_bcl24_ops[0],
+    { 4, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* bcl.l $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bcl24.l", "bcl.l", SYN (12), FMT (7), 0xf8000000,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE } }
+    "bcl24.l", "bcl.l", SYN (12), FMT (10), 0xf8000000,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* bnc $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bnc8", "bnc", SYN (11), FMT (6), 0x7d00,
-    { 2, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bnc8", "bnc", SYN (11), FMT (7), 0x7d00,
+    & fmt_7_bc8_ops[0],
+    { 4, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bnc.s $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bnc8.s", "bnc.s", SYN (11), FMT (6), 0x7d00,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bnc8.s", "bnc.s", SYN (11), FMT (8), 0x7d00,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bnc $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bnc24", "bnc", SYN (12), FMT (7), 0xfd000000,
-    { 2, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bnc24", "bnc", SYN (12), FMT (9), 0xfd000000,
+    & fmt_9_bc24_ops[0],
+    { 4, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bnc.l $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bnc24.l", "bnc.l", SYN (12), FMT (7), 0xfd000000,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bnc24.l", "bnc.l", SYN (12), FMT (10), 0xfd000000,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bne $src1,$src2,$disp16 */
   {
     { 1, 1, 1, 1 },
-    "bne", "bne", SYN (13), FMT (8), 0xb0100000,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bne", "bne", SYN (13), FMT (11), 0xb0100000,
+    & fmt_11_beq_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bra $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bra8", "bra", SYN (11), FMT (6), 0x7f00,
-    { 2, 0|A(FILL_SLOT)|A(RELAXABLE)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bra8", "bra", SYN (11), FMT (17), 0x7f00,
+    & fmt_17_bra8_ops[0],
+    { 4, 0|A(FILL_SLOT)|A(RELAXABLE)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bra.s $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bra8.s", "bra.s", SYN (11), FMT (6), 0x7f00,
-    { 2, 0|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "bra8.s", "bra.s", SYN (11), FMT (8), 0x7f00,
+    0,
+    { 4, 0|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bra $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bra24", "bra", SYN (12), FMT (7), 0xff000000,
-    { 2, 0|A(RELAX)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bra24", "bra", SYN (12), FMT (18), 0xff000000,
+    & fmt_18_bra24_ops[0],
+    { 4, 0|A(RELAX)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* bra.l $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bra24.l", "bra.l", SYN (12), FMT (7), 0xff000000,
-    { 2, 0|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE } }
+    "bra24.l", "bra.l", SYN (12), FMT (10), 0xff000000,
+    0,
+    { 4, 0|A(ALIAS)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* bncl $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bncl8", "bncl", SYN (11), FMT (6), 0x7900,
-    { 2, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O } }
+    "bncl8", "bncl", SYN (11), FMT (15), 0x7900,
+    & fmt_15_bcl8_ops[0],
+    { 4, 0|A(RELAXABLE)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* bncl.s $disp8 */
   {
     { 1, 1, 1, 1 },
-    "bncl8.s", "bncl.s", SYN (11), FMT (6), 0x7900,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE } }
+    "bncl8.s", "bncl.s", SYN (11), FMT (8), 0x7900,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* bncl $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bncl24", "bncl", SYN (12), FMT (7), 0xf9000000,
-    { 2, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE } }
+    "bncl24", "bncl", SYN (12), FMT (16), 0xf9000000,
+    & fmt_16_bcl24_ops[0],
+    { 4, 0|A(RELAX)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* bncl.l $disp24 */
   {
     { 1, 1, 1, 1 },
-    "bncl24.l", "bncl.l", SYN (12), FMT (7), 0xf9000000,
-    { 2, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE } }
+    "bncl24.l", "bncl.l", SYN (12), FMT (10), 0xf9000000,
+    0,
+    { 4, 0|A(ALIAS)|A(COND_CTI), { (1<<MACH_M32RX), PIPE_NONE, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* cmp $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "cmp", "cmp", SYN (15), FMT (10), 0x40,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "cmp", "cmp", SYN (15), FMT (19), 0x40,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* cmpi $src2,#$simm16 */
   {
     { 1, 1, 1, 1 },
-    "cmpi", "cmpi", SYN (16), FMT (11), 0x80400000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "cmpi", "cmpi", SYN (16), FMT (20), 0x80400000,
+    & fmt_20_cmpi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* cmpi $src2,$simm16 */
   {
     { 1, 1, 1, 1 },
-    "cmpi.a", "cmpi", SYN (17), FMT (11), 0x80400000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "cmpi.a", "cmpi", SYN (17), FMT (20), 0x80400000,
+    & fmt_20_cmpi_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* cmpu $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "cmpu", "cmpu", SYN (15), FMT (10), 0x50,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "cmpu", "cmpu", SYN (15), FMT (19), 0x50,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* cmpui $src2,#$uimm16 */
   {
     { 1, 1, 1, 1 },
-    "cmpui", "cmpui", SYN (18), FMT (12), 0x80500000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "cmpui", "cmpui", SYN (18), FMT (21), 0x80500000,
+    & fmt_21_cmpui_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* cmpui $src2,$uimm16 */
   {
     { 1, 1, 1, 1 },
-    "cmpui.a", "cmpui", SYN (19), FMT (12), 0x80500000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "cmpui.a", "cmpui", SYN (19), FMT (21), 0x80500000,
+    & fmt_21_cmpui_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* cmpeq $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "cmpeq", "cmpeq", SYN (15), FMT (10), 0x60,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_OS } }
+    "cmpeq", "cmpeq", SYN (15), FMT (19), 0x60,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* cmpz $src2 */
   {
     { 1, 1, 1, 1 },
-    "cmpz", "cmpz", SYN (20), FMT (13), 0x70,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_OS } }
+    "cmpz", "cmpz", SYN (20), FMT (22), 0x70,
+    & fmt_22_cmpz_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* div $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "div", "div", SYN (0), FMT (14), 0x90000000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "div", "div", SYN (0), FMT (23), 0x90000000,
+    & fmt_23_div_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* divu $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "divu", "divu", SYN (0), FMT (14), 0x90100000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "divu", "divu", SYN (0), FMT (23), 0x90100000,
+    & fmt_23_div_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* rem $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "rem", "rem", SYN (0), FMT (14), 0x90200000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "rem", "rem", SYN (0), FMT (23), 0x90200000,
+    & fmt_23_div_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* remu $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "remu", "remu", SYN (0), FMT (14), 0x90300000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "remu", "remu", SYN (0), FMT (23), 0x90300000,
+    & fmt_23_div_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
+  },
+/* start-sanitize-m32rx */
+/* divh $dr,$sr */
+  {
+    { 1, 1, 1, 1 },
+    "divh", "divh", SYN (0), FMT (23), 0x90000010,
+    & fmt_23_div_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
+/* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* jc $sr */
   {
     { 1, 1, 1, 1 },
-    "jc", "jc", SYN (21), FMT (15), 0x1cc0,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O } }
+    "jc", "jc", SYN (21), FMT (24), 0x1cc0,
+    & fmt_24_jc_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* jnc $sr */
   {
     { 1, 1, 1, 1 },
-    "jnc", "jnc", SYN (21), FMT (15), 0x1dc0,
-    { 2, 0|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O } }
+    "jnc", "jnc", SYN (21), FMT (24), 0x1dc0,
+    & fmt_24_jc_ops[0],
+    { 4, 0|A(COND_CTI), { (1<<MACH_M32RX), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* jl $sr */
   {
     { 1, 1, 1, 1 },
-    "jl", "jl", SYN (21), FMT (15), 0x1ec0,
-    { 2, 0|A(FILL_SLOT)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "jl", "jl", SYN (21), FMT (25), 0x1ec0,
+    & fmt_25_jl_ops[0],
+    { 4, 0|A(FILL_SLOT)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_YES, WRITE_SRC_NO } }
   },
 /* jmp $sr */
   {
     { 1, 1, 1, 1 },
-    "jmp", "jmp", SYN (21), FMT (15), 0x1fc0,
-    { 2, 0|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "jmp", "jmp", SYN (21), FMT (26), 0x1fc0,
+    & fmt_26_jmp_ops[0],
+    { 4, 0|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ld $dr,@$sr */
   {
     { 1, 1, 1, 1 },
-    "ld", "ld", SYN (22), FMT (0), 0x20c0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "ld", "ld", SYN (22), FMT (27), 0x20c0,
+    & fmt_27_ld_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ld $dr,@($sr) */
   {
     { 1, 1, 1, 1 },
-    "ld-2", "ld", SYN (23), FMT (0), 0x20c0,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "ld-2", "ld", SYN (23), FMT (28), 0x20c0,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ld $dr,@($slo16,$sr) */
   {
     { 1, 1, 1, 1 },
-    "ld-d", "ld", SYN (24), FMT (1), 0xa0c00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "ld-d", "ld", SYN (24), FMT (29), 0xa0c00000,
+    & fmt_29_ld_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ld $dr,@($sr,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "ld-d2", "ld", SYN (25), FMT (1), 0xa0c00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "ld-d2", "ld", SYN (25), FMT (30), 0xa0c00000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldb $dr,@$sr */
   {
     { 1, 1, 1, 1 },
-    "ldb", "ldb", SYN (22), FMT (0), 0x2080,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "ldb", "ldb", SYN (22), FMT (31), 0x2080,
+    & fmt_31_ldb_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldb $dr,@($sr) */
   {
     { 1, 1, 1, 1 },
-    "ldb-2", "ldb", SYN (23), FMT (0), 0x2080,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "ldb-2", "ldb", SYN (23), FMT (28), 0x2080,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldb $dr,@($slo16,$sr) */
   {
     { 1, 1, 1, 1 },
-    "ldb-d", "ldb", SYN (24), FMT (1), 0xa0800000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "ldb-d", "ldb", SYN (24), FMT (32), 0xa0800000,
+    & fmt_32_ldb_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldb $dr,@($sr,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "ldb-d2", "ldb", SYN (25), FMT (1), 0xa0800000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "ldb-d2", "ldb", SYN (25), FMT (30), 0xa0800000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldh $dr,@$sr */
   {
     { 1, 1, 1, 1 },
-    "ldh", "ldh", SYN (22), FMT (0), 0x20a0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "ldh", "ldh", SYN (22), FMT (33), 0x20a0,
+    & fmt_33_ldh_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldh $dr,@($sr) */
   {
     { 1, 1, 1, 1 },
-    "ldh-2", "ldh", SYN (23), FMT (0), 0x20a0,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "ldh-2", "ldh", SYN (23), FMT (28), 0x20a0,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldh $dr,@($slo16,$sr) */
   {
     { 1, 1, 1, 1 },
-    "ldh-d", "ldh", SYN (24), FMT (1), 0xa0a00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "ldh-d", "ldh", SYN (24), FMT (34), 0xa0a00000,
+    & fmt_34_ldh_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldh $dr,@($sr,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "ldh-d2", "ldh", SYN (25), FMT (1), 0xa0a00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "ldh-d2", "ldh", SYN (25), FMT (30), 0xa0a00000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldub $dr,@$sr */
   {
     { 1, 1, 1, 1 },
-    "ldub", "ldub", SYN (22), FMT (0), 0x2090,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "ldub", "ldub", SYN (22), FMT (31), 0x2090,
+    & fmt_31_ldb_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldub $dr,@($sr) */
   {
     { 1, 1, 1, 1 },
-    "ldub-2", "ldub", SYN (23), FMT (0), 0x2090,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "ldub-2", "ldub", SYN (23), FMT (28), 0x2090,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldub $dr,@($slo16,$sr) */
   {
     { 1, 1, 1, 1 },
-    "ldub-d", "ldub", SYN (24), FMT (1), 0xa0900000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "ldub-d", "ldub", SYN (24), FMT (32), 0xa0900000,
+    & fmt_32_ldb_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldub $dr,@($sr,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "ldub-d2", "ldub", SYN (25), FMT (1), 0xa0900000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "ldub-d2", "ldub", SYN (25), FMT (30), 0xa0900000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* lduh $dr,@$sr */
   {
     { 1, 1, 1, 1 },
-    "lduh", "lduh", SYN (22), FMT (0), 0x20b0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "lduh", "lduh", SYN (22), FMT (33), 0x20b0,
+    & fmt_33_ldh_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* lduh $dr,@($sr) */
   {
     { 1, 1, 1, 1 },
-    "lduh-2", "lduh", SYN (23), FMT (0), 0x20b0,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "lduh-2", "lduh", SYN (23), FMT (28), 0x20b0,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* lduh $dr,@($slo16,$sr) */
   {
     { 1, 1, 1, 1 },
-    "lduh-d", "lduh", SYN (24), FMT (1), 0xa0b00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "lduh-d", "lduh", SYN (24), FMT (34), 0xa0b00000,
+    & fmt_34_ldh_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* lduh $dr,@($sr,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "lduh-d2", "lduh", SYN (25), FMT (1), 0xa0b00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "lduh-d2", "lduh", SYN (25), FMT (30), 0xa0b00000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ld $dr,@$sr+ */
   {
     { 1, 1, 1, 1 },
-    "ld-plus", "ld", SYN (26), FMT (0), 0x20e0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "ld-plus", "ld", SYN (26), FMT (27), 0x20e0,
+    & fmt_27_ld_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_YES } }
   },
 /* ld24 $dr,#$uimm24 */
   {
     { 1, 1, 1, 1 },
-    "ld24", "ld24", SYN (27), FMT (16), 0xe0000000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "ld24", "ld24", SYN (27), FMT (35), 0xe0000000,
+    & fmt_35_ld24_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ld24 $dr,$uimm24 */
   {
     { 1, 1, 1, 1 },
-    "ld24.a", "ld24", SYN (28), FMT (16), 0xe0000000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "ld24.a", "ld24", SYN (28), FMT (35), 0xe0000000,
+    & fmt_35_ld24_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldi $dr,#$simm8 */
   {
     { 1, 1, 1, 1 },
-    "ldi8", "ldi", SYN (7), FMT (4), 0x6000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "ldi8", "ldi", SYN (7), FMT (36), 0x6000,
+    & fmt_36_ldi8_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldi $dr,$simm8 */
   {
     { 1, 1, 1, 1 },
-    "ldi8.a", "ldi", SYN (8), FMT (4), 0x6000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS } }
+    "ldi8.a", "ldi", SYN (8), FMT (36), 0x6000,
+    & fmt_36_ldi8_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldi8 $dr,#$simm8 */
   {
     { 1, 1, 1, 1 },
-    "ldi8a", "ldi8", SYN (7), FMT (4), 0x6000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS } }
+    "ldi8a", "ldi8", SYN (7), FMT (36), 0x6000,
+    & fmt_36_ldi8_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldi8 $dr,$simm8 */
   {
     { 1, 1, 1, 1 },
-    "ldi8a.a", "ldi8", SYN (8), FMT (4), 0x6000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS } }
+    "ldi8a.a", "ldi8", SYN (8), FMT (36), 0x6000,
+    & fmt_36_ldi8_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldi $dr,$slo16 */
   {
     { 1, 1, 1, 1 },
-    "ldi16", "ldi", SYN (29), FMT (17), 0x90f00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "ldi16", "ldi", SYN (29), FMT (37), 0x90f00000,
+    & fmt_37_ldi16_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* ldi16 $dr,$slo16 */
   {
     { 1, 1, 1, 1 },
-    "ldi16a", "ldi16", SYN (29), FMT (17), 0x90f00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "ldi16a", "ldi16", SYN (29), FMT (37), 0x90f00000,
+    & fmt_37_ldi16_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* lock $dr,@$sr */
   {
     { 1, 1, 1, 1 },
     "lock", "lock", SYN (22), FMT (0), 0x20d0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* machi $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "machi", "machi", SYN (15), FMT (10), 0x3040,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "machi", "machi", SYN (15), FMT (38), 0x3040,
+    & fmt_38_machi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* machi $src1,$src2,$acc */
   {
     { 1, 1, 1, 1 },
-    "machi-a", "machi", SYN (30), FMT (18), 0x3040,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "machi-a", "machi", SYN (30), FMT (39), 0x3040,
+    & fmt_39_machi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* maclo $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "maclo", "maclo", SYN (15), FMT (10), 0x3050,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "maclo", "maclo", SYN (15), FMT (38), 0x3050,
+    & fmt_38_machi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* maclo $src1,$src2,$acc */
   {
     { 1, 1, 1, 1 },
-    "maclo-a", "maclo", SYN (30), FMT (18), 0x3050,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "maclo-a", "maclo", SYN (30), FMT (39), 0x3050,
+    & fmt_39_machi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* macwhi $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "macwhi", "macwhi", SYN (15), FMT (10), 0x3060,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "macwhi", "macwhi", SYN (15), FMT (38), 0x3060,
+    & fmt_38_machi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* macwlo $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "macwlo", "macwlo", SYN (15), FMT (10), 0x3070,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "macwlo", "macwlo", SYN (15), FMT (38), 0x3070,
+    & fmt_38_machi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* mul $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "mul", "mul", SYN (0), FMT (0), 0x1060,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* mulhi $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "mulhi", "mulhi", SYN (15), FMT (10), 0x3000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mulhi", "mulhi", SYN (15), FMT (19), 0x3000,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* mulhi $src1,$src2,$acc */
   {
     { 1, 1, 1, 1 },
-    "mulhi-a", "mulhi", SYN (30), FMT (18), 0x3000,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mulhi-a", "mulhi", SYN (30), FMT (40), 0x3000,
+    & fmt_40_mulhi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* mullo $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "mullo", "mullo", SYN (15), FMT (10), 0x3010,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mullo", "mullo", SYN (15), FMT (19), 0x3010,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* mullo $src1,$src2,$acc */
   {
     { 1, 1, 1, 1 },
-    "mullo-a", "mullo", SYN (30), FMT (18), 0x3010,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mullo-a", "mullo", SYN (30), FMT (40), 0x3010,
+    & fmt_40_mulhi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* mulwhi $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "mulwhi", "mulwhi", SYN (15), FMT (10), 0x3020,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mulwhi", "mulwhi", SYN (15), FMT (19), 0x3020,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* mulwlo $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "mulwlo", "mulwlo", SYN (15), FMT (10), 0x3030,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mulwlo", "mulwlo", SYN (15), FMT (19), 0x3030,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* mv $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "mv", "mv", SYN (0), FMT (0), 0x1080,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "mv", "mv", SYN (0), FMT (41), 0x1080,
+    & fmt_41_mv_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* mvfachi $dr */
   {
     { 1, 1, 1, 1 },
-    "mvfachi", "mvfachi", SYN (31), FMT (19), 0x50f0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mvfachi", "mvfachi", SYN (31), FMT (42), 0x50f0,
+    & fmt_42_mvfachi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* mvfachi $dr,$accs */
   {
     { 1, 1, 1, 1 },
-    "mvfachi-a", "mvfachi", SYN (32), FMT (20), 0x50f0,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mvfachi-a", "mvfachi", SYN (32), FMT (43), 0x50f0,
+    & fmt_43_mvfachi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* mvfaclo $dr */
   {
     { 1, 1, 1, 1 },
-    "mvfaclo", "mvfaclo", SYN (31), FMT (19), 0x50f1,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mvfaclo", "mvfaclo", SYN (31), FMT (42), 0x50f1,
+    & fmt_42_mvfachi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* mvfaclo $dr,$accs */
   {
     { 1, 1, 1, 1 },
-    "mvfaclo-a", "mvfaclo", SYN (32), FMT (20), 0x50f1,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mvfaclo-a", "mvfaclo", SYN (32), FMT (43), 0x50f1,
+    & fmt_43_mvfachi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* mvfacmi $dr */
   {
     { 1, 1, 1, 1 },
-    "mvfacmi", "mvfacmi", SYN (31), FMT (19), 0x50f2,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mvfacmi", "mvfacmi", SYN (31), FMT (42), 0x50f2,
+    & fmt_42_mvfachi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* mvfacmi $dr,$accs */
   {
     { 1, 1, 1, 1 },
-    "mvfacmi-a", "mvfacmi", SYN (32), FMT (20), 0x50f2,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mvfacmi-a", "mvfacmi", SYN (32), FMT (43), 0x50f2,
+    & fmt_43_mvfachi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* mvfc $dr,$scr */
   {
     { 1, 1, 1, 1 },
-    "mvfc", "mvfc", SYN (33), FMT (21), 0x1090,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "mvfc", "mvfc", SYN (33), FMT (44), 0x1090,
+    & fmt_44_mvfc_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* mvtachi $src1 */
   {
     { 1, 1, 1, 1 },
-    "mvtachi", "mvtachi", SYN (34), FMT (22), 0x5070,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mvtachi", "mvtachi", SYN (34), FMT (45), 0x5070,
+    & fmt_45_mvtachi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* mvtachi $src1,$accs */
   {
     { 1, 1, 1, 1 },
-    "mvtachi-a", "mvtachi", SYN (35), FMT (23), 0x5070,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mvtachi-a", "mvtachi", SYN (35), FMT (46), 0x5070,
+    & fmt_46_mvtachi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* mvtaclo $src1 */
   {
     { 1, 1, 1, 1 },
-    "mvtaclo", "mvtaclo", SYN (34), FMT (22), 0x5071,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "mvtaclo", "mvtaclo", SYN (34), FMT (45), 0x5071,
+    & fmt_45_mvtachi_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* mvtaclo $src1,$accs */
   {
     { 1, 1, 1, 1 },
-    "mvtaclo-a", "mvtaclo", SYN (35), FMT (23), 0x5071,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mvtaclo-a", "mvtaclo", SYN (35), FMT (46), 0x5071,
+    & fmt_46_mvtachi_a_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* mvtc $sr,$dcr */
   {
     { 1, 1, 1, 1 },
-    "mvtc", "mvtc", SYN (36), FMT (24), 0x10a0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "mvtc", "mvtc", SYN (36), FMT (47), 0x10a0,
+    & fmt_47_mvtc_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* neg $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "neg", "neg", SYN (0), FMT (0), 0x30,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "neg", "neg", SYN (0), FMT (41), 0x30,
+    & fmt_41_mv_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* nop */
   {
     { 1, 1, 1, 1 },
-    "nop", "nop", SYN (37), FMT (25), 0x7000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "nop", "nop", SYN (37), FMT (48), 0x7000,
+    0,
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* not $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "not", "not", SYN (0), FMT (0), 0xb0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "not", "not", SYN (0), FMT (41), 0xb0,
+    & fmt_41_mv_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* rac */
   {
     { 1, 1, 1, 1 },
-    "rac", "rac", SYN (37), FMT (25), 0x5090,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "rac", "rac", SYN (37), FMT (49), 0x5090,
+    & fmt_49_rac_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
-/* rac $accs */
+/* rac $accd */
   {
     { 1, 1, 1, 1 },
-    "rac-a", "rac", SYN (38), FMT (26), 0x5090,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "rac-d", "rac", SYN (38), FMT (50), 0x5090,
+    & fmt_50_rac_d_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
+  },
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+/* rac $accd,$accs */
+  {
+    { 1, 1, 1, 1 },
+    "rac-ds", "rac", SYN (39), FMT (51), 0x5090,
+    & fmt_51_rac_ds_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
+  },
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+/* rac $accd,$accs,#$imm1 */
+  {
+    { 1, 1, 1, 1 },
+    "rac-dsi", "rac", SYN (40), FMT (52), 0x5090,
+    & fmt_52_rac_dsi_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* rach */
   {
     { 1, 1, 1, 1 },
-    "rach", "rach", SYN (37), FMT (25), 0x5080,
-    { 2, 0, { (1<<MACH_M32R), PIPE_S } }
+    "rach", "rach", SYN (37), FMT (49), 0x5080,
+    & fmt_49_rac_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
+  },
+/* start-sanitize-m32rx */
+/* rach $accd */
+  {
+    { 1, 1, 1, 1 },
+    "rach-d", "rach", SYN (38), FMT (50), 0x5080,
+    & fmt_50_rac_d_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
+  },
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+/* rach $accd,$accs */
+  {
+    { 1, 1, 1, 1 },
+    "rach-ds", "rach", SYN (39), FMT (51), 0x5080,
+    & fmt_51_rac_ds_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
+/* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
-/* rach $accs */
+/* rach $accd,$accs,#$imm1 */
   {
     { 1, 1, 1, 1 },
-    "rach-a", "rach", SYN (38), FMT (26), 0x5080,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "rach-dsi", "rach", SYN (40), FMT (52), 0x5080,
+    & fmt_52_rac_dsi_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* rte */
   {
     { 1, 1, 1, 1 },
-    "rte", "rte", SYN (37), FMT (25), 0x10d6,
-    { 2, 0|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "rte", "rte", SYN (37), FMT (53), 0x10d6,
+    & fmt_53_rte_ops[0],
+    { 4, 0|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* seth $dr,#$hi16 */
   {
     { 1, 1, 1, 1 },
-    "seth", "seth", SYN (39), FMT (27), 0xd0c00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "seth", "seth", SYN (41), FMT (54), 0xd0c00000,
+    & fmt_54_seth_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* seth $dr,$hi16 */
   {
     { 1, 1, 1, 1 },
-    "seth.a", "seth", SYN (40), FMT (27), 0xd0c00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "seth.a", "seth", SYN (42), FMT (54), 0xd0c00000,
+    & fmt_54_seth_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sll $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "sll", "sll", SYN (0), FMT (0), 0x1040,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sll3 $dr,$sr,#$simm16 */
   {
     { 1, 1, 1, 1 },
     "sll3", "sll3", SYN (9), FMT (5), 0x90c00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sll3 $dr,$sr,$simm16 */
   {
     { 1, 1, 1, 1 },
     "sll3.a", "sll3", SYN (10), FMT (5), 0x90c00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* slli $dr,#$uimm5 */
   {
     { 1, 1, 1, 1 },
-    "slli", "slli", SYN (41), FMT (28), 0x5040,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "slli", "slli", SYN (43), FMT (55), 0x5040,
+    & fmt_55_slli_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* slli $dr,$uimm5 */
   {
     { 1, 1, 1, 1 },
-    "slli.a", "slli", SYN (42), FMT (28), 0x5040,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "slli.a", "slli", SYN (44), FMT (55), 0x5040,
+    & fmt_55_slli_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sra $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "sra", "sra", SYN (0), FMT (0), 0x1020,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sra3 $dr,$sr,#$simm16 */
   {
     { 1, 1, 1, 1 },
     "sra3", "sra3", SYN (9), FMT (5), 0x90a00000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sra3 $dr,$sr,$simm16 */
   {
     { 1, 1, 1, 1 },
     "sra3.a", "sra3", SYN (10), FMT (5), 0x90a00000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* srai $dr,#$uimm5 */
   {
     { 1, 1, 1, 1 },
-    "srai", "srai", SYN (41), FMT (28), 0x5020,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "srai", "srai", SYN (43), FMT (55), 0x5020,
+    & fmt_55_slli_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* srai $dr,$uimm5 */
   {
     { 1, 1, 1, 1 },
-    "srai.a", "srai", SYN (42), FMT (28), 0x5020,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "srai.a", "srai", SYN (44), FMT (55), 0x5020,
+    & fmt_55_slli_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* srl $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "srl", "srl", SYN (0), FMT (0), 0x1000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* srl3 $dr,$sr,#$simm16 */
   {
     { 1, 1, 1, 1 },
     "srl3", "srl3", SYN (9), FMT (5), 0x90800000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* srl3 $dr,$sr,$simm16 */
   {
     { 1, 1, 1, 1 },
     "srl3.a", "srl3", SYN (10), FMT (5), 0x90800000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    & fmt_5_addv3_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* srli $dr,#$uimm5 */
   {
     { 1, 1, 1, 1 },
-    "srli", "srli", SYN (41), FMT (28), 0x5000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "srli", "srli", SYN (43), FMT (55), 0x5000,
+    & fmt_55_slli_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* srli $dr,$uimm5 */
   {
     { 1, 1, 1, 1 },
-    "srli.a", "srli", SYN (42), FMT (28), 0x5000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "srli.a", "srli", SYN (44), FMT (55), 0x5000,
+    & fmt_55_slli_ops[0],
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* st $src1,@$src2 */
   {
     { 1, 1, 1, 1 },
-    "st", "st", SYN (43), FMT (10), 0x2040,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "st", "st", SYN (45), FMT (19), 0x2040,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* st $src1,@($src2) */
   {
     { 1, 1, 1, 1 },
-    "st-2", "st", SYN (44), FMT (10), 0x2040,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "st-2", "st", SYN (46), FMT (56), 0x2040,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* st $src1,@($slo16,$src2) */
   {
     { 1, 1, 1, 1 },
-    "st-d", "st", SYN (45), FMT (29), 0xa0400000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "st-d", "st", SYN (47), FMT (57), 0xa0400000,
+    & fmt_57_st_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* st $src1,@($src2,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "st-d2", "st", SYN (46), FMT (29), 0xa0400000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "st-d2", "st", SYN (48), FMT (58), 0xa0400000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* stb $src1,@$src2 */
   {
     { 1, 1, 1, 1 },
-    "stb", "stb", SYN (43), FMT (10), 0x2000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "stb", "stb", SYN (45), FMT (19), 0x2000,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* stb $src1,@($src2) */
   {
     { 1, 1, 1, 1 },
-    "stb-2", "stb", SYN (44), FMT (10), 0x2000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "stb-2", "stb", SYN (46), FMT (56), 0x2000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* stb $src1,@($slo16,$src2) */
   {
     { 1, 1, 1, 1 },
-    "stb-d", "stb", SYN (45), FMT (29), 0xa0000000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "stb-d", "stb", SYN (47), FMT (57), 0xa0000000,
+    & fmt_57_st_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* stb $src1,@($src2,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "stb-d2", "stb", SYN (46), FMT (29), 0xa0000000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "stb-d2", "stb", SYN (48), FMT (58), 0xa0000000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sth $src1,@$src2 */
   {
     { 1, 1, 1, 1 },
-    "sth", "sth", SYN (43), FMT (10), 0x2020,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "sth", "sth", SYN (45), FMT (19), 0x2020,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sth $src1,@($src2) */
   {
     { 1, 1, 1, 1 },
-    "sth-2", "sth", SYN (44), FMT (10), 0x2020,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O } }
+    "sth-2", "sth", SYN (46), FMT (56), 0x2020,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sth $src1,@($slo16,$src2) */
   {
     { 1, 1, 1, 1 },
-    "sth-d", "sth", SYN (45), FMT (29), 0xa0200000,
-    { 2, 0, { (1<<MACH_M32R), PIPE_NONE } }
+    "sth-d", "sth", SYN (47), FMT (57), 0xa0200000,
+    & fmt_57_st_d_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* sth $src1,@($src2,$slo16) */
   {
     { 1, 1, 1, 1 },
-    "sth-d2", "sth", SYN (46), FMT (29), 0xa0200000,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "sth-d2", "sth", SYN (48), FMT (58), 0xa0200000,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* st $src1,@+$src2 */
   {
     { 1, 1, 1, 1 },
-    "st-plus", "st", SYN (47), FMT (10), 0x2060,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "st-plus", "st", SYN (49), FMT (19), 0x2060,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_YES } }
   },
 /* st $src1,@-$src2 */
   {
     { 1, 1, 1, 1 },
-    "st-minus", "st", SYN (48), FMT (10), 0x2070,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "st-minus", "st", SYN (50), FMT (19), 0x2070,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_YES } }
   },
 /* sub $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "sub", "sub", SYN (0), FMT (0), 0x20,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* subv $dr,$sr */
   {
     { 1, 1, 1, 1 },
     "subv", "subv", SYN (0), FMT (0), 0x0,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    & fmt_0_add_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* subx $dr,$sr */
   {
     { 1, 1, 1, 1 },
-    "subx", "subx", SYN (0), FMT (0), 0x10,
-    { 2, 0, { (1<<MACH_M32R), PIPE_OS } }
+    "subx", "subx", SYN (0), FMT (6), 0x10,
+    & fmt_6_addx_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* trap #$uimm4 */
   {
     { 1, 1, 1, 1 },
-    "trap", "trap", SYN (49), FMT (30), 0x10f0,
-    { 2, 0|A(FILL_SLOT)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "trap", "trap", SYN (51), FMT (59), 0x10f0,
+    & fmt_59_trap_ops[0],
+    { 4, 0|A(FILL_SLOT)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* trap $uimm4 */
   {
     { 1, 1, 1, 1 },
-    "trap.a", "trap", SYN (50), FMT (30), 0x10f0,
-    { 2, 0|A(ALIAS)|A(FILL_SLOT)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O } }
+    "trap.a", "trap", SYN (52), FMT (59), 0x10f0,
+    & fmt_59_trap_ops[0],
+    { 4, 0|A(ALIAS)|A(FILL_SLOT)|A(UNCOND_CTI), { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* unlock $src1,@$src2 */
   {
     { 1, 1, 1, 1 },
-    "unlock", "unlock", SYN (43), FMT (10), 0x2050,
-    { 2, 0, { (1<<MACH_M32R), PIPE_O } }
+    "unlock", "unlock", SYN (45), FMT (19), 0x2050,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32R), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* push $src1 */
   {
     { 1, 1, 1, 1 },
-    "push", "push", SYN (34), FMT (22), 0x207f,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "push", "push", SYN (34), FMT (60), 0x207f,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* pop $dr */
   {
     { 1, 1, 1, 1 },
-    "pop", "pop", SYN (31), FMT (19), 0x20ef,
-    { 2, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE } }
+    "pop", "pop", SYN (31), FMT (61), 0x20ef,
+    0,
+    { 4, 0|A(ALIAS), { (1<<MACH_M32R), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* start-sanitize-m32rx */
 /* satb $dr,$src2 */
   {
     { 1, 1, 1, 1 },
-    "satb", "satb", SYN (51), FMT (31), 0x80000100,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_NONE } }
+    "satb", "satb", SYN (53), FMT (62), 0x80000100,
+    & fmt_62_satb_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* sath $dr,$src2 */
   {
     { 1, 1, 1, 1 },
-    "sath", "sath", SYN (51), FMT (31), 0x80000200,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_NONE } }
+    "sath", "sath", SYN (53), FMT (62), 0x80000200,
+    & fmt_62_satb_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* sat $dr,$src2 */
   {
     { 1, 1, 1, 1 },
-    "sat", "sat", SYN (51), FMT (31), 0x80000000,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_NONE } }
+    "sat", "sat", SYN (53), FMT (63), 0x80000000,
+    & fmt_63_sat_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_NONE, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* pcmpbz $src2 */
   {
     { 1, 1, 1, 1 },
-    "pcmpbz", "pcmpbz", SYN (20), FMT (13), 0x370,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_OS } }
+    "pcmpbz", "pcmpbz", SYN (20), FMT (22), 0x370,
+    & fmt_22_cmpz_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_OS, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* sadd */
   {
     { 1, 1, 1, 1 },
-    "sadd", "sadd", SYN (37), FMT (25), 0x50e4,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "sadd", "sadd", SYN (37), FMT (64), 0x50e4,
+    & fmt_64_sadd_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* macwu1 $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "macwu1", "macwu1", SYN (15), FMT (10), 0x50b0,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "macwu1", "macwu1", SYN (15), FMT (65), 0x50b0,
+    & fmt_65_macwu1_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* msblo $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "msblo", "msblo", SYN (15), FMT (10), 0x50d0,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "msblo", "msblo", SYN (15), FMT (38), 0x50d0,
+    & fmt_38_machi_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* mulwu1 $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "mulwu1", "mulwu1", SYN (15), FMT (10), 0x50a0,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "mulwu1", "mulwu1", SYN (15), FMT (19), 0x50a0,
+    & fmt_19_cmp_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
-/* machl1 $src1,$src2 */
+/* maclh1 $src1,$src2 */
   {
     { 1, 1, 1, 1 },
-    "machl1", "machl1", SYN (15), FMT (10), 0x50c0,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_S } }
+    "maclh1", "maclh1", SYN (15), FMT (65), 0x50c0,
+    & fmt_65_macwu1_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_S, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* sc */
   {
     { 1, 1, 1, 1 },
-    "sc", "sc", SYN (37), FMT (25), 0x7401,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_O } }
+    "sc", "sc", SYN (37), FMT (66), 0x7401,
+    & fmt_66_sc_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
 /* snc */
   {
     { 1, 1, 1, 1 },
-    "snc", "snc", SYN (37), FMT (25), 0x7501,
-    { 2, 0, { (1<<MACH_M32RX), PIPE_O } }
+    "snc", "snc", SYN (37), FMT (66), 0x7501,
+    & fmt_66_sc_ops[0],
+    { 4, 0, { (1<<MACH_M32RX), PIPE_O, WRITE_LR_NO, WRITE_SRC_NO } }
   },
 /* end-sanitize-m32rx */
 };
@@ -1663,6 +2529,16 @@ m32r_cgen_set_operand (opindex, valuep, fields)
       fields->f_uimm16 = * valuep;
       break;
 /* start-sanitize-m32rx */
+    case M32R_OPERAND_IMM1 :
+      fields->f_imm1 = * valuep;
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCD :
+      fields->f_accd = * valuep;
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
     case M32R_OPERAND_ACCS :
       fields->f_accs = * valuep;
       break;
@@ -1746,6 +2622,16 @@ m32r_cgen_get_operand (opindex, fields)
       value = fields->f_uimm16;
       break;
 /* start-sanitize-m32rx */
+    case M32R_OPERAND_IMM1 :
+      value = fields->f_imm1;
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+    case M32R_OPERAND_ACCD :
+      value = fields->f_accd;
+      break;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
     case M32R_OPERAND_ACCS :
       value = fields->f_accs;
       break;
diff --git a/opcodes/m32r-opc.h b/opcodes/m32r-opc.h
index 79b1415..90c913c 100644
--- a/opcodes/m32r-opc.h
+++ b/opcodes/m32r-opc.h
@@ -76,6 +76,12 @@ typedef enum cgen_operand_type {
  , M32R_OPERAND_SRC2, M32R_OPERAND_SCR, M32R_OPERAND_DCR, M32R_OPERAND_SIMM8
  , M32R_OPERAND_SIMM16, M32R_OPERAND_UIMM4, M32R_OPERAND_UIMM5, M32R_OPERAND_UIMM16
 /* start-sanitize-m32rx */
+ , M32R_OPERAND_IMM1
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+ , M32R_OPERAND_ACCD
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
  , M32R_OPERAND_ACCS
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
@@ -101,6 +107,16 @@ typedef enum mach_attr {
  , MACH_MAX
 } MACH_ATTR;
 
+/* Enum declaration for instructions which modify the link register as a side effect.  */
+typedef enum write_lr_attr {
+  WRITE_LR_NO, WRITE_LR_YES
+} WRITE_LR_ATTR;
+
+/* Enum declaration for instructions which modify their source register as a side effect.  */
+typedef enum write_src_attr {
+  WRITE_SRC_NO, WRITE_SRC_YES
+} WRITE_SRC_ATTR;
+
 /* start-sanitize-m32rx */
 /* Enum declaration for parallel execution pipeline selection.  */
 typedef enum pipe_attr {
@@ -111,9 +127,12 @@ typedef enum pipe_attr {
 /* Number of architecture variants.  */
 #define MAX_MACHS ((int) MACH_MAX)
 
-/* Number of operands.  */
+/* Number of operands types.  */
 #define MAX_OPERANDS ((int) M32R_OPERAND_MAX)
 
+/* Maximum number of operands referenced by any insn.  */
+#define MAX_OPERAND_INSTANCES 8
+
 /* Operand and instruction attribute indices.  */
 
 /* Enum declaration for cgen_operand attrs.  */
@@ -132,8 +151,9 @@ typedef enum cgen_insn_attr {
 /* start-sanitize-m32rx */
  , CGEN_INSN_PIPE
 /* end-sanitize-m32rx */
- , CGEN_INSN_ALIAS, CGEN_INSN_COND_CTI, CGEN_INSN_FILL_SLOT, CGEN_INSN_PARALLEL
- , CGEN_INSN_RELAX, CGEN_INSN_RELAXABLE, CGEN_INSN_UNCOND_CTI
+ , CGEN_INSN_WRITE_LR, CGEN_INSN_WRITE_SRC, CGEN_INSN_ALIAS, CGEN_INSN_COND_CTI
+ , CGEN_INSN_FILL_SLOT, CGEN_INSN_PARALLEL, CGEN_INSN_RELAX, CGEN_INSN_RELAXABLE
+ , CGEN_INSN_UNCOND_CTI
 } CGEN_INSN_ATTR;
 
 /* Number of non-boolean elements in cgen_insn.  */
@@ -188,6 +208,9 @@ typedef enum cgen_insn_type {
 /* end-sanitize-m32rx */
  , M32R_INSN_DIV, M32R_INSN_DIVU, M32R_INSN_REM, M32R_INSN_REMU
 /* start-sanitize-m32rx */
+ , M32R_INSN_DIVH
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
  , M32R_INSN_JC
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
@@ -240,11 +263,23 @@ typedef enum cgen_insn_type {
  , M32R_INSN_MVTC, M32R_INSN_NEG, M32R_INSN_NOP, M32R_INSN_NOT
  , M32R_INSN_RAC
 /* start-sanitize-m32rx */
- , M32R_INSN_RAC_A
+ , M32R_INSN_RAC_D
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+ , M32R_INSN_RAC_DS
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+ , M32R_INSN_RAC_DSI
 /* end-sanitize-m32rx */
  , M32R_INSN_RACH
 /* start-sanitize-m32rx */
- , M32R_INSN_RACH_A
+ , M32R_INSN_RACH_D
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+ , M32R_INSN_RACH_DS
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+ , M32R_INSN_RACH_DSI
 /* end-sanitize-m32rx */
  , M32R_INSN_RTE, M32R_INSN_SETH, M32R_INSN_SETH_A, M32R_INSN_SLL
  , M32R_INSN_SLL3, M32R_INSN_SLL3_A, M32R_INSN_SLLI, M32R_INSN_SLLI_A
@@ -281,7 +316,7 @@ typedef enum cgen_insn_type {
  , M32R_INSN_MULWU1
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
- , M32R_INSN_MACHL1
+ , M32R_INSN_MACLH1
 /* end-sanitize-m32rx */
 /* start-sanitize-m32rx */
  , M32R_INSN_SC
@@ -301,7 +336,7 @@ typedef enum cgen_insn_type {
 #include "opcode/cgen.h"
 
 /* This struct records data prior to insertion or after extraction.  */
-typedef struct cgen_fields 
+struct cgen_fields 
 {
   long f_nil;
   long f_op1;
@@ -332,13 +367,44 @@ typedef struct cgen_fields
 /* start-sanitize-m32rx */
   long f_accs;
 /* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+  long f_accd;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+  long f_bits67;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+  long f_bit14;
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+  long f_imm1;
+/* end-sanitize-m32rx */
   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[];
 
+/* Enum declaration for m32r hardware types.  */
+typedef enum hw_type {
+  HW_H_PC, HW_H_MEMORY, HW_H_SINT, HW_H_UINT
+ , HW_H_ADDR, HW_H_IADDR, HW_H_HI16, HW_H_SLO16
+ , HW_H_ULO16, HW_H_GR, HW_H_CR, HW_H_ACCUM
+/* start-sanitize-m32rx */
+ , HW_H_ACCUMS
+/* end-sanitize-m32rx */
+/* start-sanitize-m32rx */
+ , HW_H_ABORT
+/* end-sanitize-m32rx */
+ , HW_H_COND, HW_H_SM, HW_H_BSM, HW_H_IE
+ , HW_H_BIE, HW_H_BCOND, HW_H_BPC, HW_MAX
+} HW_TYPE;
+
+#define MAX_HW ((int) HW_MAX)
+
+/* Hardware decls.  */
+
 extern CGEN_KEYWORD m32r_cgen_opval_h_gr;
 extern CGEN_KEYWORD m32r_cgen_opval_h_cr;
 /* start-sanitize-m32rx */
@@ -368,6 +434,7 @@ extern CGEN_KEYWORD m32r_cgen_opval_h_accums;
 (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) \
+  : X (buffer) == 0x30 ? ((((unsigned char *) (buffer))[1] & 0x70) >> 4) \
   : ((((unsigned char *) (buffer))[1] & 0xf0) >> 4)))
 
 /* -- */