[include/opcode]

* rx.h (RX_Operand_Type): Add TwoReg.
(RX_Opcode_ID): Remove ediv and ediv2.

[opcodes]

* rx-decode.opc (SRR): New.
(rx_decode_opcode): Use it for movbi and movbir.  Decode NOP2 (mov
r0,r0) and NOP3 (max r0,r0) special cases.
* rx-decode.c: Regenerate.

[sim/rx]

* rx.c (decode_cache_base): New.
(id_names): Remove ediv and edivu.
(optype_names): Add TwoReg.
(maybe_get_mem_page): New.
(rx_get_byte): Call it.
(get_op): Add TwoReg support.
(put_op): Likewise.
(PD, PS, PS2, GD, GS, GS2, DSZ, SSZ, S2SZ, US1, US2, OM): "opcode"
is a pointer now.
(DO_RETURN): New.  We use longjmp to return an exception result.
(decode_opcode): Make opcode a pointer to the decode cache.  Save
decoded opcode information and re-use.  Call DO_RETURN instead of
return throughout.  Remove ediv and edivu.
* mem.c (ptdc): New.  Adds decode cache.
(rx_mem_ptr): Support it.
(rx_mem_decode_cache): New.
* mem.h (enum mem_ptr_action): add MPA_DECODE_CACHE.
(rx_mem_decode_cache): Declare.
* gdb-if.c (sim_resume): Add decode_opcode's setjmp logic here...
* main.c (main): ...and here.  Use a fast loop if neither trace
nor disassemble is given.
* cpu.h (RX_MAKE_STEPPED, RX_MAKE_HIT_BREAK, RX_MAKE_EXITED,
RX_MAKE_STOPPED, RX_EXITED, RX_STOPPED): Adjust so that 0 is not a
valid code for anything.

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index a49c2072e7e411f0b92b603129e0011d6e2fe96c..de977c5b36e8ca59753cc759b722312a8ebe43b9 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-29  DJ Delorie  <dj@redhat.com>
+
+       * rx.h (RX_Operand_Type): Add TwoReg.
+       (RX_Opcode_ID): Remove ediv and ediv2.
+
 2010-07-27  DJ Delorie  <dj@redhat.com>
 
        * rx.h (RX_Opcode_ID): Add nop2 and nop3 for statistics.

diff --git a/include/opcode/rx.h b/include/opcode/rx.h
index 0840be0a883242d88a57f4401a90df01804e854e..aa85fe4a9163cc7d37480c43726c77f15a8f8beb 100644 (file)
--- a/include/opcode/rx.h
+++ b/include/opcode/rx.h
@@ -47,6 +47,7 @@ typedef enum
   RX_Operand_Predec,   /* [-Rn] */
   RX_Operand_Condition,        /* eq, gtu, etc */
   RX_Operand_Flag,     /* [UIOSZC] */
+  RX_Operand_TwoReg,   /* [Rn + scale*R2] */
 } RX_Operand_Type;
 
 typedef enum
@@ -82,8 +83,6 @@ typedef enum
   RXO_min,     /* d = min(d,s) */
   RXO_emul,    /* d:64 = d:32 * s */
   RXO_emulu,   /* d:64 = d:32 * s (unsigned) */
-  RXO_ediv,    /* d:64 / s; d = quot, d+1 = rem */
-  RXO_edivu,   /* d:64 / s; d = quot, d+1 = rem */
 
   RXO_rolc,    /* d <<= 1 through carry */
   RXO_rorc,    /* d >>= 1 through carry*/

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 2c164187e7e9298714b4f246c791236246cc9090..7abd573ce5d92b7d7dff0db6faaa6235f8ba5853 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-29  DJ Delorie  <dj@redhat.com>
+
+       * rx-decode.opc (SRR): New.
+       (rx_decode_opcode): Use it for movbi and movbir.  Decode NOP2 (mov
+       r0,r0) and NOP3 (max r0,r0) special cases.
+       * rx-decode.c: Regenerate.
+       
 2010-07-28  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-dis.c: Add 0F to VEX opcode enums.

diff --git a/opcodes/rx-decode.c b/opcodes/rx-decode.c
index bb59473d9a7d0ef97b1711e492d2b4fe6a42149e..8797b1baef28d0e15cde450e89575a59d0729aa8 100644 (file)
--- a/opcodes/rx-decode.c
+++ b/opcodes/rx-decode.c
@@ -90,6 +90,7 @@ static int dsp3map[] = { 8, 9, 10, 3, 4, 5, 6, 7 };
 
 #define SC(i)       OP (1, RX_Operand_Immediate, 0, i)
 #define SR(r)       OP (1, RX_Operand_Register,  r, 0)
+#define SRR(r)      OP (1, RX_Operand_TwoReg,  r, 0)
 #define SI(r,a)     OP (1, RX_Operand_Indirect,  r, a)
 #define SIs(r,a,s)  OP (1, RX_Operand_Indirect,  r, (a) * SCALE[s])
 #define SD(t,r,s)   rx_disp (1, t, r, bwl[s], ld);
@@ -270,7 +271,7 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("brk");
-#line 926 "rx-decode.opc"
+#line 941 "rx-decode.opc"
           ID(brk);
         
         }
@@ -285,7 +286,7 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("dbt");
-#line 929 "rx-decode.opc"
+#line 944 "rx-decode.opc"
           ID(dbt);
         
         }
@@ -300,7 +301,7 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("rts");
-#line 715 "rx-decode.opc"
+#line 730 "rx-decode.opc"
           ID(rts);
         
         /*----------------------------------------------------------------------*/
@@ -318,7 +319,7 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("nop");
-#line 721 "rx-decode.opc"
+#line 736 "rx-decode.opc"
           ID(nop);
         
         /*----------------------------------------------------------------------*/
@@ -336,8 +337,8 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bra.a        %a0");
-#line 693 "rx-decode.opc"
-          ID(branch); Scc(RXC_always); DC(pc + IMMex(3));
+#line 708 "rx-decode.opc"
+          ID(branch); DC(pc + IMMex(3));
         
         }
       break;
@@ -351,7 +352,7 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bsr.a        %a0");
-#line 709 "rx-decode.opc"
+#line 724 "rx-decode.opc"
           ID(jsr); DC(pc + IMMex(3));
         
         }
@@ -368,13 +369,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_1:
                     {
                       /** 0000 0110 mx00 00ss rsrc rdst                        sub     %2%S2, %1 */
-#line 497 "rx-decode.opc"
+#line 505 "rx-decode.opc"
                       int mx AU = (op[1] >> 6) & 0x03;
-#line 497 "rx-decode.opc"
+#line 505 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 497 "rx-decode.opc"
+#line 505 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 497 "rx-decode.opc"
+#line 505 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -387,7 +388,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("sub      %2%S2, %1");
-#line 497 "rx-decode.opc"
+#line 505 "rx-decode.opc"
                       ID(sub); S2Pm(ss, rsrc, mx); SR(rdst); DR(rdst); F_OSZC;
                     
                     }
@@ -429,13 +430,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_2:
                     {
                       /** 0000 0110 mx00 01ss rsrc rdst                cmp     %2%S2, %1 */
-#line 485 "rx-decode.opc"
+#line 493 "rx-decode.opc"
                       int mx AU = (op[1] >> 6) & 0x03;
-#line 485 "rx-decode.opc"
+#line 493 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 485 "rx-decode.opc"
+#line 493 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 485 "rx-decode.opc"
+#line 493 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -448,7 +449,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("cmp      %2%S2, %1");
-#line 485 "rx-decode.opc"
+#line 493 "rx-decode.opc"
                       ID(sub); S2Pm(ss, rsrc, mx); SR(rdst); F_OSZC;
                     
                     /*----------------------------------------------------------------------*/
@@ -493,13 +494,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_3:
                     {
                       /** 0000 0110 mx00 10ss rsrc rdst        add     %1%S1, %0 */
-#line 461 "rx-decode.opc"
+#line 469 "rx-decode.opc"
                       int mx AU = (op[1] >> 6) & 0x03;
-#line 461 "rx-decode.opc"
+#line 469 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 461 "rx-decode.opc"
+#line 469 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 461 "rx-decode.opc"
+#line 469 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -512,7 +513,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("add      %1%S1, %0");
-#line 461 "rx-decode.opc"
+#line 469 "rx-decode.opc"
                       ID(add); SPm(ss, rsrc, mx); DR(rdst); F_OSZC;
                     
                     }
@@ -554,13 +555,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_4:
                     {
                       /** 0000 0110 mx00 11ss rsrc rdst        mul     %1%S1, %0 */
-#line 558 "rx-decode.opc"
+#line 573 "rx-decode.opc"
                       int mx AU = (op[1] >> 6) & 0x03;
-#line 558 "rx-decode.opc"
+#line 573 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 558 "rx-decode.opc"
+#line 573 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 558 "rx-decode.opc"
+#line 573 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -573,7 +574,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mul      %1%S1, %0");
-#line 558 "rx-decode.opc"
+#line 573 "rx-decode.opc"
                       ID(mul); SPm(ss, rsrc, mx); DR(rdst); F_____;
                     
                     }
@@ -615,13 +616,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_5:
                     {
                       /** 0000 0110 mx01 00ss rsrc rdst        and     %1%S1, %0 */
-#line 374 "rx-decode.opc"
+#line 382 "rx-decode.opc"
                       int mx AU = (op[1] >> 6) & 0x03;
-#line 374 "rx-decode.opc"
+#line 382 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 374 "rx-decode.opc"
+#line 382 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 374 "rx-decode.opc"
+#line 382 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -634,7 +635,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("and      %1%S1, %0");
-#line 374 "rx-decode.opc"
+#line 382 "rx-decode.opc"
                       ID(and); SPm(ss, rsrc, mx); DR(rdst); F__SZ_;
                     
                     }
@@ -676,13 +677,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_6:
                     {
                       /** 0000 0110 mx01 01ss rsrc rdst                        or      %1%S1, %0 */
-#line 392 "rx-decode.opc"
+#line 400 "rx-decode.opc"
                       int mx AU = (op[1] >> 6) & 0x03;
-#line 392 "rx-decode.opc"
+#line 400 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 392 "rx-decode.opc"
+#line 400 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 392 "rx-decode.opc"
+#line 400 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -695,7 +696,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("or       %1%S1, %0");
-#line 392 "rx-decode.opc"
+#line 400 "rx-decode.opc"
                       ID(or); SPm(ss, rsrc, mx); DR(rdst); F__SZ_;
                     
                     }
@@ -741,13 +742,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_7:
                           {
                             /** 0000 0110 mx10 00sp 0000 0000 rsrc rdst        sbb     %1%S1, %0 */
-#line 510 "rx-decode.opc"
+#line 518 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 510 "rx-decode.opc"
+#line 518 "rx-decode.opc"
                             int sp AU = op[1] & 0x03;
-#line 510 "rx-decode.opc"
+#line 518 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 510 "rx-decode.opc"
+#line 518 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -760,7 +761,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("sbb        %1%S1, %0");
-#line 510 "rx-decode.opc"
+#line 518 "rx-decode.opc"
                             ID(sbb); SPm(sp, rsrc, mx); DR(rdst); F_OSZC;
                           
                           /*----------------------------------------------------------------------*/
@@ -778,13 +779,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_8:
                           {
                             /** 0000 0110 mx10 00ss 0000 0100 rsrc rdst        max     %1%S1, %0 */
-#line 531 "rx-decode.opc"
+#line 546 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 531 "rx-decode.opc"
+#line 546 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 531 "rx-decode.opc"
+#line 546 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 531 "rx-decode.opc"
+#line 546 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -797,7 +798,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("max        %1%S1, %0");
-#line 531 "rx-decode.opc"
+#line 546 "rx-decode.opc"
                             ID(max); SPm(ss, rsrc, mx); DR(rdst);
                           
                           /*----------------------------------------------------------------------*/
@@ -815,13 +816,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_9:
                           {
                             /** 0000 0110 mx10 00ss 0000 0101 rsrc rdst        min     %1%S1, %0 */
-#line 543 "rx-decode.opc"
+#line 558 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 543 "rx-decode.opc"
+#line 558 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 543 "rx-decode.opc"
+#line 558 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 543 "rx-decode.opc"
+#line 558 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -834,7 +835,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("min        %1%S1, %0");
-#line 543 "rx-decode.opc"
+#line 558 "rx-decode.opc"
                             ID(min); SPm(ss, rsrc, mx); DR(rdst);
                           
                           /*----------------------------------------------------------------------*/
@@ -852,13 +853,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_10:
                           {
                             /** 0000 0110 mx10 00ss 0000 0110 rsrc rdst        emul    %1%S1, %0 */
-#line 573 "rx-decode.opc"
+#line 588 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 573 "rx-decode.opc"
+#line 588 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 573 "rx-decode.opc"
+#line 588 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 573 "rx-decode.opc"
+#line 588 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -871,7 +872,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("emul       %1%S1, %0");
-#line 573 "rx-decode.opc"
+#line 588 "rx-decode.opc"
                             ID(emul); SPm(ss, rsrc, mx); DR(rdst);
                           
                           /*----------------------------------------------------------------------*/
@@ -889,13 +890,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_11:
                           {
                             /** 0000 0110 mx10 00ss 0000 0111 rsrc rdst        emulu   %1%S1, %0 */
-#line 585 "rx-decode.opc"
+#line 600 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 585 "rx-decode.opc"
+#line 600 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 585 "rx-decode.opc"
+#line 600 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 585 "rx-decode.opc"
+#line 600 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -908,7 +909,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("emulu      %1%S1, %0");
-#line 585 "rx-decode.opc"
+#line 600 "rx-decode.opc"
                             ID(emulu); SPm(ss, rsrc, mx); DR(rdst);
                           
                           /*----------------------------------------------------------------------*/
@@ -926,13 +927,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_12:
                           {
                             /** 0000 0110 mx10 00ss 0000 1000 rsrc rdst        div     %1%S1, %0 */
-#line 597 "rx-decode.opc"
+#line 612 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 597 "rx-decode.opc"
+#line 612 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 597 "rx-decode.opc"
+#line 612 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 597 "rx-decode.opc"
+#line 612 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -945,7 +946,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("div        %1%S1, %0");
-#line 597 "rx-decode.opc"
+#line 612 "rx-decode.opc"
                             ID(div); SPm(ss, rsrc, mx); DR(rdst); F_O___;
                           
                           /*----------------------------------------------------------------------*/
@@ -963,13 +964,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_13:
                           {
                             /** 0000 0110 mx10 00ss 0000 1001 rsrc rdst        divu    %1%S1, %0 */
-#line 609 "rx-decode.opc"
+#line 624 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 609 "rx-decode.opc"
+#line 624 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 609 "rx-decode.opc"
+#line 624 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 609 "rx-decode.opc"
+#line 624 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -982,7 +983,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("divu       %1%S1, %0");
-#line 609 "rx-decode.opc"
+#line 624 "rx-decode.opc"
                             ID(divu); SPm(ss, rsrc, mx); DR(rdst); F_O___;
                           
                           /*----------------------------------------------------------------------*/
@@ -1000,13 +1001,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_14:
                           {
                             /** 0000 0110 mx10 00ss 0000 1100 rsrc rdst        tst     %1%S1, %2 */
-#line 428 "rx-decode.opc"
+#line 436 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 428 "rx-decode.opc"
+#line 436 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 428 "rx-decode.opc"
+#line 436 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 428 "rx-decode.opc"
+#line 436 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -1019,7 +1020,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("tst        %1%S1, %2");
-#line 428 "rx-decode.opc"
+#line 436 "rx-decode.opc"
                             ID(and); SPm(ss, rsrc, mx); S2R(rdst); F__SZ_;
                           
                           /*----------------------------------------------------------------------*/
@@ -1037,13 +1038,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_15:
                           {
                             /** 0000 0110 mx10 00ss 0000 1101 rsrc rdst        xor     %1%S1, %0 */
-#line 407 "rx-decode.opc"
+#line 415 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 407 "rx-decode.opc"
+#line 415 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 407 "rx-decode.opc"
+#line 415 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 407 "rx-decode.opc"
+#line 415 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -1056,7 +1057,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("xor        %1%S1, %0");
-#line 407 "rx-decode.opc"
+#line 415 "rx-decode.opc"
                             ID(xor); SPm(ss, rsrc, mx); DR(rdst); F__SZ_;
                           
                           /*----------------------------------------------------------------------*/
@@ -1074,13 +1075,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_16:
                           {
                             /** 0000 0110 mx10 00ss 0001 0000 rsrc rdst        xchg    %1%S1, %0 */
-#line 341 "rx-decode.opc"
+#line 349 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 341 "rx-decode.opc"
+#line 349 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 341 "rx-decode.opc"
+#line 349 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 341 "rx-decode.opc"
+#line 349 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -1093,7 +1094,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("xchg       %1%S1, %0");
-#line 341 "rx-decode.opc"
+#line 349 "rx-decode.opc"
                             ID(xchg); DR(rdst); SPm(ss, rsrc, mx);
                           
                           /*----------------------------------------------------------------------*/
@@ -1111,13 +1112,13 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_17:
                           {
                             /** 0000 0110 mx10 00sd 0001 0001 rsrc rdst        itof    %1%S1, %0 */
-#line 838 "rx-decode.opc"
+#line 853 "rx-decode.opc"
                             int mx AU = (op[1] >> 6) & 0x03;
-#line 838 "rx-decode.opc"
+#line 853 "rx-decode.opc"
                             int sd AU = op[1] & 0x03;
-#line 838 "rx-decode.opc"
+#line 853 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 838 "rx-decode.opc"
+#line 853 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -1130,7 +1131,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("itof       %1%S1, %0");
-#line 838 "rx-decode.opc"
+#line 853 "rx-decode.opc"
                             ID(itof); DR (rdst); SPm(sd, rsrc, mx); F__SZ_;
                           
                           /*----------------------------------------------------------------------*/
@@ -2338,11 +2339,11 @@ rx_decode_opcode (unsigned long pc AU,
                         op_semantics_18:
                           {
                             /** 0000 0110 1010 00ss 0000 0010 rsrc rdst        adc     %1%S1, %0 */
-#line 449 "rx-decode.opc"
+#line 457 "rx-decode.opc"
                             int ss AU = op[1] & 0x03;
-#line 449 "rx-decode.opc"
+#line 457 "rx-decode.opc"
                             int rsrc AU = (op[3] >> 4) & 0x0f;
-#line 449 "rx-decode.opc"
+#line 457 "rx-decode.opc"
                             int rdst AU = op[3] & 0x0f;
                             if (trace)
                               {
@@ -2354,7 +2355,7 @@ rx_decode_opcode (unsigned long pc AU,
                                 printf ("  rdst = 0x%x\n", rdst);
                               }
                             SYNTAX("adc        %1%S1, %0");
-#line 449 "rx-decode.opc"
+#line 457 "rx-decode.opc"
                             ID(adc); SPm(ss, rsrc, 2); DR(rdst); F_OSZC;
                           
                           /*----------------------------------------------------------------------*/
@@ -3455,7 +3456,7 @@ rx_decode_opcode (unsigned long pc AU,
     case 0x0f:
         {
           /** 0000 1dsp                        bra.s   %a0 */
-#line 684 "rx-decode.opc"
+#line 699 "rx-decode.opc"
           int dsp AU = op[0] & 0x07;
           if (trace)
             {
@@ -3465,8 +3466,8 @@ rx_decode_opcode (unsigned long pc AU,
               printf ("  dsp = 0x%x\n", dsp);
             }
           SYNTAX("bra.s        %a0");
-#line 684 "rx-decode.opc"
-          ID(branch); Scc(RXC_always); DC(pc + dsp3map[dsp]);
+#line 699 "rx-decode.opc"
+          ID(branch); DC(pc + dsp3map[dsp]);
         
         }
       break;
@@ -3488,9 +3489,9 @@ rx_decode_opcode (unsigned long pc AU,
     case 0x1f:
         {
           /** 0001 n dsp                       b%1.s   %a0 */
-#line 674 "rx-decode.opc"
+#line 689 "rx-decode.opc"
           int n AU = (op[0] >> 3) & 0x01;
-#line 674 "rx-decode.opc"
+#line 689 "rx-decode.opc"
           int dsp AU = op[0] & 0x07;
           if (trace)
             {
@@ -3501,7 +3502,7 @@ rx_decode_opcode (unsigned long pc AU,
               printf ("  dsp = 0x%x\n", dsp);
             }
           SYNTAX("b%1.s        %a0");
-#line 674 "rx-decode.opc"
+#line 689 "rx-decode.opc"
           ID(branch); Scc(n); DC(pc + dsp3map[dsp]);
         
         }
@@ -3523,7 +3524,7 @@ rx_decode_opcode (unsigned long pc AU,
     case 0x2f:
         {
           /** 0010 cond                        b%1.b   %a0 */
-#line 677 "rx-decode.opc"
+#line 692 "rx-decode.opc"
           int cond AU = op[0] & 0x0f;
           if (trace)
             {
@@ -3533,7 +3534,7 @@ rx_decode_opcode (unsigned long pc AU,
               printf ("  cond = 0x%x\n", cond);
             }
           SYNTAX("b%1.b        %a0");
-#line 677 "rx-decode.opc"
+#line 692 "rx-decode.opc"
           ID(branch); Scc(cond); DC(pc + IMMex (1));
         
         }
@@ -3548,8 +3549,8 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bra.b        %a0");
-#line 687 "rx-decode.opc"
-          ID(branch); Scc(RXC_always); DC(pc + IMMex(1));
+#line 702 "rx-decode.opc"
+          ID(branch); DC(pc + IMMex(1));
         
         }
       break;
@@ -3563,8 +3564,8 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bra.w        %a0");
-#line 690 "rx-decode.opc"
-          ID(branch); Scc(RXC_always); DC(pc + IMMex(2));
+#line 705 "rx-decode.opc"
+          ID(branch); DC(pc + IMMex(2));
         
         }
       break;
@@ -3578,7 +3579,7 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bsr.w        %a0");
-#line 706 "rx-decode.opc"
+#line 721 "rx-decode.opc"
           ID(jsr); DC(pc + IMMex(2));
         
         }
@@ -3587,7 +3588,7 @@ rx_decode_opcode (unsigned long pc AU,
     case 0x3b:
         {
           /** 0011 101c                        b%1.w   %a0 */
-#line 680 "rx-decode.opc"
+#line 695 "rx-decode.opc"
           int c AU = op[0] & 0x01;
           if (trace)
             {
@@ -3597,7 +3598,7 @@ rx_decode_opcode (unsigned long pc AU,
               printf ("  c = 0x%x\n", c);
             }
           SYNTAX("b%1.w        %a0");
-#line 680 "rx-decode.opc"
+#line 695 "rx-decode.opc"
           ID(branch); Scc(c); DC(pc + IMMex (2));
         
         
@@ -3611,13 +3612,13 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_19:
               {
                 /** 0011 11sz d dst sppp               mov%s   #%1, %0 */
-#line 270 "rx-decode.opc"
+#line 271 "rx-decode.opc"
                 int sz AU = op[0] & 0x03;
-#line 270 "rx-decode.opc"
+#line 271 "rx-decode.opc"
                 int d AU = (op[1] >> 7) & 0x01;
-#line 270 "rx-decode.opc"
+#line 271 "rx-decode.opc"
                 int dst AU = (op[1] >> 4) & 0x07;
-#line 270 "rx-decode.opc"
+#line 271 "rx-decode.opc"
                 int sppp AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3630,7 +3631,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  sppp = 0x%x\n", sppp);
                   }
                 SYNTAX("mov%s  #%1, %0");
-#line 270 "rx-decode.opc"
+#line 271 "rx-decode.opc"
                 ID(mov); sBWL (sz); DIs(dst, d*16+sppp, sz); SC(IMM(1)); F_____;
               
               }
@@ -3662,9 +3663,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0011 1111 rega regb                rtsd    #%1, %2-%0 */
-#line 359 "rx-decode.opc"
+#line 367 "rx-decode.opc"
                 int rega AU = (op[1] >> 4) & 0x0f;
-#line 359 "rx-decode.opc"
+#line 367 "rx-decode.opc"
                 int regb AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3675,7 +3676,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  regb = 0x%x\n", regb);
                   }
                 SYNTAX("rtsd   #%1, %2-%0");
-#line 359 "rx-decode.opc"
+#line 367 "rx-decode.opc"
                 ID(rtsd); SC(IMM(1) * 4); S2R(rega); DR(regb);
               
               /*----------------------------------------------------------------------*/
@@ -3693,11 +3694,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_20:
               {
                 /** 0100 00ss rsrc rdst                        sub     %2%S2, %1 */
-#line 494 "rx-decode.opc"
+#line 502 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 494 "rx-decode.opc"
+#line 502 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 494 "rx-decode.opc"
+#line 502 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3709,7 +3710,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("sub    %2%S2, %1");
-#line 494 "rx-decode.opc"
+#line 502 "rx-decode.opc"
                 ID(sub); S2P(ss, rsrc); SR(rdst); DR(rdst); F_OSZC;
               
               }
@@ -3751,11 +3752,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_21:
               {
                 /** 0100 01ss rsrc rdst                cmp     %2%S2, %1 */
-#line 482 "rx-decode.opc"
+#line 490 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 482 "rx-decode.opc"
+#line 490 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 482 "rx-decode.opc"
+#line 490 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3767,7 +3768,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("cmp    %2%S2, %1");
-#line 482 "rx-decode.opc"
+#line 490 "rx-decode.opc"
                 ID(sub); S2P(ss, rsrc); SR(rdst); F_OSZC;
               
               }
@@ -3809,11 +3810,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_22:
               {
                 /** 0100 10ss rsrc rdst                        add     %1%S1, %0 */
-#line 458 "rx-decode.opc"
+#line 466 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 458 "rx-decode.opc"
+#line 466 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 458 "rx-decode.opc"
+#line 466 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3825,7 +3826,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("add    %1%S1, %0");
-#line 458 "rx-decode.opc"
+#line 466 "rx-decode.opc"
                 ID(add); SP(ss, rsrc); DR(rdst); F_OSZC;
               
               }
@@ -3867,11 +3868,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_23:
               {
                 /** 0100 11ss rsrc rdst                        mul     %1%S1, %0 */
-#line 555 "rx-decode.opc"
+#line 570 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 555 "rx-decode.opc"
+#line 570 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 555 "rx-decode.opc"
+#line 570 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3883,7 +3884,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("mul    %1%S1, %0");
-#line 555 "rx-decode.opc"
+#line 570 "rx-decode.opc"
                 ID(mul); SP(ss, rsrc); DR(rdst); F_____;
               
               }
@@ -3925,11 +3926,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_24:
               {
                 /** 0101 00ss rsrc rdst                        and     %1%S1, %0 */
-#line 371 "rx-decode.opc"
+#line 379 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 371 "rx-decode.opc"
+#line 379 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 371 "rx-decode.opc"
+#line 379 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3941,7 +3942,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("and    %1%S1, %0");
-#line 371 "rx-decode.opc"
+#line 379 "rx-decode.opc"
                 ID(and); SP(ss, rsrc); DR(rdst); F__SZ_;
               
               }
@@ -3983,11 +3984,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_25:
               {
                 /** 0101 01ss rsrc rdst                        or      %1%S1, %0 */
-#line 389 "rx-decode.opc"
+#line 397 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 389 "rx-decode.opc"
+#line 397 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 389 "rx-decode.opc"
+#line 397 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -3999,7 +4000,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("or     %1%S1, %0");
-#line 389 "rx-decode.opc"
+#line 397 "rx-decode.opc"
                 ID(or); SP(ss, rsrc); DR(rdst); F__SZ_;
               
               }
@@ -4041,13 +4042,13 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_26:
               {
                 /** 0101 1 s ss rsrc rdst      movu%s  %1, %0 */
-#line 310 "rx-decode.opc"
+#line 318 "rx-decode.opc"
                 int s AU = (op[0] >> 2) & 0x01;
-#line 310 "rx-decode.opc"
+#line 318 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 310 "rx-decode.opc"
+#line 318 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 310 "rx-decode.opc"
+#line 318 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4060,7 +4061,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("movu%s %1, %0");
-#line 310 "rx-decode.opc"
+#line 318 "rx-decode.opc"
                 ID(mov); uBWL(s); SD(ss, rsrc, s); DR(rdst); F_____;
               
               }
@@ -4137,9 +4138,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 0000 immm rdst                        sub     #%2, %0 */
-#line 491 "rx-decode.opc"
+#line 499 "rx-decode.opc"
                 int immm AU = (op[1] >> 4) & 0x0f;
-#line 491 "rx-decode.opc"
+#line 499 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4150,7 +4151,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("sub    #%2, %0");
-#line 491 "rx-decode.opc"
+#line 499 "rx-decode.opc"
                 ID(sub); S2C(immm); SR(rdst); DR(rdst); F_OSZC;
               
               }
@@ -4164,9 +4165,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 0001 immm rdst                        cmp     #%2, %1 */
-#line 473 "rx-decode.opc"
+#line 481 "rx-decode.opc"
                 int immm AU = (op[1] >> 4) & 0x0f;
-#line 473 "rx-decode.opc"
+#line 481 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4177,7 +4178,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("cmp    #%2, %1");
-#line 473 "rx-decode.opc"
+#line 481 "rx-decode.opc"
                 ID(sub); S2C(immm); SR(rdst); F_OSZC;
               
               }
@@ -4191,9 +4192,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 0010 immm rdst                        add     #%1, %0 */
-#line 455 "rx-decode.opc"
+#line 463 "rx-decode.opc"
                 int immm AU = (op[1] >> 4) & 0x0f;
-#line 455 "rx-decode.opc"
+#line 463 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4204,7 +4205,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("add    #%1, %0");
-#line 455 "rx-decode.opc"
+#line 463 "rx-decode.opc"
                 ID(add); SC(immm); DR(rdst); F_OSZC;
               
               }
@@ -4218,9 +4219,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 0011 immm rdst                        mul     #%1, %0 */
-#line 549 "rx-decode.opc"
+#line 564 "rx-decode.opc"
                 int immm AU = (op[1] >> 4) & 0x0f;
-#line 549 "rx-decode.opc"
+#line 564 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4231,7 +4232,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("mul    #%1, %0");
-#line 549 "rx-decode.opc"
+#line 564 "rx-decode.opc"
                 ID(mul); DR(rdst); SC(immm); F_____;
               
               }
@@ -4245,9 +4246,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 0100 immm rdst                        and     #%1, %0 */
-#line 365 "rx-decode.opc"
+#line 373 "rx-decode.opc"
                 int immm AU = (op[1] >> 4) & 0x0f;
-#line 365 "rx-decode.opc"
+#line 373 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4258,7 +4259,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("and    #%1, %0");
-#line 365 "rx-decode.opc"
+#line 373 "rx-decode.opc"
                 ID(and); SC(immm); DR(rdst); F__SZ_;
               
               }
@@ -4272,9 +4273,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 0101 immm rdst                        or      #%1, %0 */
-#line 383 "rx-decode.opc"
+#line 391 "rx-decode.opc"
                 int immm AU = (op[1] >> 4) & 0x0f;
-#line 383 "rx-decode.opc"
+#line 391 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4285,7 +4286,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("or     #%1, %0");
-#line 383 "rx-decode.opc"
+#line 391 "rx-decode.opc"
                 ID(or); SC(immm); DR(rdst); F__SZ_;
               
               }
@@ -4299,9 +4300,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 0110 immm rdst                mov%s   #%1, %0 */
-#line 267 "rx-decode.opc"
+#line 268 "rx-decode.opc"
                 int immm AU = (op[1] >> 4) & 0x0f;
-#line 267 "rx-decode.opc"
+#line 268 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4312,7 +4313,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("mov%s  #%1, %0");
-#line 267 "rx-decode.opc"
+#line 268 "rx-decode.opc"
                 ID(mov); DR(rdst); SC(immm); F_____;
               
               }
@@ -4329,7 +4330,7 @@ rx_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("rtsd #%1");
-#line 356 "rx-decode.opc"
+#line 364 "rx-decode.opc"
           ID(rtsd); SC(IMM(1) * 4);
         
         }
@@ -4342,11 +4343,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_27:
               {
                 /** 0110 100i mmmm rdst                        shlr    #%2, %0 */
-#line 635 "rx-decode.opc"
+#line 650 "rx-decode.opc"
                 int i AU = op[0] & 0x01;
-#line 635 "rx-decode.opc"
+#line 650 "rx-decode.opc"
                 int mmmm AU = (op[1] >> 4) & 0x0f;
-#line 635 "rx-decode.opc"
+#line 650 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4358,7 +4359,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("shlr   #%2, %0");
-#line 635 "rx-decode.opc"
+#line 650 "rx-decode.opc"
                 ID(shlr); S2C(i*16+mmmm); SR(rdst); DR(rdst); F__SZC;
               
               }
@@ -4382,11 +4383,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_28:
               {
                 /** 0110 101i mmmm rdst                        shar    #%2, %0 */
-#line 625 "rx-decode.opc"
+#line 640 "rx-decode.opc"
                 int i AU = op[0] & 0x01;
-#line 625 "rx-decode.opc"
+#line 640 "rx-decode.opc"
                 int mmmm AU = (op[1] >> 4) & 0x0f;
-#line 625 "rx-decode.opc"
+#line 640 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4398,7 +4399,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("shar   #%2, %0");
-#line 625 "rx-decode.opc"
+#line 640 "rx-decode.opc"
                 ID(shar); S2C(i*16+mmmm); SR(rdst); DR(rdst); F_0SZC;
               
               }
@@ -4422,11 +4423,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_29:
               {
                 /** 0110 110i mmmm rdst                        shll    #%2, %0 */
-#line 615 "rx-decode.opc"
+#line 630 "rx-decode.opc"
                 int i AU = op[0] & 0x01;
-#line 615 "rx-decode.opc"
+#line 630 "rx-decode.opc"
                 int mmmm AU = (op[1] >> 4) & 0x0f;
-#line 615 "rx-decode.opc"
+#line 630 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4438,7 +4439,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("shll   #%2, %0");
-#line 615 "rx-decode.opc"
+#line 630 "rx-decode.opc"
                 ID(shll); S2C(i*16+mmmm); SR(rdst); DR(rdst); F_OSZC;
               
               }
@@ -4461,9 +4462,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 1110 dsta dstb                pushm   %1-%2 */
-#line 323 "rx-decode.opc"
+#line 331 "rx-decode.opc"
                 int dsta AU = (op[1] >> 4) & 0x0f;
-#line 323 "rx-decode.opc"
+#line 331 "rx-decode.opc"
                 int dstb AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4474,7 +4475,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  dstb = 0x%x\n", dstb);
                   }
                 SYNTAX("pushm  %1-%2");
-#line 323 "rx-decode.opc"
+#line 331 "rx-decode.opc"
                 ID(pushm); SR(dsta); S2R(dstb); F_____;
                 
               }
@@ -4488,9 +4489,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0110 1111 dsta dstb                popm    %1-%2 */
-#line 320 "rx-decode.opc"
+#line 328 "rx-decode.opc"
                 int dsta AU = (op[1] >> 4) & 0x0f;
-#line 320 "rx-decode.opc"
+#line 328 "rx-decode.opc"
                 int dstb AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4501,7 +4502,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  dstb = 0x%x\n", dstb);
                   }
                 SYNTAX("popm   %1-%2");
-#line 320 "rx-decode.opc"
+#line 328 "rx-decode.opc"
                 ID(popm); SR(dsta); S2R(dstb); F_____;
               
               }
@@ -4516,11 +4517,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_30:
               {
                 /** 0111 00im rsrc rdst                        add     #%1, %2, %0 */
-#line 464 "rx-decode.opc"
+#line 472 "rx-decode.opc"
                 int im AU = op[0] & 0x03;
-#line 464 "rx-decode.opc"
+#line 472 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 464 "rx-decode.opc"
+#line 472 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4532,7 +4533,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("add    #%1, %2, %0");
-#line 464 "rx-decode.opc"
+#line 472 "rx-decode.opc"
                 ID(add); SC(IMMex(im)); S2R(rsrc); DR(rdst); F_OSZC;
               
               }
@@ -4574,9 +4575,9 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_31:
               {
                 /** 0111 01im 0000 rsrc                cmp     #%2, %1%S1 */
-#line 476 "rx-decode.opc"
+#line 484 "rx-decode.opc"
                 int im AU = op[0] & 0x03;
-#line 476 "rx-decode.opc"
+#line 484 "rx-decode.opc"
                 int rsrc AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4587,7 +4588,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rsrc = 0x%x\n", rsrc);
                   }
                 SYNTAX("cmp    #%2, %1%S1");
-#line 476 "rx-decode.opc"
+#line 484 "rx-decode.opc"
                 ID(sub); SR(rsrc); S2C(IMMex(im)); F_OSZC;
               
               }
@@ -4596,9 +4597,9 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_32:
               {
                 /** 0111 01im 0001rdst                 mul     #%1, %0 */
-#line 552 "rx-decode.opc"
+#line 567 "rx-decode.opc"
                 int im AU = op[0] & 0x03;
-#line 552 "rx-decode.opc"
+#line 567 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4609,7 +4610,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("mul    #%1, %0");
-#line 552 "rx-decode.opc"
+#line 567 "rx-decode.opc"
                 ID(mul); DR(rdst); SC(IMMex(im)); F_____;
               
               }
@@ -4618,9 +4619,9 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_33:
               {
                 /** 0111 01im 0010 rdst                        and     #%1, %0 */
-#line 368 "rx-decode.opc"
+#line 376 "rx-decode.opc"
                 int im AU = op[0] & 0x03;
-#line 368 "rx-decode.opc"
+#line 376 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4631,7 +4632,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("and    #%1, %0");
-#line 368 "rx-decode.opc"
+#line 376 "rx-decode.opc"
                 ID(and); SC(IMMex(im)); DR(rdst); F__SZ_;
               
               }
@@ -4640,9 +4641,9 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_34:
               {
                 /** 0111 01im 0011 rdst                        or      #%1, %0 */
-#line 386 "rx-decode.opc"
+#line 394 "rx-decode.opc"
                 int im AU = op[0] & 0x03;
-#line 386 "rx-decode.opc"
+#line 394 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4653,7 +4654,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("or     #%1, %0");
-#line 386 "rx-decode.opc"
+#line 394 "rx-decode.opc"
                 ID(or); SC(IMMex(im)); DR(rdst); F__SZ_;
               
               }
@@ -4755,7 +4756,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x4f:
               {
                 /** 0111 0101 0100 rdst                mov%s   #%1, %0 */
-#line 261 "rx-decode.opc"
+#line 262 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4765,7 +4766,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("mov%s  #%1, %0");
-#line 261 "rx-decode.opc"
+#line 262 "rx-decode.opc"
                 ID(mov); DR(rdst); SC(IMM (1)); F_____;
               
               }
@@ -4788,7 +4789,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x5f:
               {
                 /** 0111 0101 0101 rsrc                        cmp     #%2, %1 */
-#line 479 "rx-decode.opc"
+#line 487 "rx-decode.opc"
                 int rsrc AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4798,7 +4799,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rsrc = 0x%x\n", rsrc);
                   }
                 SYNTAX("cmp    #%2, %1");
-#line 479 "rx-decode.opc"
+#line 487 "rx-decode.opc"
                 ID(sub); SR(rsrc); S2C(IMM(1)); F_OSZC;
               
               }
@@ -4813,7 +4814,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("int #%1");
-#line 932 "rx-decode.opc"
+#line 947 "rx-decode.opc"
                 ID(int); SC(IMM(1));
               
               }
@@ -4825,7 +4826,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 0111 0101 0111 0000 0000 immm        mvtipl  #%1 */
-#line 899 "rx-decode.opc"
+#line 914 "rx-decode.opc"
                       int immm AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -4835,7 +4836,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  immm = 0x%x\n", immm);
                         }
                       SYNTAX("mvtipl   #%1");
-#line 899 "rx-decode.opc"
+#line 914 "rx-decode.opc"
                       ID(mvtipl); SC(immm);
                     
                     }
@@ -4892,11 +4893,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_35:
               {
                 /** 0111 100b ittt rdst                        bset    #%1, %0 */
-#line 850 "rx-decode.opc"
+#line 865 "rx-decode.opc"
                 int b AU = op[0] & 0x01;
-#line 850 "rx-decode.opc"
+#line 865 "rx-decode.opc"
                 int ittt AU = (op[1] >> 4) & 0x0f;
-#line 850 "rx-decode.opc"
+#line 865 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4908,7 +4909,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("bset   #%1, %0");
-#line 850 "rx-decode.opc"
+#line 865 "rx-decode.opc"
                 ID(bset); BWL(LSIZE); SC(b*16+ittt); DR(rdst); F_____;
               
               
@@ -4933,11 +4934,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_36:
               {
                 /** 0111 101b ittt rdst                        bclr    #%1, %0 */
-#line 860 "rx-decode.opc"
+#line 875 "rx-decode.opc"
                 int b AU = op[0] & 0x01;
-#line 860 "rx-decode.opc"
+#line 875 "rx-decode.opc"
                 int ittt AU = (op[1] >> 4) & 0x0f;
-#line 860 "rx-decode.opc"
+#line 875 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4949,7 +4950,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("bclr   #%1, %0");
-#line 860 "rx-decode.opc"
+#line 875 "rx-decode.opc"
                 ID(bclr); BWL(LSIZE); SC(b*16+ittt); DR(rdst); F_____;
               
               
@@ -4974,11 +4975,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_37:
               {
                 /** 0111 110b ittt rdst                        btst    #%2, %1 */
-#line 870 "rx-decode.opc"
+#line 885 "rx-decode.opc"
                 int b AU = op[0] & 0x01;
-#line 870 "rx-decode.opc"
+#line 885 "rx-decode.opc"
                 int ittt AU = (op[1] >> 4) & 0x0f;
-#line 870 "rx-decode.opc"
+#line 885 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -4990,7 +4991,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("btst   #%2, %1");
-#line 870 "rx-decode.opc"
+#line 885 "rx-decode.opc"
                 ID(btst); BWL(LSIZE); S2C(b*16+ittt); SR(rdst); F___ZC;
               
               
@@ -5014,7 +5015,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0111 1110 0000 rdst                        not     %0 */
-#line 413 "rx-decode.opc"
+#line 421 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5024,7 +5025,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("not    %0");
-#line 413 "rx-decode.opc"
+#line 421 "rx-decode.opc"
                 ID(xor); DR(rdst); SR(rdst); S2C(~0); F__SZ_;
               
               }
@@ -5032,7 +5033,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x10:
               {
                 /** 0111 1110 0001 rdst                        neg     %0 */
-#line 434 "rx-decode.opc"
+#line 442 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5042,7 +5043,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("neg    %0");
-#line 434 "rx-decode.opc"
+#line 442 "rx-decode.opc"
                 ID(sub); DR(rdst); SC(0); S2R(rdst); F_OSZC;
               
               }
@@ -5050,7 +5051,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x20:
               {
                 /** 0111 1110 0010 rdst                        abs     %0 */
-#line 516 "rx-decode.opc"
+#line 524 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5060,7 +5061,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("abs    %0");
-#line 516 "rx-decode.opc"
+#line 524 "rx-decode.opc"
                 ID(abs); DR(rdst); SR(rdst); F_OSZ_;
               
               }
@@ -5068,7 +5069,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x30:
               {
                 /** 0111 1110 0011 rdst                sat     %0 */
-#line 790 "rx-decode.opc"
+#line 805 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5078,7 +5079,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("sat    %0");
-#line 790 "rx-decode.opc"
+#line 805 "rx-decode.opc"
                 ID(sat); DR (rdst);
               
               }
@@ -5086,7 +5087,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x40:
               {
                 /** 0111 1110 0100 rdst                        rorc    %0 */
-#line 650 "rx-decode.opc"
+#line 665 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5096,7 +5097,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("rorc   %0");
-#line 650 "rx-decode.opc"
+#line 665 "rx-decode.opc"
                 ID(rorc); DR(rdst); F__SZC;
               
               }
@@ -5104,7 +5105,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x50:
               {
                 /** 0111 1110 0101 rdst                        rolc    %0 */
-#line 647 "rx-decode.opc"
+#line 662 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5114,7 +5115,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("rolc   %0");
-#line 647 "rx-decode.opc"
+#line 662 "rx-decode.opc"
                 ID(rolc); DR(rdst); F__SZC;
               
               }
@@ -5124,9 +5125,9 @@ rx_decode_opcode (unsigned long pc AU,
           case 0xa0:
               {
                 /** 0111 1110 10sz rsrc                push%s  %1 */
-#line 329 "rx-decode.opc"
+#line 337 "rx-decode.opc"
                 int sz AU = (op[1] >> 4) & 0x03;
-#line 329 "rx-decode.opc"
+#line 337 "rx-decode.opc"
                 int rsrc AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5137,7 +5138,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rsrc = 0x%x\n", rsrc);
                   }
                 SYNTAX("push%s %1");
-#line 329 "rx-decode.opc"
+#line 337 "rx-decode.opc"
                 ID(mov); BWL(sz); OP(0, RX_Operand_Predec, 0, 0); SR(rsrc); F_____;
               
               }
@@ -5145,7 +5146,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0xb0:
               {
                 /** 0111 1110 1011 rdst                pop     %0 */
-#line 326 "rx-decode.opc"
+#line 334 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5155,7 +5156,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("pop    %0");
-#line 326 "rx-decode.opc"
+#line 334 "rx-decode.opc"
                 ID(mov); OP(1, RX_Operand_Postinc, 0, 0); DR(rdst); F_____;
                 
               }
@@ -5164,7 +5165,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0xd0:
               {
                 /** 0111 1110 110 crsrc                        pushc   %1 */
-#line 905 "rx-decode.opc"
+#line 920 "rx-decode.opc"
                 int crsrc AU = op[1] & 0x1f;
                 if (trace)
                   {
@@ -5174,7 +5175,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  crsrc = 0x%x\n", crsrc);
                   }
                 SYNTAX("pushc  %1");
-#line 905 "rx-decode.opc"
+#line 920 "rx-decode.opc"
                 ID(mov); OP(0, RX_Operand_Predec, 0, 0); SR(crsrc + 16);
               
               }
@@ -5183,7 +5184,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0xf0:
               {
                 /** 0111 1110 111 crdst                        popc    %0 */
-#line 902 "rx-decode.opc"
+#line 917 "rx-decode.opc"
                 int crdst AU = op[1] & 0x1f;
                 if (trace)
                   {
@@ -5193,7 +5194,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  crdst = 0x%x\n", crdst);
                   }
                 SYNTAX("popc   %0");
-#line 902 "rx-decode.opc"
+#line 917 "rx-decode.opc"
                 ID(mov); OP(1, RX_Operand_Postinc, 0, 0); DR(crdst + 16);
               
               }
@@ -5223,7 +5224,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x0f:
               {
                 /** 0111 1111 0000 rsrc                jmp     %0 */
-#line 700 "rx-decode.opc"
+#line 715 "rx-decode.opc"
                 int rsrc AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5233,8 +5234,8 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rsrc = 0x%x\n", rsrc);
                   }
                 SYNTAX("jmp    %0");
-#line 700 "rx-decode.opc"
-                ID(branch); Scc(RXC_always); DR(rsrc);
+#line 715 "rx-decode.opc"
+                ID(branch); DR(rsrc);
               
               }
             break;
@@ -5256,7 +5257,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x1f:
               {
                 /** 0111 1111 0001 rsrc                jsr     %0 */
-#line 703 "rx-decode.opc"
+#line 718 "rx-decode.opc"
                 int rsrc AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5266,7 +5267,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rsrc = 0x%x\n", rsrc);
                   }
                 SYNTAX("jsr    %0");
-#line 703 "rx-decode.opc"
+#line 718 "rx-decode.opc"
                 ID(jsr); DR(rsrc);
               
               }
@@ -5289,7 +5290,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x4f:
               {
                 /** 0111 1111 0100 rsrc                bra.l   %0 */
-#line 696 "rx-decode.opc"
+#line 711 "rx-decode.opc"
                 int rsrc AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5299,8 +5300,8 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rsrc = 0x%x\n", rsrc);
                   }
                 SYNTAX("bra.l  %0");
-#line 696 "rx-decode.opc"
-                ID(branchrel); Scc(RXC_always); DR(rsrc);
+#line 711 "rx-decode.opc"
+                ID(branchrel); DR(rsrc);
               
               
               }
@@ -5323,7 +5324,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x5f:
               {
                 /** 0111 1111 0101 rsrc                bsr.l   %0 */
-#line 712 "rx-decode.opc"
+#line 727 "rx-decode.opc"
                 int rsrc AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5333,7 +5334,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rsrc = 0x%x\n", rsrc);
                   }
                 SYNTAX("bsr.l  %0");
-#line 712 "rx-decode.opc"
+#line 727 "rx-decode.opc"
                 ID(jsrrel); DR(rsrc);
               
               }
@@ -5343,7 +5344,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x82:
               {
                 /** 0111 1111 1000 00sz                suntil%s */
-#line 736 "rx-decode.opc"
+#line 751 "rx-decode.opc"
                 int sz AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -5353,7 +5354,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  sz = 0x%x\n", sz);
                   }
                 SYNTAX("suntil%s");
-#line 736 "rx-decode.opc"
+#line 751 "rx-decode.opc"
                 ID(suntil); BWL(sz); F___ZC;
               
               }
@@ -5368,7 +5369,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("scmpu");
-#line 727 "rx-decode.opc"
+#line 742 "rx-decode.opc"
                 ID(scmpu); F___ZC;
               
               }
@@ -5378,7 +5379,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x86:
               {
                 /** 0111 1111 1000 01sz                swhile%s */
-#line 739 "rx-decode.opc"
+#line 754 "rx-decode.opc"
                 int sz AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -5388,7 +5389,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  sz = 0x%x\n", sz);
                   }
                 SYNTAX("swhile%s");
-#line 739 "rx-decode.opc"
+#line 754 "rx-decode.opc"
                 ID(swhile); BWL(sz); F___ZC;
               
               }
@@ -5403,7 +5404,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("smovu");
-#line 730 "rx-decode.opc"
+#line 745 "rx-decode.opc"
                 ID(smovu);
               
               }
@@ -5413,7 +5414,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x8a:
               {
                 /** 0111 1111 1000 10sz                sstr%s */
-#line 745 "rx-decode.opc"
+#line 760 "rx-decode.opc"
                 int sz AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -5423,7 +5424,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  sz = 0x%x\n", sz);
                   }
                 SYNTAX("sstr%s");
-#line 745 "rx-decode.opc"
+#line 760 "rx-decode.opc"
                 ID(sstr); BWL(sz);
               
               /*----------------------------------------------------------------------*/
@@ -5441,7 +5442,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("smovb");
-#line 733 "rx-decode.opc"
+#line 748 "rx-decode.opc"
                 ID(smovb);
               
               }
@@ -5451,7 +5452,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0x8e:
               {
                 /** 0111 1111 1000 11sz                rmpa%s */
-#line 751 "rx-decode.opc"
+#line 766 "rx-decode.opc"
                 int sz AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -5461,7 +5462,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  sz = 0x%x\n", sz);
                   }
                 SYNTAX("rmpa%s");
-#line 751 "rx-decode.opc"
+#line 766 "rx-decode.opc"
                 ID(rmpa); BWL(sz); F_OS__;
               
               /*----------------------------------------------------------------------*/
@@ -5479,7 +5480,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("smovf");
-#line 742 "rx-decode.opc"
+#line 757 "rx-decode.opc"
                 ID(smovf);
               
               }
@@ -5494,7 +5495,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("satr");
-#line 793 "rx-decode.opc"
+#line 808 "rx-decode.opc"
                 ID(satr);
               
               /*----------------------------------------------------------------------*/
@@ -5512,7 +5513,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rtfi");
-#line 920 "rx-decode.opc"
+#line 935 "rx-decode.opc"
                 ID(rtfi);
               
               }
@@ -5527,7 +5528,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rte");
-#line 923 "rx-decode.opc"
+#line 938 "rx-decode.opc"
                 ID(rte);
               
               }
@@ -5542,7 +5543,7 @@ rx_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("wait");
-#line 935 "rx-decode.opc"
+#line 950 "rx-decode.opc"
                 ID(wait);
               
               /*----------------------------------------------------------------------*/
@@ -5568,7 +5569,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0xaf:
               {
                 /** 0111 1111 1010 rdst                        setpsw  %0 */
-#line 896 "rx-decode.opc"
+#line 911 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5578,7 +5579,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("setpsw %0");
-#line 896 "rx-decode.opc"
+#line 911 "rx-decode.opc"
                 ID(setpsw); DF(rdst);
               
               }
@@ -5601,7 +5602,7 @@ rx_decode_opcode (unsigned long pc AU,
           case 0xbf:
               {
                 /** 0111 1111 1011 rdst                        clrpsw  %0 */
-#line 893 "rx-decode.opc"
+#line 908 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -5611,7 +5612,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("clrpsw %0");
-#line 893 "rx-decode.opc"
+#line 908 "rx-decode.opc"
                 ID(clrpsw); DF(rdst);
               
               }
@@ -5627,17 +5628,17 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_38:
               {
                 /** 10sz 0dsp a dst b src      mov%s   %1, %0 */
-#line 287 "rx-decode.opc"
+#line 295 "rx-decode.opc"
                 int sz AU = (op[0] >> 4) & 0x03;
-#line 287 "rx-decode.opc"
+#line 295 "rx-decode.opc"
                 int dsp AU = op[0] & 0x07;
-#line 287 "rx-decode.opc"
+#line 295 "rx-decode.opc"
                 int a AU = (op[1] >> 7) & 0x01;
-#line 287 "rx-decode.opc"
+#line 295 "rx-decode.opc"
                 int dst AU = (op[1] >> 4) & 0x07;
-#line 287 "rx-decode.opc"
+#line 295 "rx-decode.opc"
                 int b AU = (op[1] >> 3) & 0x01;
-#line 287 "rx-decode.opc"
+#line 295 "rx-decode.opc"
                 int src AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -5652,7 +5653,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  src = 0x%x\n", src);
                   }
                 SYNTAX("mov%s  %1, %0");
-#line 287 "rx-decode.opc"
+#line 295 "rx-decode.opc"
                 ID(mov); sBWL(sz); DIs(dst, dsp*4+a*2+b, sz); SR(src); F_____;
               
               }
@@ -5730,17 +5731,17 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_39:
               {
                 /** 10sz 1dsp a src b dst      mov%s   %1, %0 */
-#line 284 "rx-decode.opc"
+#line 292 "rx-decode.opc"
                 int sz AU = (op[0] >> 4) & 0x03;
-#line 284 "rx-decode.opc"
+#line 292 "rx-decode.opc"
                 int dsp AU = op[0] & 0x07;
-#line 284 "rx-decode.opc"
+#line 292 "rx-decode.opc"
                 int a AU = (op[1] >> 7) & 0x01;
-#line 284 "rx-decode.opc"
+#line 292 "rx-decode.opc"
                 int src AU = (op[1] >> 4) & 0x07;
-#line 284 "rx-decode.opc"
+#line 292 "rx-decode.opc"
                 int b AU = (op[1] >> 3) & 0x01;
-#line 284 "rx-decode.opc"
+#line 292 "rx-decode.opc"
                 int dst AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -5755,7 +5756,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  dst = 0x%x\n", dst);
                   }
                 SYNTAX("mov%s  %1, %0");
-#line 284 "rx-decode.opc"
+#line 292 "rx-decode.opc"
                 ID(mov); sBWL(sz); DR(dst); SIs(src, dsp*4+a*2+b, sz); F_____;
               
               }
@@ -6121,17 +6122,17 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_40:
               {
                 /** 1011 w dsp a src b dst     movu%s  %1, %0 */
-#line 307 "rx-decode.opc"
+#line 315 "rx-decode.opc"
                 int w AU = (op[0] >> 3) & 0x01;
-#line 307 "rx-decode.opc"
+#line 315 "rx-decode.opc"
                 int dsp AU = op[0] & 0x07;
-#line 307 "rx-decode.opc"
+#line 315 "rx-decode.opc"
                 int a AU = (op[1] >> 7) & 0x01;
-#line 307 "rx-decode.opc"
+#line 315 "rx-decode.opc"
                 int src AU = (op[1] >> 4) & 0x07;
-#line 307 "rx-decode.opc"
+#line 315 "rx-decode.opc"
                 int b AU = (op[1] >> 3) & 0x01;
-#line 307 "rx-decode.opc"
+#line 315 "rx-decode.opc"
                 int dst AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -6146,7 +6147,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  dst = 0x%x\n", dst);
                   }
                 SYNTAX("movu%s %1, %0");
-#line 307 "rx-decode.opc"
+#line 315 "rx-decode.opc"
                 ID(mov); uBWL(w); DR(dst); SIs(src, dsp*4+a*2+b, w); F_____;
               
               }
@@ -6296,15 +6297,15 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_41:
               {
                 /** 11sz sd ss rsrc rdst       mov%s   %1, %0 */
-#line 273 "rx-decode.opc"
+#line 274 "rx-decode.opc"
                 int sz AU = (op[0] >> 4) & 0x03;
-#line 273 "rx-decode.opc"
+#line 274 "rx-decode.opc"
                 int sd AU = (op[0] >> 2) & 0x03;
-#line 273 "rx-decode.opc"
+#line 274 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 273 "rx-decode.opc"
+#line 274 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 273 "rx-decode.opc"
+#line 274 "rx-decode.opc"
                 int rdst AU = op[1] & 0x0f;
                 if (trace)
                   {
@@ -6318,15 +6319,22 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  rdst = 0x%x\n", rdst);
                   }
                 SYNTAX("mov%s  %1, %0");
-#line 273 "rx-decode.opc"
-                ID(mov); sBWL(sz); F_____;
-                if ((ss == 3) && (sd != 3))
+#line 274 "rx-decode.opc"
+                if (ss == 3 && sz == 2 && rsrc == 0 && rdst == 0)
                   {
-                    SD(ss, rdst, sz); DD(sd, rsrc, sz);
+                    ID(nop2);
                   }
                 else
                   {
-                    SD(ss, rsrc, sz); DD(sd, rdst, sz);
+                    ID(mov); sBWL(sz); F_____;
+                    if ((ss == 3) && (sd != 3))
+               {
+                 SD(ss, rdst, sz); DD(sd, rsrc, sz);
+               }
+                    else
+               {
+                 SD(ss, rsrc, sz); DD(sd, rdst, sz);
+               }
                   }
               
               }
@@ -6764,11 +6772,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_42:
               {
                 /** 1111 00sd rdst 0bit                        bset    #%1, %0%S0 */
-#line 844 "rx-decode.opc"
+#line 859 "rx-decode.opc"
                 int sd AU = op[0] & 0x03;
-#line 844 "rx-decode.opc"
+#line 859 "rx-decode.opc"
                 int rdst AU = (op[1] >> 4) & 0x0f;
-#line 844 "rx-decode.opc"
+#line 859 "rx-decode.opc"
                 int bit AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -6780,7 +6788,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bset   #%1, %0%S0");
-#line 844 "rx-decode.opc"
+#line 859 "rx-decode.opc"
                 ID(bset); BWL(BSIZE); SC(bit); DD(sd, rdst, BSIZE); F_____;
               
               }
@@ -6789,11 +6797,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_43:
               {
                 /** 1111 00sd rdst 1bit                        bclr    #%1, %0%S0 */
-#line 854 "rx-decode.opc"
+#line 869 "rx-decode.opc"
                 int sd AU = op[0] & 0x03;
-#line 854 "rx-decode.opc"
+#line 869 "rx-decode.opc"
                 int rdst AU = (op[1] >> 4) & 0x0f;
-#line 854 "rx-decode.opc"
+#line 869 "rx-decode.opc"
                 int bit AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -6805,7 +6813,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bclr   #%1, %0%S0");
-#line 854 "rx-decode.opc"
+#line 869 "rx-decode.opc"
                 ID(bclr); BWL(BSIZE); SC(bit); DD(sd, rdst, BSIZE); F_____;
               
               }
@@ -6857,11 +6865,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_44:
               {
                 /** 1111 01sd rdst 0bit                        btst    #%2, %1%S1 */
-#line 864 "rx-decode.opc"
+#line 879 "rx-decode.opc"
                 int sd AU = op[0] & 0x03;
-#line 864 "rx-decode.opc"
+#line 879 "rx-decode.opc"
                 int rdst AU = (op[1] >> 4) & 0x0f;
-#line 864 "rx-decode.opc"
+#line 879 "rx-decode.opc"
                 int bit AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -6873,7 +6881,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btst   #%2, %1%S1");
-#line 864 "rx-decode.opc"
+#line 879 "rx-decode.opc"
                 ID(btst); BWL(BSIZE); S2C(bit); SD(sd, rdst, BSIZE); F___ZC;
               
               }
@@ -6882,11 +6890,11 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_45:
               {
                 /** 1111 01ss rsrc 10sz                push%s  %1 */
-#line 332 "rx-decode.opc"
+#line 340 "rx-decode.opc"
                 int ss AU = op[0] & 0x03;
-#line 332 "rx-decode.opc"
+#line 340 "rx-decode.opc"
                 int rsrc AU = (op[1] >> 4) & 0x0f;
-#line 332 "rx-decode.opc"
+#line 340 "rx-decode.opc"
                 int sz AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -6898,7 +6906,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  sz = 0x%x\n", sz);
                   }
                 SYNTAX("push%s %1");
-#line 332 "rx-decode.opc"
+#line 340 "rx-decode.opc"
                 ID(mov); BWL(sz); OP(0, RX_Operand_Predec, 0, 0); SD(ss, rsrc, sz); F_____;
               
               /*----------------------------------------------------------------------*/
@@ -6959,13 +6967,13 @@ rx_decode_opcode (unsigned long pc AU,
             op_semantics_46:
               {
                 /** 1111 10sd rdst im sz       mov%s   #%1, %0 */
-#line 264 "rx-decode.opc"
+#line 265 "rx-decode.opc"
                 int sd AU = op[0] & 0x03;
-#line 264 "rx-decode.opc"
+#line 265 "rx-decode.opc"
                 int rdst AU = (op[1] >> 4) & 0x0f;
-#line 264 "rx-decode.opc"
+#line 265 "rx-decode.opc"
                 int im AU = (op[1] >> 2) & 0x03;
-#line 264 "rx-decode.opc"
+#line 265 "rx-decode.opc"
                 int sz AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -6978,7 +6986,7 @@ rx_decode_opcode (unsigned long pc AU,
                     printf ("  sz = 0x%x\n", sz);
                   }
                 SYNTAX("mov%s  #%1, %0");
-#line 264 "rx-decode.opc"
+#line 265 "rx-decode.opc"
                 ID(mov); sBWL (sz); DD(sd, rdst, sz); SC(IMMex(im)); F_____;
               
               }
@@ -7023,9 +7031,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1100 0000 0011 rsrc rdst        sbb     %1, %0 */
-#line 506 "rx-decode.opc"
+#line 514 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 506 "rx-decode.opc"
+#line 514 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7036,7 +7044,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("sbb      %1, %0");
-#line 506 "rx-decode.opc"
+#line 514 "rx-decode.opc"
                       ID(sbb); SR (rsrc); DR(rdst); F_OSZC;
                     
                       /* FIXME: only supports .L */
@@ -7051,9 +7059,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1100 0000 0111 rsrc rdst        neg     %2, %0 */
-#line 437 "rx-decode.opc"
+#line 445 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 437 "rx-decode.opc"
+#line 445 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7064,7 +7072,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("neg      %2, %0");
-#line 437 "rx-decode.opc"
+#line 445 "rx-decode.opc"
                       ID(sub); DR(rdst); SC(0); S2R(rsrc); F_OSZC;
                     
                     /*----------------------------------------------------------------------*/
@@ -7081,9 +7089,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1100 0000 1011 rsrc rdst        adc     %1, %0 */
-#line 446 "rx-decode.opc"
+#line 454 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 446 "rx-decode.opc"
+#line 454 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7094,7 +7102,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("adc      %1, %0");
-#line 446 "rx-decode.opc"
+#line 454 "rx-decode.opc"
                       ID(adc); SR(rsrc); DR(rdst); F_OSZC;
                     
                     }
@@ -7108,9 +7116,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1100 0000 1111 rsrc rdst        abs     %1, %0 */
-#line 519 "rx-decode.opc"
+#line 527 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 519 "rx-decode.opc"
+#line 527 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7121,7 +7129,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("abs      %1, %0");
-#line 519 "rx-decode.opc"
+#line 527 "rx-decode.opc"
                       ID(abs); DR(rdst); SR(rsrc); F_OSZ_;
                     
                     /*----------------------------------------------------------------------*/
@@ -7139,11 +7147,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_47:
                     {
                       /** 1111 1100 0001 00ss rsrc rdst        max     %1%S1, %0 */
-#line 528 "rx-decode.opc"
+#line 536 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 528 "rx-decode.opc"
+#line 536 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 528 "rx-decode.opc"
+#line 536 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7155,8 +7163,15 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("max      %1%S1, %0");
-#line 528 "rx-decode.opc"
-                      ID(max); SP(ss, rsrc); DR(rdst);
+#line 536 "rx-decode.opc"
+                      if (ss == 3 && rsrc == 0 && rdst == 0)
+                        {
+                          ID(nop3);
+                        }
+                      else
+                        {
+                          ID(max); SP(ss, rsrc); DR(rdst);
+                        }
                     
                     }
                   break;
@@ -7197,11 +7212,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_48:
                     {
                       /** 1111 1100 0001 01ss rsrc rdst        min     %1%S1, %0 */
-#line 540 "rx-decode.opc"
+#line 555 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 540 "rx-decode.opc"
+#line 555 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 540 "rx-decode.opc"
+#line 555 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7213,7 +7228,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("min      %1%S1, %0");
-#line 540 "rx-decode.opc"
+#line 555 "rx-decode.opc"
                       ID(min); SP(ss, rsrc); DR(rdst);
                     
                     }
@@ -7255,11 +7270,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_49:
                     {
                       /** 1111 1100 0001 10ss rsrc rdst        emul    %1%S1, %0 */
-#line 570 "rx-decode.opc"
+#line 585 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 570 "rx-decode.opc"
+#line 585 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 570 "rx-decode.opc"
+#line 585 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7271,7 +7286,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("emul     %1%S1, %0");
-#line 570 "rx-decode.opc"
+#line 585 "rx-decode.opc"
                       ID(emul); SP(ss, rsrc); DR(rdst);
                     
                     }
@@ -7313,11 +7328,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_50:
                     {
                       /** 1111 1100 0001 11ss rsrc rdst        emulu   %1%S1, %0 */
-#line 582 "rx-decode.opc"
+#line 597 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 582 "rx-decode.opc"
+#line 597 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 582 "rx-decode.opc"
+#line 597 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7329,7 +7344,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("emulu    %1%S1, %0");
-#line 582 "rx-decode.opc"
+#line 597 "rx-decode.opc"
                       ID(emulu); SP(ss, rsrc); DR(rdst);
                     
                     }
@@ -7371,11 +7386,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_51:
                     {
                       /** 1111 1100 0010 00ss rsrc rdst        div     %1%S1, %0 */
-#line 594 "rx-decode.opc"
+#line 609 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 594 "rx-decode.opc"
+#line 609 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 594 "rx-decode.opc"
+#line 609 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7387,7 +7402,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("div      %1%S1, %0");
-#line 594 "rx-decode.opc"
+#line 609 "rx-decode.opc"
                       ID(div); SP(ss, rsrc); DR(rdst); F_O___;
                     
                     }
@@ -7429,11 +7444,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_52:
                     {
                       /** 1111 1100 0010 01ss rsrc rdst        divu    %1%S1, %0 */
-#line 606 "rx-decode.opc"
+#line 621 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 606 "rx-decode.opc"
+#line 621 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 606 "rx-decode.opc"
+#line 621 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7445,7 +7460,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("divu     %1%S1, %0");
-#line 606 "rx-decode.opc"
+#line 621 "rx-decode.opc"
                       ID(divu); SP(ss, rsrc); DR(rdst); F_O___;
                     
                     }
@@ -7487,11 +7502,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_53:
                     {
                       /** 1111 1100 0011 00ss rsrc rdst        tst     %1%S1, %2 */
-#line 425 "rx-decode.opc"
+#line 433 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 425 "rx-decode.opc"
+#line 433 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 425 "rx-decode.opc"
+#line 433 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7503,7 +7518,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("tst      %1%S1, %2");
-#line 425 "rx-decode.opc"
+#line 433 "rx-decode.opc"
                       ID(and); SP(ss, rsrc); S2R(rdst); F__SZ_;
                     
                     }
@@ -7545,11 +7560,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_54:
                     {
                       /** 1111 1100 0011 01ss rsrc rdst        xor     %1%S1, %0 */
-#line 404 "rx-decode.opc"
+#line 412 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 404 "rx-decode.opc"
+#line 412 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 404 "rx-decode.opc"
+#line 412 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7561,7 +7576,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("xor      %1%S1, %0");
-#line 404 "rx-decode.opc"
+#line 412 "rx-decode.opc"
                       ID(xor); SP(ss, rsrc); DR(rdst); F__SZ_;
                     
                     }
@@ -7602,9 +7617,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1100 0011 1011 rsrc rdst        not     %1, %0 */
-#line 416 "rx-decode.opc"
+#line 424 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 416 "rx-decode.opc"
+#line 424 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7615,7 +7630,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("not      %1, %0");
-#line 416 "rx-decode.opc"
+#line 424 "rx-decode.opc"
                       ID(xor); DR(rdst); SR(rsrc); S2C(~0); F__SZ_;
                     
                     /*----------------------------------------------------------------------*/
@@ -7633,11 +7648,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_55:
                     {
                       /** 1111 1100 0100 00ss rsrc rdst        xchg    %1%S1, %0 */
-#line 338 "rx-decode.opc"
+#line 346 "rx-decode.opc"
                       int ss AU = op[1] & 0x03;
-#line 338 "rx-decode.opc"
+#line 346 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 338 "rx-decode.opc"
+#line 346 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7649,7 +7664,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("xchg     %1%S1, %0");
-#line 338 "rx-decode.opc"
+#line 346 "rx-decode.opc"
                       ID(xchg); DR(rdst); SP(ss, rsrc);
                     
                     }
@@ -7691,11 +7706,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_56:
                     {
                       /** 1111 1100 0100 01sd rsrc rdst        itof    %1%S1, %0 */
-#line 835 "rx-decode.opc"
+#line 850 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 835 "rx-decode.opc"
+#line 850 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 835 "rx-decode.opc"
+#line 850 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7707,7 +7722,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("itof     %1%S1, %0");
-#line 835 "rx-decode.opc"
+#line 850 "rx-decode.opc"
                       ID(itof); DR (rdst); SP(sd, rsrc); F__SZ_;
                     
                     }
@@ -7749,11 +7764,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_57:
                     {
                       /** 1111 1100 0110 00sd rdst rsrc        bset    %1, %0%S0 */
-#line 847 "rx-decode.opc"
+#line 862 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 847 "rx-decode.opc"
+#line 862 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
-#line 847 "rx-decode.opc"
+#line 862 "rx-decode.opc"
                       int rsrc AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7765,7 +7780,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rsrc = 0x%x\n", rsrc);
                         }
                       SYNTAX("bset     %1, %0%S0");
-#line 847 "rx-decode.opc"
+#line 862 "rx-decode.opc"
                       ID(bset); BWL(BSIZE); SR(rsrc); DD(sd, rdst, BSIZE); F_____;
                     
                     }
@@ -7807,11 +7822,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_58:
                     {
                       /** 1111 1100 0110 01sd rdst rsrc        bclr    %1, %0%S0 */
-#line 857 "rx-decode.opc"
+#line 872 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 857 "rx-decode.opc"
+#line 872 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
-#line 857 "rx-decode.opc"
+#line 872 "rx-decode.opc"
                       int rsrc AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7823,7 +7838,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rsrc = 0x%x\n", rsrc);
                         }
                       SYNTAX("bclr     %1, %0%S0");
-#line 857 "rx-decode.opc"
+#line 872 "rx-decode.opc"
                       ID(bclr); BWL(BSIZE); SR(rsrc); DD(sd, rdst, BSIZE); F_____;
                     
                     }
@@ -7865,11 +7880,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_59:
                     {
                       /** 1111 1100 0110 10sd rdst rsrc        btst    %2, %1%S1 */
-#line 867 "rx-decode.opc"
+#line 882 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 867 "rx-decode.opc"
+#line 882 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
-#line 867 "rx-decode.opc"
+#line 882 "rx-decode.opc"
                       int rsrc AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7881,7 +7896,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rsrc = 0x%x\n", rsrc);
                         }
                       SYNTAX("btst     %2, %1%S1");
-#line 867 "rx-decode.opc"
+#line 882 "rx-decode.opc"
                       ID(btst); BWL(BSIZE); S2R(rsrc); SD(sd, rdst, BSIZE); F___ZC;
                     
                     }
@@ -7923,11 +7938,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_60:
                     {
                       /** 1111 1100 0110 11sd rdst rsrc        bnot    %1, %0%S0 */
-#line 877 "rx-decode.opc"
+#line 892 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 877 "rx-decode.opc"
+#line 892 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
-#line 877 "rx-decode.opc"
+#line 892 "rx-decode.opc"
                       int rsrc AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7939,7 +7954,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rsrc = 0x%x\n", rsrc);
                         }
                       SYNTAX("bnot     %1, %0%S0");
-#line 877 "rx-decode.opc"
+#line 892 "rx-decode.opc"
                       ID(bnot); BWL(BSIZE); SR(rsrc); DD(sd, rdst, BSIZE);
                     
                     }
@@ -7981,11 +7996,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_61:
                     {
                       /** 1111 1100 1000 00sd rsrc rdst        fsub    %1%S1, %0 */
-#line 814 "rx-decode.opc"
+#line 829 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 814 "rx-decode.opc"
+#line 829 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 814 "rx-decode.opc"
+#line 829 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -7997,7 +8012,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fsub     %1%S1, %0");
-#line 814 "rx-decode.opc"
+#line 829 "rx-decode.opc"
                       ID(fsub); DR(rdst); SD(sd, rsrc, LSIZE); F__SZ_;
                     
                     }
@@ -8039,11 +8054,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_62:
                     {
                       /** 1111 1100 1000 01sd rsrc rdst        fcmp    %1%S1, %0 */
-#line 808 "rx-decode.opc"
+#line 823 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 808 "rx-decode.opc"
+#line 823 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 808 "rx-decode.opc"
+#line 823 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8055,7 +8070,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fcmp     %1%S1, %0");
-#line 808 "rx-decode.opc"
+#line 823 "rx-decode.opc"
                       ID(fcmp); DR(rdst); SD(sd, rsrc, LSIZE); F_OSZ_;
                     
                     }
@@ -8097,11 +8112,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_63:
                     {
                       /** 1111 1100 1000 10sd rsrc rdst        fadd    %1%S1, %0 */
-#line 802 "rx-decode.opc"
+#line 817 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 802 "rx-decode.opc"
+#line 817 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 802 "rx-decode.opc"
+#line 817 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8113,7 +8128,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fadd     %1%S1, %0");
-#line 802 "rx-decode.opc"
+#line 817 "rx-decode.opc"
                       ID(fadd); DR(rdst); SD(sd, rsrc, LSIZE); F__SZ_;
                     
                     }
@@ -8155,11 +8170,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_64:
                     {
                       /** 1111 1100 1000 11sd rsrc rdst        fmul    %1%S1, %0 */
-#line 823 "rx-decode.opc"
+#line 838 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 823 "rx-decode.opc"
+#line 838 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 823 "rx-decode.opc"
+#line 838 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8171,7 +8186,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fmul     %1%S1, %0");
-#line 823 "rx-decode.opc"
+#line 838 "rx-decode.opc"
                       ID(fmul); DR(rdst); SD(sd, rsrc, LSIZE); F__SZ_;
                     
                     }
@@ -8213,11 +8228,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_65:
                     {
                       /** 1111 1100 1001 00sd rsrc rdst        fdiv    %1%S1, %0 */
-#line 829 "rx-decode.opc"
+#line 844 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 829 "rx-decode.opc"
+#line 844 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 829 "rx-decode.opc"
+#line 844 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8229,7 +8244,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fdiv     %1%S1, %0");
-#line 829 "rx-decode.opc"
+#line 844 "rx-decode.opc"
                       ID(fdiv); DR(rdst); SD(sd, rsrc, LSIZE); F__SZ_;
                     
                     }
@@ -8271,11 +8286,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_66:
                     {
                       /** 1111 1100 1001 01sd rsrc rdst        ftoi    %1%S1, %0 */
-#line 817 "rx-decode.opc"
+#line 832 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 817 "rx-decode.opc"
+#line 832 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 817 "rx-decode.opc"
+#line 832 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8287,7 +8302,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("ftoi     %1%S1, %0");
-#line 817 "rx-decode.opc"
+#line 832 "rx-decode.opc"
                       ID(ftoi); DR(rdst); SD(sd, rsrc, LSIZE); F__SZ_;
                     
                     }
@@ -8329,11 +8344,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_67:
                     {
                       /** 1111 1100 1001 10sd rsrc rdst        round   %1%S1, %0 */
-#line 832 "rx-decode.opc"
+#line 847 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 832 "rx-decode.opc"
+#line 847 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 832 "rx-decode.opc"
+#line 847 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8345,7 +8360,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("round    %1%S1, %0");
-#line 832 "rx-decode.opc"
+#line 847 "rx-decode.opc"
                       ID(round); DR(rdst); SD(sd, rsrc, LSIZE); F__SZ_;
                     
                     }
@@ -8387,13 +8402,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_68:
                     {
                       /** 1111 1100 1101 sz sd rdst cond       sc%1%s  %0 */
-#line 941 "rx-decode.opc"
+#line 956 "rx-decode.opc"
                       int sz AU = (op[1] >> 2) & 0x03;
-#line 941 "rx-decode.opc"
+#line 956 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 941 "rx-decode.opc"
+#line 956 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
-#line 941 "rx-decode.opc"
+#line 956 "rx-decode.opc"
                       int cond AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8406,7 +8421,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  cond = 0x%x\n", cond);
                         }
                       SYNTAX("sc%1%s   %0");
-#line 941 "rx-decode.opc"
+#line 956 "rx-decode.opc"
                       ID(sccnd); BWL(sz); DD (sd, rdst, sz); Scc(cond);
                     
                     }
@@ -8534,13 +8549,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_69:
                     {
                       /** 1111 1100 111bit sd rdst cond        bm%2    #%1, %0%S0 */
-#line 884 "rx-decode.opc"
+#line 899 "rx-decode.opc"
                       int bit AU = (op[1] >> 2) & 0x07;
-#line 884 "rx-decode.opc"
+#line 899 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 884 "rx-decode.opc"
+#line 899 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
-#line 884 "rx-decode.opc"
+#line 899 "rx-decode.opc"
                       int cond AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -8553,7 +8568,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  cond = 0x%x\n", cond);
                         }
                       SYNTAX("bm%2     #%1, %0%S0");
-#line 884 "rx-decode.opc"
+#line 899 "rx-decode.opc"
                       ID(bmcc); BWL(BSIZE); S2cc(cond); SC(bit); DD(sd, rdst, BSIZE);
                     
                     }
@@ -8562,11 +8577,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_70:
                     {
                       /** 1111 1100 111bit sd rdst 1111        bnot    #%1, %0%S0 */
-#line 874 "rx-decode.opc"
+#line 889 "rx-decode.opc"
                       int bit AU = (op[1] >> 2) & 0x07;
-#line 874 "rx-decode.opc"
+#line 889 "rx-decode.opc"
                       int sd AU = op[1] & 0x03;
-#line 874 "rx-decode.opc"
+#line 889 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
                       if (trace)
                         {
@@ -8578,7 +8593,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("bnot     #%1, %0%S0");
-#line 874 "rx-decode.opc"
+#line 889 "rx-decode.opc"
                       ID(bnot); BWL(BSIZE); SC(bit); DD(sd, rdst, BSIZE);
                     
                     }
@@ -9405,9 +9420,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0000 0000 srca srcb        mulhi   %1, %2 */
-#line 757 "rx-decode.opc"
+#line 772 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 757 "rx-decode.opc"
+#line 772 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9418,7 +9433,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("mulhi    %1, %2");
-#line 757 "rx-decode.opc"
+#line 772 "rx-decode.opc"
                       ID(mulhi); SR(srca); S2R(srcb); F_____;
                     
                     }
@@ -9432,9 +9447,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0000 0001 srca srcb        mullo   %1, %2 */
-#line 760 "rx-decode.opc"
+#line 775 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 760 "rx-decode.opc"
+#line 775 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9445,7 +9460,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("mullo    %1, %2");
-#line 760 "rx-decode.opc"
+#line 775 "rx-decode.opc"
                       ID(mullo); SR(srca); S2R(srcb); F_____;
                     
                     }
@@ -9459,9 +9474,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0000 0100 srca srcb        machi   %1, %2 */
-#line 763 "rx-decode.opc"
+#line 778 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 763 "rx-decode.opc"
+#line 778 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9472,7 +9487,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("machi    %1, %2");
-#line 763 "rx-decode.opc"
+#line 778 "rx-decode.opc"
                       ID(machi); SR(srca); S2R(srcb); F_____;
                     
                     }
@@ -9486,9 +9501,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0000 0101 srca srcb        maclo   %1, %2 */
-#line 766 "rx-decode.opc"
+#line 781 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 766 "rx-decode.opc"
+#line 781 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9499,7 +9514,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("maclo    %1, %2");
-#line 766 "rx-decode.opc"
+#line 781 "rx-decode.opc"
                       ID(maclo); SR(srca); S2R(srcb); F_____;
                     
                     }
@@ -9513,7 +9528,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0001 0111 0000 rsrc        mvtachi %1 */
-#line 769 "rx-decode.opc"
+#line 784 "rx-decode.opc"
                       int rsrc AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9523,7 +9538,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rsrc = 0x%x\n", rsrc);
                         }
                       SYNTAX("mvtachi  %1");
-#line 769 "rx-decode.opc"
+#line 784 "rx-decode.opc"
                       ID(mvtachi); SR(rsrc); F_____;
                     
                     }
@@ -9531,7 +9546,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x10:
                     {
                       /** 1111 1101 0001 0111 0001 rsrc        mvtaclo %1 */
-#line 772 "rx-decode.opc"
+#line 787 "rx-decode.opc"
                       int rsrc AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9541,7 +9556,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rsrc = 0x%x\n", rsrc);
                         }
                       SYNTAX("mvtaclo  %1");
-#line 772 "rx-decode.opc"
+#line 787 "rx-decode.opc"
                       ID(mvtaclo); SR(rsrc); F_____;
                     
                     }
@@ -9556,7 +9571,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0001 1000 000i 0000        racw    #%1 */
-#line 784 "rx-decode.opc"
+#line 799 "rx-decode.opc"
                       int i AU = (op[2] >> 4) & 0x01;
                       if (trace)
                         {
@@ -9566,7 +9581,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  i = 0x%x\n", i);
                         }
                       SYNTAX("racw     #%1");
-#line 784 "rx-decode.opc"
+#line 799 "rx-decode.opc"
                       ID(racw); SC(i+1); F_____;
                     
                     /*----------------------------------------------------------------------*/
@@ -9584,7 +9599,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0001 1111 0000 rdst        mvfachi %0 */
-#line 775 "rx-decode.opc"
+#line 790 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9594,7 +9609,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mvfachi  %0");
-#line 775 "rx-decode.opc"
+#line 790 "rx-decode.opc"
                       ID(mvfachi); DR(rdst); F_____;
                     
                     }
@@ -9602,7 +9617,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x10:
                     {
                       /** 1111 1101 0001 1111 0001 rdst        mvfaclo %0 */
-#line 781 "rx-decode.opc"
+#line 796 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9612,7 +9627,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mvfaclo  %0");
-#line 781 "rx-decode.opc"
+#line 796 "rx-decode.opc"
                       ID(mvfaclo); DR(rdst); F_____;
                     
                     }
@@ -9620,7 +9635,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x20:
                     {
                       /** 1111 1101 0001 1111 0010 rdst        mvfacmi %0 */
-#line 778 "rx-decode.opc"
+#line 793 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9630,7 +9645,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mvfacmi  %0");
-#line 778 "rx-decode.opc"
+#line 793 "rx-decode.opc"
                       ID(mvfacmi); DR(rdst); F_____;
                     
                     }
@@ -9646,13 +9661,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_71:
                     {
                       /** 1111 1101 0010 0p sz rdst rsrc       mov%s   %1, %0 */
-#line 299 "rx-decode.opc"
+#line 307 "rx-decode.opc"
                       int p AU = (op[1] >> 2) & 0x01;
-#line 299 "rx-decode.opc"
+#line 307 "rx-decode.opc"
                       int sz AU = op[1] & 0x03;
-#line 299 "rx-decode.opc"
+#line 307 "rx-decode.opc"
                       int rdst AU = (op[2] >> 4) & 0x0f;
-#line 299 "rx-decode.opc"
+#line 307 "rx-decode.opc"
                       int rsrc AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9665,7 +9680,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rsrc = 0x%x\n", rsrc);
                         }
                       SYNTAX("mov%s    %1, %0");
-#line 299 "rx-decode.opc"
+#line 307 "rx-decode.opc"
                       ID(mov); sBWL (sz); SR(rsrc); F_____;
                       OP(0, p ? RX_Operand_Predec : RX_Operand_Postinc, rdst, 0);
                     
@@ -9726,13 +9741,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_72:
                     {
                       /** 1111 1101 0010 1p sz rsrc rdst       mov%s   %1, %0 */
-#line 303 "rx-decode.opc"
+#line 311 "rx-decode.opc"
                       int p AU = (op[1] >> 2) & 0x01;
-#line 303 "rx-decode.opc"
+#line 311 "rx-decode.opc"
                       int sz AU = op[1] & 0x03;
-#line 303 "rx-decode.opc"
+#line 311 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 303 "rx-decode.opc"
+#line 311 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9745,7 +9760,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mov%s    %1, %0");
-#line 303 "rx-decode.opc"
+#line 311 "rx-decode.opc"
                       ID(mov); sBWL (sz); DR(rdst); F_____;
                       OP(1, p ? RX_Operand_Predec : RX_Operand_Postinc, rsrc, 0);
                     
@@ -9806,13 +9821,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_73:
                     {
                       /** 1111 1101 0011 1p sz rsrc rdst       movu%s  %1, %0 */
-#line 313 "rx-decode.opc"
+#line 321 "rx-decode.opc"
                       int p AU = (op[1] >> 2) & 0x01;
-#line 313 "rx-decode.opc"
+#line 321 "rx-decode.opc"
                       int sz AU = op[1] & 0x03;
-#line 313 "rx-decode.opc"
+#line 321 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 313 "rx-decode.opc"
+#line 321 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9825,7 +9840,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("movu%s   %1, %0");
-#line 313 "rx-decode.opc"
+#line 321 "rx-decode.opc"
                       ID(mov); uBWL (sz); DR(rdst); F_____;
                        OP(1, p ? RX_Operand_Predec : RX_Operand_Postinc, rsrc, 0);
                     
@@ -9888,9 +9903,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0110 0000 rsrc rdst        shlr    %2, %0 */
-#line 638 "rx-decode.opc"
+#line 653 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 638 "rx-decode.opc"
+#line 653 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9901,7 +9916,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("shlr     %2, %0");
-#line 638 "rx-decode.opc"
+#line 653 "rx-decode.opc"
                       ID(shlr); S2R(rsrc); SR(rdst); DR(rdst); F__SZC;
                     
                     }
@@ -9915,9 +9930,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0110 0001 rsrc rdst        shar    %2, %0 */
-#line 628 "rx-decode.opc"
+#line 643 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 628 "rx-decode.opc"
+#line 643 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9928,7 +9943,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("shar     %2, %0");
-#line 628 "rx-decode.opc"
+#line 643 "rx-decode.opc"
                       ID(shar); S2R(rsrc); SR(rdst); DR(rdst); F_0SZC;
                     
                     }
@@ -9942,9 +9957,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0110 0010 rsrc rdst        shll    %2, %0 */
-#line 618 "rx-decode.opc"
+#line 633 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 618 "rx-decode.opc"
+#line 633 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9955,7 +9970,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("shll     %2, %0");
-#line 618 "rx-decode.opc"
+#line 633 "rx-decode.opc"
                       ID(shll); S2R(rsrc); SR(rdst); DR(rdst); F_OSZC;
                     
                     }
@@ -9969,9 +9984,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0110 0100 rsrc rdst        rotr    %1, %0 */
-#line 662 "rx-decode.opc"
+#line 677 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 662 "rx-decode.opc"
+#line 677 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -9982,7 +9997,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("rotr     %1, %0");
-#line 662 "rx-decode.opc"
+#line 677 "rx-decode.opc"
                       ID(rotr); SR(rsrc); DR(rdst); F__SZC;
                     
                     }
@@ -9996,9 +10011,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0110 0101 rsrc rdst        revw    %1, %0 */
-#line 665 "rx-decode.opc"
+#line 680 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 665 "rx-decode.opc"
+#line 680 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10009,7 +10024,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("revw     %1, %0");
-#line 665 "rx-decode.opc"
+#line 680 "rx-decode.opc"
                       ID(revw); SR(rsrc); DR(rdst);
                     
                     }
@@ -10023,9 +10038,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0110 0110 rsrc rdst        rotl    %1, %0 */
-#line 656 "rx-decode.opc"
+#line 671 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 656 "rx-decode.opc"
+#line 671 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10036,7 +10051,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("rotl     %1, %0");
-#line 656 "rx-decode.opc"
+#line 671 "rx-decode.opc"
                       ID(rotl); SR(rsrc); DR(rdst); F__SZC;
                     
                     }
@@ -10050,9 +10065,9 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0110 0111 rsrc rdst        revl    %1, %0 */
-#line 668 "rx-decode.opc"
+#line 683 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 668 "rx-decode.opc"
+#line 683 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10063,7 +10078,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("revl     %1, %0");
-#line 668 "rx-decode.opc"
+#line 683 "rx-decode.opc"
                       ID(revl); SR(rsrc); DR(rdst);
                     
                     /*----------------------------------------------------------------------*/
@@ -10081,11 +10096,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_74:
                     {
                       /** 1111 1101 0110 100c rsrc rdst        mvtc    %1, %0 */
-#line 911 "rx-decode.opc"
+#line 926 "rx-decode.opc"
                       int c AU = op[1] & 0x01;
-#line 911 "rx-decode.opc"
+#line 926 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 911 "rx-decode.opc"
+#line 926 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10097,7 +10112,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mvtc     %1, %0");
-#line 911 "rx-decode.opc"
+#line 926 "rx-decode.opc"
                       ID(mov); SR(rsrc); DR(c*16+rdst + 16);
                     
                     }
@@ -10121,11 +10136,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_75:
                     {
                       /** 1111 1101 0110 101s rsrc rdst        mvfc    %1, %0 */
-#line 914 "rx-decode.opc"
+#line 929 "rx-decode.opc"
                       int s AU = op[1] & 0x01;
-#line 914 "rx-decode.opc"
+#line 929 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 914 "rx-decode.opc"
+#line 929 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10137,7 +10152,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mvfc     %1, %0");
-#line 914 "rx-decode.opc"
+#line 929 "rx-decode.opc"
                       ID(mov); SR((s*16+rsrc) + 16); DR(rdst);
                     
                     /*----------------------------------------------------------------------*/
@@ -10164,11 +10179,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_76:
                     {
                       /** 1111 1101 0110 110i mmmm rdst        rotr    #%1, %0 */
-#line 659 "rx-decode.opc"
+#line 674 "rx-decode.opc"
                       int i AU = op[1] & 0x01;
-#line 659 "rx-decode.opc"
+#line 674 "rx-decode.opc"
                       int mmmm AU = (op[2] >> 4) & 0x0f;
-#line 659 "rx-decode.opc"
+#line 674 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10180,7 +10195,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("rotr     #%1, %0");
-#line 659 "rx-decode.opc"
+#line 674 "rx-decode.opc"
                       ID(rotr); SC(i*16+mmmm); DR(rdst); F__SZC;
                     
                     }
@@ -10204,11 +10219,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_77:
                     {
                       /** 1111 1101 0110 111i mmmm rdst        rotl    #%1, %0 */
-#line 653 "rx-decode.opc"
+#line 668 "rx-decode.opc"
                       int i AU = op[1] & 0x01;
-#line 653 "rx-decode.opc"
+#line 668 "rx-decode.opc"
                       int mmmm AU = (op[2] >> 4) & 0x0f;
-#line 653 "rx-decode.opc"
+#line 668 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10220,7 +10235,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("rotl     #%1, %0");
-#line 653 "rx-decode.opc"
+#line 668 "rx-decode.opc"
                       ID(rotl); SC(i*16+mmmm); DR(rdst); F__SZC;
                     
                     }
@@ -10244,9 +10259,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_78:
                     {
                       /** 1111 1101 0111 im00 0010rdst adc     #%1, %0 */
-#line 443 "rx-decode.opc"
+#line 451 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 443 "rx-decode.opc"
+#line 451 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10257,7 +10272,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("adc      #%1, %0");
-#line 443 "rx-decode.opc"
+#line 451 "rx-decode.opc"
                       ID(adc); SC(IMMex(im)); DR(rdst); F_OSZC;
                     
                     }
@@ -10266,9 +10281,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_79:
                     {
                       /** 1111 1101 0111 im00 0100rdst max     #%1, %0 */
-#line 525 "rx-decode.opc"
+#line 533 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 525 "rx-decode.opc"
+#line 533 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10279,7 +10294,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("max      #%1, %0");
-#line 525 "rx-decode.opc"
+#line 533 "rx-decode.opc"
                       ID(max); DR(rdst); SC(IMMex(im));
                     
                     }
@@ -10288,9 +10303,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_80:
                     {
                       /** 1111 1101 0111 im00 0101rdst min     #%1, %0 */
-#line 537 "rx-decode.opc"
+#line 552 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 537 "rx-decode.opc"
+#line 552 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10301,7 +10316,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("min      #%1, %0");
-#line 537 "rx-decode.opc"
+#line 552 "rx-decode.opc"
                       ID(min); DR(rdst); SC(IMMex(im));
                     
                     }
@@ -10310,9 +10325,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_81:
                     {
                       /** 1111 1101 0111 im00 0110rdst emul    #%1, %0 */
-#line 567 "rx-decode.opc"
+#line 582 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 567 "rx-decode.opc"
+#line 582 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10323,7 +10338,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("emul     #%1, %0");
-#line 567 "rx-decode.opc"
+#line 582 "rx-decode.opc"
                       ID(emul); DR(rdst); SC(IMMex(im));
                     
                     }
@@ -10332,9 +10347,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_82:
                     {
                       /** 1111 1101 0111 im00 0111rdst emulu   #%1, %0 */
-#line 579 "rx-decode.opc"
+#line 594 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 579 "rx-decode.opc"
+#line 594 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10345,7 +10360,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("emulu    #%1, %0");
-#line 579 "rx-decode.opc"
+#line 594 "rx-decode.opc"
                       ID(emulu); DR(rdst); SC(IMMex(im));
                     
                     }
@@ -10354,9 +10369,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_83:
                     {
                       /** 1111 1101 0111 im00 1000rdst div     #%1, %0 */
-#line 591 "rx-decode.opc"
+#line 606 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 591 "rx-decode.opc"
+#line 606 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10367,7 +10382,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("div      #%1, %0");
-#line 591 "rx-decode.opc"
+#line 606 "rx-decode.opc"
                       ID(div); DR(rdst); SC(IMMex(im)); F_O___;
                     
                     }
@@ -10376,9 +10391,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_84:
                     {
                       /** 1111 1101 0111 im00 1001rdst divu    #%1, %0 */
-#line 603 "rx-decode.opc"
+#line 618 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 603 "rx-decode.opc"
+#line 618 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10389,7 +10404,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("divu     #%1, %0");
-#line 603 "rx-decode.opc"
+#line 618 "rx-decode.opc"
                       ID(divu); DR(rdst); SC(IMMex(im)); F_O___;
                     
                     }
@@ -10398,9 +10413,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_85:
                     {
                       /** 1111 1101 0111 im00 1100rdst tst     #%1, %2 */
-#line 422 "rx-decode.opc"
+#line 430 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 422 "rx-decode.opc"
+#line 430 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10411,7 +10426,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("tst      #%1, %2");
-#line 422 "rx-decode.opc"
+#line 430 "rx-decode.opc"
                       ID(and); SC(IMMex(im)); S2R(rdst); F__SZ_;
                     
                     }
@@ -10420,9 +10435,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_86:
                     {
                       /** 1111 1101 0111 im00 1101rdst xor     #%1, %0 */
-#line 401 "rx-decode.opc"
+#line 409 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 401 "rx-decode.opc"
+#line 409 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10433,7 +10448,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("xor      #%1, %0");
-#line 401 "rx-decode.opc"
+#line 409 "rx-decode.opc"
                       ID(xor); SC(IMMex(im)); DR(rdst); F__SZ_;
                     
                     }
@@ -10442,9 +10457,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_87:
                     {
                       /** 1111 1101 0111 im00 1110rdst stz     #%1, %0 */
-#line 347 "rx-decode.opc"
+#line 355 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 347 "rx-decode.opc"
+#line 355 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10455,7 +10470,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("stz      #%1, %0");
-#line 347 "rx-decode.opc"
+#line 355 "rx-decode.opc"
                       ID(stcc); SC(IMMex(im)); DR(rdst); S2cc(RXC_z);
                     
                     }
@@ -10464,9 +10479,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_88:
                     {
                       /** 1111 1101 0111 im00 1111rdst stnz    #%1, %0 */
-#line 350 "rx-decode.opc"
+#line 358 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 350 "rx-decode.opc"
+#line 358 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10477,7 +10492,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("stnz     #%1, %0");
-#line 350 "rx-decode.opc"
+#line 358 "rx-decode.opc"
                       ID(stcc); SC(IMMex(im)); DR(rdst); S2cc(RXC_nz);
                     
                     /*----------------------------------------------------------------------*/
@@ -10495,7 +10510,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x00:
                     {
                       /** 1111 1101 0111 0010 0000 rdst        fsub    #%1, %0 */
-#line 811 "rx-decode.opc"
+#line 826 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10505,7 +10520,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fsub     #%1, %0");
-#line 811 "rx-decode.opc"
+#line 826 "rx-decode.opc"
                       ID(fsub); DR(rdst); SC(IMM(0)); F__SZ_;
                     
                     }
@@ -10513,7 +10528,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x10:
                     {
                       /** 1111 1101 0111 0010 0001 rdst        fcmp    #%1, %0 */
-#line 805 "rx-decode.opc"
+#line 820 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10523,7 +10538,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fcmp     #%1, %0");
-#line 805 "rx-decode.opc"
+#line 820 "rx-decode.opc"
                       ID(fcmp); DR(rdst); SC(IMM(0)); F_OSZ_;
                     
                     }
@@ -10531,7 +10546,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x20:
                     {
                       /** 1111 1101 0111 0010 0010 rdst        fadd    #%1, %0 */
-#line 799 "rx-decode.opc"
+#line 814 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10541,7 +10556,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fadd     #%1, %0");
-#line 799 "rx-decode.opc"
+#line 814 "rx-decode.opc"
                       ID(fadd); DR(rdst); SC(IMM(0)); F__SZ_;
                     
                     }
@@ -10549,7 +10564,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x30:
                     {
                       /** 1111 1101 0111 0010 0011 rdst        fmul    #%1, %0 */
-#line 820 "rx-decode.opc"
+#line 835 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10559,7 +10574,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fmul     #%1, %0");
-#line 820 "rx-decode.opc"
+#line 835 "rx-decode.opc"
                       ID(fmul); DR(rdst); SC(IMM(0)); F__SZ_;
                     
                     }
@@ -10567,7 +10582,7 @@ rx_decode_opcode (unsigned long pc AU,
                 case 0x40:
                     {
                       /** 1111 1101 0111 0010 0100 rdst        fdiv    #%1, %0 */
-#line 826 "rx-decode.opc"
+#line 841 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10577,7 +10592,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("fdiv     #%1, %0");
-#line 826 "rx-decode.opc"
+#line 841 "rx-decode.opc"
                       ID(fdiv); DR(rdst); SC(IMM(0)); F__SZ_;
                     
                     }
@@ -10593,9 +10608,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_89:
                     {
                       /** 1111 1101 0111 im11 000crdst mvtc    #%1, %0 */
-#line 908 "rx-decode.opc"
+#line 923 "rx-decode.opc"
                       int im AU = (op[1] >> 2) & 0x03;
-#line 908 "rx-decode.opc"
+#line 923 "rx-decode.opc"
                       int crdst AU = op[2] & 0x1f;
                       if (trace)
                         {
@@ -10606,7 +10621,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  crdst = 0x%x\n", crdst);
                         }
                       SYNTAX("mvtc     #%1, %0");
-#line 908 "rx-decode.opc"
+#line 923 "rx-decode.opc"
                       ID(mov); SC(IMMex(im)); DR(crdst + 16);
                     
                     }
@@ -10772,11 +10787,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_90:
                     {
                       /** 1111 1101 100immmm rsrc rdst shlr    #%2, %1, %0 */
-#line 641 "rx-decode.opc"
+#line 656 "rx-decode.opc"
                       int immmm AU = op[1] & 0x1f;
-#line 641 "rx-decode.opc"
+#line 656 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 641 "rx-decode.opc"
+#line 656 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -10788,7 +10803,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("shlr     #%2, %1, %0");
-#line 641 "rx-decode.opc"
+#line 656 "rx-decode.opc"
                       ID(shlr); S2C(immmm); SR(rsrc); DR(rdst); F__SZC;
                     
                     /*----------------------------------------------------------------------*/
@@ -11085,11 +11100,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_91:
                     {
                       /** 1111 1101 101immmm rsrc rdst shar    #%2, %1, %0 */
-#line 631 "rx-decode.opc"
+#line 646 "rx-decode.opc"
                       int immmm AU = op[1] & 0x1f;
-#line 631 "rx-decode.opc"
+#line 646 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 631 "rx-decode.opc"
+#line 646 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -11101,7 +11116,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("shar     #%2, %1, %0");
-#line 631 "rx-decode.opc"
+#line 646 "rx-decode.opc"
                       ID(shar); S2C(immmm); SR(rsrc); DR(rdst); F_0SZC;
                     
                     
@@ -11396,11 +11411,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_92:
                     {
                       /** 1111 1101 110immmm rsrc rdst shll    #%2, %1, %0 */
-#line 621 "rx-decode.opc"
+#line 636 "rx-decode.opc"
                       int immmm AU = op[1] & 0x1f;
-#line 621 "rx-decode.opc"
+#line 636 "rx-decode.opc"
                       int rsrc AU = (op[2] >> 4) & 0x0f;
-#line 621 "rx-decode.opc"
+#line 636 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -11412,7 +11427,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("shll     #%2, %1, %0");
-#line 621 "rx-decode.opc"
+#line 636 "rx-decode.opc"
                       ID(shll); S2C(immmm); SR(rsrc); DR(rdst); F_OSZC;
                     
                     
@@ -11721,11 +11736,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_93:
                     {
                       /** 1111 1101 111 bittt cond rdst        bm%2    #%1, %0%S0 */
-#line 887 "rx-decode.opc"
+#line 902 "rx-decode.opc"
                       int bittt AU = op[1] & 0x1f;
-#line 887 "rx-decode.opc"
+#line 902 "rx-decode.opc"
                       int cond AU = (op[2] >> 4) & 0x0f;
-#line 887 "rx-decode.opc"
+#line 902 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -11737,7 +11752,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("bm%2     #%1, %0%S0");
-#line 887 "rx-decode.opc"
+#line 902 "rx-decode.opc"
                       ID(bmcc); BWL(LSIZE); S2cc(cond); SC(bittt); DR(rdst);
                     
                     /*----------------------------------------------------------------------*/
@@ -11749,9 +11764,9 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_94:
                     {
                       /** 1111 1101 111bittt 1111 rdst bnot    #%1, %0 */
-#line 880 "rx-decode.opc"
+#line 895 "rx-decode.opc"
                       int bittt AU = op[1] & 0x1f;
-#line 880 "rx-decode.opc"
+#line 895 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -11762,7 +11777,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("bnot     #%1, %0");
-#line 880 "rx-decode.opc"
+#line 895 "rx-decode.opc"
                       ID(bnot); BWL(LSIZE); SC(bittt); DR(rdst);
                     
                     
@@ -12591,13 +12606,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_95:
                     {
                       /** 1111 1110 00sz isrc bsrc rdst        mov%s   %0, [%1, %2] */
-#line 293 "rx-decode.opc"
+#line 301 "rx-decode.opc"
                       int sz AU = (op[1] >> 4) & 0x03;
-#line 293 "rx-decode.opc"
+#line 301 "rx-decode.opc"
                       int isrc AU = op[1] & 0x0f;
-#line 293 "rx-decode.opc"
+#line 301 "rx-decode.opc"
                       int bsrc AU = (op[2] >> 4) & 0x0f;
-#line 293 "rx-decode.opc"
+#line 301 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -12610,8 +12625,8 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mov%s    %0, [%1, %2]");
-#line 293 "rx-decode.opc"
-                      ID(movbir); sBWL(sz); DR(rdst); SR(isrc); S2R(bsrc); F_____;
+#line 301 "rx-decode.opc"
+                      ID(movbir); sBWL(sz); DR(rdst); SRR(isrc); S2R(bsrc); F_____;
                     
                     }
                   break;
@@ -13048,13 +13063,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_96:
                     {
                       /** 1111 1110 01sz isrc bsrc rdst        mov%s   [%1, %2], %0 */
-#line 290 "rx-decode.opc"
+#line 298 "rx-decode.opc"
                       int sz AU = (op[1] >> 4) & 0x03;
-#line 290 "rx-decode.opc"
+#line 298 "rx-decode.opc"
                       int isrc AU = op[1] & 0x0f;
-#line 290 "rx-decode.opc"
+#line 298 "rx-decode.opc"
                       int bsrc AU = (op[2] >> 4) & 0x0f;
-#line 290 "rx-decode.opc"
+#line 298 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -13067,8 +13082,8 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("mov%s    [%1, %2], %0");
-#line 290 "rx-decode.opc"
-                      ID(movbi); sBWL(sz); DR(rdst); SR(isrc); S2R(bsrc); F_____;
+#line 298 "rx-decode.opc"
+                      ID(movbi); sBWL(sz); DR(rdst); SRR(isrc); S2R(bsrc); F_____;
                     
                     }
                   break;
@@ -13505,13 +13520,13 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_97:
                     {
                       /** 1111 1110 11sz isrc bsrc rdst        movu%s  [%1, %2], %0 */
-#line 296 "rx-decode.opc"
+#line 304 "rx-decode.opc"
                       int sz AU = (op[1] >> 4) & 0x03;
-#line 296 "rx-decode.opc"
+#line 304 "rx-decode.opc"
                       int isrc AU = op[1] & 0x0f;
-#line 296 "rx-decode.opc"
+#line 304 "rx-decode.opc"
                       int bsrc AU = (op[2] >> 4) & 0x0f;
-#line 296 "rx-decode.opc"
+#line 304 "rx-decode.opc"
                       int rdst AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -13524,8 +13539,8 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  rdst = 0x%x\n", rdst);
                         }
                       SYNTAX("movu%s   [%1, %2], %0");
-#line 296 "rx-decode.opc"
-                      ID(movbi); uBWL(sz); DR(rdst); SR(isrc); S2R(bsrc); F_____;
+#line 304 "rx-decode.opc"
+                      ID(movbi); uBWL(sz); DR(rdst); SRR(isrc); S2R(bsrc); F_____;
                     
                     }
                   break;
@@ -13969,11 +13984,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_98:
                     {
                       /** 1111 1111 0000 rdst srca srcb        sub     %2, %1, %0 */
-#line 500 "rx-decode.opc"
+#line 508 "rx-decode.opc"
                       int rdst AU = op[1] & 0x0f;
-#line 500 "rx-decode.opc"
+#line 508 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 500 "rx-decode.opc"
+#line 508 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -13985,7 +14000,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("sub      %2, %1, %0");
-#line 500 "rx-decode.opc"
+#line 508 "rx-decode.opc"
                       ID(sub); DR(rdst); SR(srcb); S2R(srca); F_OSZC;
                     
                     /*----------------------------------------------------------------------*/
@@ -14138,11 +14153,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_99:
                     {
                       /** 1111 1111 0010 rdst srca srcb        add     %2, %1, %0 */
-#line 467 "rx-decode.opc"
+#line 475 "rx-decode.opc"
                       int rdst AU = op[1] & 0x0f;
-#line 467 "rx-decode.opc"
+#line 475 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 467 "rx-decode.opc"
+#line 475 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -14154,7 +14169,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("add      %2, %1, %0");
-#line 467 "rx-decode.opc"
+#line 475 "rx-decode.opc"
                       ID(add); DR(rdst); SR(srcb); S2R(srca); F_OSZC;
                     
                     /*----------------------------------------------------------------------*/
@@ -14307,11 +14322,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_100:
                     {
                       /** 1111 1111 0011 rdst srca srcb        mul     %2, %1, %0 */
-#line 561 "rx-decode.opc"
+#line 576 "rx-decode.opc"
                       int rdst AU = op[1] & 0x0f;
-#line 561 "rx-decode.opc"
+#line 576 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 561 "rx-decode.opc"
+#line 576 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -14323,7 +14338,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("mul      %2, %1, %0");
-#line 561 "rx-decode.opc"
+#line 576 "rx-decode.opc"
                       ID(mul); DR(rdst); SR(srcb); S2R(srca); F_____;
                     
                     /*----------------------------------------------------------------------*/
@@ -14476,11 +14491,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_101:
                     {
                       /** 1111 1111 0100 rdst srca srcb        and     %2, %1, %0 */
-#line 377 "rx-decode.opc"
+#line 385 "rx-decode.opc"
                       int rdst AU = op[1] & 0x0f;
-#line 377 "rx-decode.opc"
+#line 385 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 377 "rx-decode.opc"
+#line 385 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -14492,7 +14507,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("and      %2, %1, %0");
-#line 377 "rx-decode.opc"
+#line 385 "rx-decode.opc"
                       ID(and); DR(rdst); SR(srcb); S2R(srca); F__SZ_;
                     
                     /*----------------------------------------------------------------------*/
@@ -14645,11 +14660,11 @@ rx_decode_opcode (unsigned long pc AU,
                   op_semantics_102:
                     {
                       /** 1111 1111 0101 rdst srca srcb        or      %2, %1, %0 */
-#line 395 "rx-decode.opc"
+#line 403 "rx-decode.opc"
                       int rdst AU = op[1] & 0x0f;
-#line 395 "rx-decode.opc"
+#line 403 "rx-decode.opc"
                       int srca AU = (op[2] >> 4) & 0x0f;
-#line 395 "rx-decode.opc"
+#line 403 "rx-decode.opc"
                       int srcb AU = op[2] & 0x0f;
                       if (trace)
                         {
@@ -14661,7 +14676,7 @@ rx_decode_opcode (unsigned long pc AU,
                           printf ("  srcb = 0x%x\n", srcb);
                         }
                       SYNTAX("or       %2, %1, %0");
-#line 395 "rx-decode.opc"
+#line 403 "rx-decode.opc"
                       ID(or); DR(rdst); SR(srcb); S2R(srca); F__SZ_;
                     
                     /*----------------------------------------------------------------------*/
@@ -14811,7 +14826,7 @@ rx_decode_opcode (unsigned long pc AU,
       break;
     default: UNSUPPORTED(); break;
   }
-#line 944 "rx-decode.opc"
+#line 959 "rx-decode.opc"
 
   return rx->n_bytes;
 }

diff --git a/opcodes/rx-decode.opc b/opcodes/rx-decode.opc
index 8a126eb92c4bc6cb657c0f053fd735f4328cb956..0c89cb99a899b5e20d1fb4a419d5fb224846a9ee 100644 (file)
--- a/opcodes/rx-decode.opc
+++ b/opcodes/rx-decode.opc
@@ -89,6 +89,7 @@ static int dsp3map[] = { 8, 9, 10, 3, 4, 5, 6, 7 };
 
 #define SC(i)       OP (1, RX_Operand_Immediate, 0, i)
 #define SR(r)       OP (1, RX_Operand_Register,  r, 0)
+#define SRR(r)      OP (1, RX_Operand_TwoReg,  r, 0)
 #define SI(r,a)     OP (1, RX_Operand_Indirect,  r, a)
 #define SIs(r,a,s)  OP (1, RX_Operand_Indirect,  r, (a) * SCALE[s])
 #define SD(t,r,s)   rx_disp (1, t, r, bwl[s], ld);
@@ -270,14 +271,21 @@ rx_decode_opcode (unsigned long pc AU,
   ID(mov); sBWL (sz); DIs(dst, d*16+sppp, sz); SC(IMM(1)); F_____;
 
 /** 11sz sd ss rsrc rdst       mov%s   %1, %0 */
-  ID(mov); sBWL(sz); F_____;
-  if ((ss == 3) && (sd != 3))
+  if (ss == 3 && sz == 2 && rsrc == 0 && rdst == 0)
     {
-      SD(ss, rdst, sz); DD(sd, rsrc, sz);
+      ID(nop2);
     }
   else
     {
-      SD(ss, rsrc, sz); DD(sd, rdst, sz);
+      ID(mov); sBWL(sz); F_____;
+      if ((ss == 3) && (sd != 3))
+       {
+         SD(ss, rdst, sz); DD(sd, rsrc, sz);
+       }
+      else
+       {
+         SD(ss, rsrc, sz); DD(sd, rdst, sz);
+       }
     }
 
 /** 10sz 1dsp a src b dst      mov%s   %1, %0 */
@@ -287,13 +295,13 @@ rx_decode_opcode (unsigned long pc AU,
   ID(mov); sBWL(sz); DIs(dst, dsp*4+a*2+b, sz); SR(src); F_____;
 
 /** 1111 1110 01sz isrc bsrc rdst      mov%s   [%1, %2], %0 */
-  ID(movbi); sBWL(sz); DR(rdst); SR(isrc); S2R(bsrc); F_____;
+  ID(movbi); sBWL(sz); DR(rdst); SRR(isrc); S2R(bsrc); F_____;
 
 /** 1111 1110 00sz isrc bsrc rdst      mov%s   %0, [%1, %2] */
-  ID(movbir); sBWL(sz); DR(rdst); SR(isrc); S2R(bsrc); F_____;
+  ID(movbir); sBWL(sz); DR(rdst); SRR(isrc); S2R(bsrc); F_____;
 
 /** 1111 1110 11sz isrc bsrc rdst      movu%s  [%1, %2], %0 */
-  ID(movbi); uBWL(sz); DR(rdst); SR(isrc); S2R(bsrc); F_____;
+  ID(movbi); uBWL(sz); DR(rdst); SRR(isrc); S2R(bsrc); F_____;
 
 /** 1111 1101 0010 0p sz rdst rsrc     mov%s   %1, %0 */
   ID(mov); sBWL (sz); SR(rsrc); F_____;
@@ -525,7 +533,14 @@ rx_decode_opcode (unsigned long pc AU,
   ID(max); DR(rdst); SC(IMMex(im));
 
 /** 1111 1100 0001 00ss rsrc rdst      max     %1%S1, %0 */
-  ID(max); SP(ss, rsrc); DR(rdst);
+  if (ss == 3 && rsrc == 0 && rdst == 0)
+    {
+      ID(nop3);
+    }
+  else
+    {
+      ID(max); SP(ss, rsrc); DR(rdst);
+    }
 
 /** 0000 0110 mx10 00ss 0000 0100 rsrc rdst    max     %1%S1, %0 */
   ID(max); SPm(ss, rsrc, mx); DR(rdst);
@@ -681,23 +696,23 @@ rx_decode_opcode (unsigned long pc AU,
 
 
 /** 0000 1dsp                  bra.s   %a0 */
-  ID(branch); Scc(RXC_always); DC(pc + dsp3map[dsp]);
+  ID(branch); DC(pc + dsp3map[dsp]);
 
 /** 0010 1110                  bra.b   %a0 */
-  ID(branch); Scc(RXC_always); DC(pc + IMMex(1));
+  ID(branch); DC(pc + IMMex(1));
 
 /** 0011 1000                  bra.w   %a0 */
-  ID(branch); Scc(RXC_always); DC(pc + IMMex(2));
+  ID(branch); DC(pc + IMMex(2));
 
 /** 0000 0100                  bra.a   %a0 */
-  ID(branch); Scc(RXC_always); DC(pc + IMMex(3));
+  ID(branch); DC(pc + IMMex(3));
 
 /** 0111 1111 0100 rsrc                bra.l   %0 */
-  ID(branchrel); Scc(RXC_always); DR(rsrc);
+  ID(branchrel); DR(rsrc);
 
 
 /** 0111 1111 0000 rsrc                jmp     %0 */
-  ID(branch); Scc(RXC_always); DR(rsrc);
+  ID(branch); DR(rsrc);
 
 /** 0111 1111 0001 rsrc                jsr     %0 */
   ID(jsr); DR(rsrc);

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index ff3c808b19eddf7242af9f72c59881ea31c2cb9a..ec4372efdb576075903b359f72246bd0429e753b 100644 (file)
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,30 @@
+2010-07-29  DJ Delorie  <dj@redhat.com>
+
+       * rx.c (decode_cache_base): New.
+       (id_names): Remove ediv and edivu.
+       (optype_names): Add TwoReg.
+       (maybe_get_mem_page): New.
+       (rx_get_byte): Call it.
+       (get_op): Add TwoReg support.
+       (put_op): Likewise.
+       (PD, PS, PS2, GD, GS, GS2, DSZ, SSZ, S2SZ, US1, US2, OM): "opcode"
+       is a pointer now.
+       (DO_RETURN): New.  We use longjmp to return an exception result.
+       (decode_opcode): Make opcode a pointer to the decode cache.  Save
+       decoded opcode information and re-use.  Call DO_RETURN instead of
+       return throughout.  Remove ediv and edivu.
+       * mem.c (ptdc): New.  Adds decode cache.
+       (rx_mem_ptr): Support it.
+       (rx_mem_decode_cache): New.
+       * mem.h (enum mem_ptr_action): add MPA_DECODE_CACHE.
+       (rx_mem_decode_cache): Declare.
+       * gdb-if.c (sim_resume): Add decode_opcode's setjmp logic here...
+       * main.c (main): ...and here.  Use a fast loop if neither trace
+       nor disassemble is given.
+       * cpu.h (RX_MAKE_STEPPED, RX_MAKE_HIT_BREAK, RX_MAKE_EXITED,
+       RX_MAKE_STOPPED, RX_EXITED, RX_STOPPED): Adjust so that 0 is not a
+       valid code for anything.
+
 2010-07-27  DJ Delorie  <dj@redhat.com>
 
        * README.txt: New.

diff --git a/sim/rx/cpu.h b/sim/rx/cpu.h
index 74ab4b6043e29b98082ea21230e83127ec6cf5d0..37ca7f8cb4076cc00760a5be63bbfd751810bb17 100644 (file)
--- a/sim/rx/cpu.h
+++ b/sim/rx/cpu.h
@@ -211,16 +211,16 @@ int condition_true (int cond_id);
    - RX_MAKE_HIT_BREAK is the return code for hitting a breakpoint.
    - RX_MAKE_EXITED (C) is the return code for exiting with status C.
    - RX_MAKE_STOPPED (S) is the return code for stopping on signal S.  */
-#define RX_MAKE_STEPPED()   (0)
-#define RX_MAKE_HIT_BREAK() (1)
-#define RX_MAKE_EXITED(c)   (((int) (c) << 8) + 2)
-#define RX_MAKE_STOPPED(s)  (((int) (s) << 8) + 3)
+#define RX_MAKE_STEPPED()   (1)
+#define RX_MAKE_HIT_BREAK() (2)
+#define RX_MAKE_EXITED(c)   (((int) (c) << 8) + 3)
+#define RX_MAKE_STOPPED(s)  (((int) (s) << 8) + 4)
 
 #define RX_STEPPED(r)       ((r) == RX_MAKE_STEPPED ())
 #define RX_HIT_BREAK(r)     ((r) == RX_MAKE_HIT_BREAK ())
-#define RX_EXITED(r)        (((r) & 0xff) == 2)
+#define RX_EXITED(r)        (((r) & 0xff) == 3)
 #define RX_EXIT_STATUS(r)   ((r) >> 8)
-#define RX_STOPPED(r)       (((r) & 0xff) == 3)
+#define RX_STOPPED(r)       (((r) & 0xff) == 4)
 #define RX_STOP_SIG(r)      ((r) >> 8)
 
 /* The step result for the current step.  Global to allow

diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index 1f6fe955fa26648a7b28558971d5bf1d7f9d5a74..1fce257720487da3a22bd031e103657a73f9ff0d 100644 (file)
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -733,6 +733,8 @@ handle_step (int rc)
 void
 sim_resume (SIM_DESC sd, int step, int sig_to_deliver)
 {
+  int rc;
+
   check_desc (sd);
 
   if (sig_to_deliver != 0)
@@ -745,7 +747,12 @@ sim_resume (SIM_DESC sd, int step, int sig_to_deliver)
   execution_error_clear_last_error ();
 
   if (step)
-    handle_step (decode_opcode ());
+    {
+      rc = setjmp (decode_jmp_buf);
+      if (rc == 0)
+       rc = decode_opcode ();
+      handle_step (rc);
+    }
   else
     {
       /* We don't clear 'stop' here, because then we would miss
@@ -762,7 +769,9 @@ sim_resume (SIM_DESC sd, int step, int sig_to_deliver)
              break;
            }
 
-         int rc = decode_opcode ();
+         rc = setjmp (decode_jmp_buf);
+         if (rc == 0)
+           rc = decode_opcode ();
 
          if (execution_error_get_last_error () != SIM_ERR_NONE)
            {

diff --git a/sim/rx/main.c b/sim/rx/main.c
index 27ff0b83fcb86551305ca38f747dbcc465c28e8d..16bdf36d6d8809633a9bd440a066ca34e64cbae9 100644 (file)
--- a/sim/rx/main.c
+++ b/sim/rx/main.c
@@ -94,6 +94,7 @@ main (int argc, char **argv)
   int o;
   int save_trace;
   bfd *prog;
+  int rc;
 
   /* By default, we exit when an execution error occurs.  */
   execution_error_init_standalone ();
@@ -178,33 +179,50 @@ main (int argc, char **argv)
 
   sim_disasm_init (prog);
 
-  while (1)
-    {
-      int rc;
-
-      if (trace)
-       printf ("\n");
-
-      if (disassemble)
-       sim_disasm_one ();
+  enable_counting = verbose;
 
-      enable_counting = verbose;
-      rc = decode_opcode ();
-      enable_counting = 0;
+  rc = setjmp (decode_jmp_buf);
 
-      if (RX_HIT_BREAK (rc))
-       done (1);
-      else if (RX_EXITED (rc))
-       done (RX_EXIT_STATUS (rc));
-      else if (RX_STOPPED (rc))
+  if (rc == 0)
+    {
+      if (!trace && !disassemble)
        {
-         if (verbose)
-           printf("Stopped on signal %d\n", RX_STOP_SIG (rc));
-         exit(1);
+         /* This will longjmp to the above if an exception
+            happens.  */
+         for (;;)
+           decode_opcode ();
        }
       else
-       assert (RX_STEPPED (rc));
+       while (1)
+         {
+
+           if (trace)
+             printf ("\n");
 
-      trace_register_changes ();
+           if (disassemble)
+             {
+               enable_counting = 0;
+               sim_disasm_one ();
+               enable_counting = verbose;
+             }
+
+           rc = decode_opcode ();
+
+           if (trace)
+             trace_register_changes ();
+         }
+    }
+
+  if (RX_HIT_BREAK (rc))
+    done (1);
+  else if (RX_EXITED (rc))
+    done (RX_EXIT_STATUS (rc));
+  else if (RX_STOPPED (rc))
+    {
+      if (verbose)
+       printf("Stopped on signal %d\n", RX_STOP_SIG (rc));
+      exit(1);
     }
+  done (0);
+  exit (0);
 }

diff --git a/sim/rx/mem.c b/sim/rx/mem.c
index 3b7a7a27c3c669281f4f14f57cd827c5fe0eaefe..7405518e3aa2f5dc006dc28d99d3b5612554383a 100644 (file)
--- a/sim/rx/mem.c
+++ b/sim/rx/mem.c
@@ -30,6 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 #include <string.h>
 
+#include "opcode/rx.h"
 #include "mem.h"
 #include "cpu.h"
 #include "syscalls.h"
@@ -46,6 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 static unsigned char **pt[L1_LEN];
 static unsigned char **ptr[L1_LEN];
+static RX_Opcode_Decoded ***ptdc[L1_LEN];
 
 /* [ get=0/put=1 ][ byte size ] */
 static unsigned int mem_counters[2][5];
@@ -85,16 +87,16 @@ rx_mem_ptr (unsigned long address, enum mem_ptr_action action)
     {
       pt[pt1] = (unsigned char **) calloc (L2_LEN, sizeof (char **));
       ptr[pt1] = (unsigned char **) calloc (L2_LEN, sizeof (char **));
+      ptdc[pt1] = (RX_Opcode_Decoded ***) calloc (L2_LEN, sizeof (RX_Opcode_Decoded ***));
     }
   if (pt[pt1][pt2] == 0)
     {
       if (action == MPA_READING)
        execution_error (SIM_ERR_READ_UNWRITTEN_PAGES, address);
 
-      pt[pt1][pt2] = (unsigned char *) malloc (OFF_LEN);
-      memset (pt[pt1][pt2], 0, OFF_LEN);
-      ptr[pt1][pt2] = (unsigned char *) malloc (OFF_LEN);
-      memset (ptr[pt1][pt2], MC_UNINIT, OFF_LEN);
+      pt[pt1][pt2] = (unsigned char *) calloc (OFF_LEN, 1);
+      ptr[pt1][pt2] = (unsigned char *) calloc (OFF_LEN, 1);
+      ptdc[pt1][pt2] = (RX_Opcode_Decoded **) calloc (OFF_LEN, sizeof(RX_Opcode_Decoded *));
     }
   else if (action == MPA_READING
           && ptr[pt1][pt2][pto] == MC_UNINIT)
@@ -105,14 +107,28 @@ rx_mem_ptr (unsigned long address, enum mem_ptr_action action)
       if (ptr[pt1][pt2][pto] == MC_PUSHED_PC)
        execution_error (SIM_ERR_CORRUPT_STACK, address);
       ptr[pt1][pt2][pto] = MC_DATA;
+      if (ptdc[pt1][pt2][pto])
+       {
+         free (ptdc[pt1][pt2][pto]);
+         ptdc[pt1][pt2][pto] = NULL;
+       }
     }
 
   if (action == MPA_CONTENT_TYPE)
-    return ptr[pt1][pt2] + pto;
+    return (unsigned char *) (ptr[pt1][pt2] + pto);
+
+  if (action == MPA_DECODE_CACHE)
+    return (unsigned char *) (ptdc[pt1][pt2] + pto);
 
   return pt[pt1][pt2] + pto;
 }
 
+RX_Opcode_Decoded **
+rx_mem_decode_cache (unsigned long address)
+{
+  return (RX_Opcode_Decoded **) rx_mem_ptr (address, MPA_DECODE_CACHE);
+}
+
 static inline int
 is_reserved_address (unsigned int address)
 {
@@ -335,7 +351,9 @@ mem_put_qi (int address, unsigned char value)
   COUNT (1, 1);
 }
 
+#ifdef CYCLE_ACCURATE
 static int tpu_base;
+#endif
 
 void
 mem_put_hi (int address, unsigned short value)

diff --git a/sim/rx/mem.h b/sim/rx/mem.h
index 37740d5b95260255f73a3b68538179bb03f2287d..c562392731ec0db45fe840abdbcc97bba15aae3a 100644 (file)
--- a/sim/rx/mem.h
+++ b/sim/rx/mem.h
@@ -29,7 +29,8 @@ enum mem_ptr_action
 {
   MPA_WRITING,
   MPA_READING,
-  MPA_CONTENT_TYPE
+  MPA_CONTENT_TYPE,
+  MPA_DECODE_CACHE
 };
 
 void init_mem (void);
@@ -43,6 +44,9 @@ unsigned long mem_usage_cycles (void);
 #define NONPAGE_MASK (~(PAGE_SIZE-1))
 
 unsigned char *rx_mem_ptr (unsigned long address, enum mem_ptr_action action);
+#ifdef RXC_never
+RX_Opcode_Decoded **rx_mem_decode_cache (unsigned long address);
+#endif
 
 void mem_put_qi (int address, unsigned char value);
 void mem_put_hi (int address, unsigned short value);

diff --git a/sim/rx/rx.c b/sim/rx/rx.c
index a6503de8036df56a382867776251159ac7e952e1..1deef91656b0f67ce8c01c534ade0014075e51b7 100644 (file)
--- a/sim/rx/rx.c
+++ b/sim/rx/rx.c
@@ -65,8 +65,6 @@ static const char * id_names[] = {
   "RXO_min",   /* d = min(d,s) */
   "RXO_emul",  /* d:64 = d:32 * s */
   "RXO_emulu", /* d:64 = d:32 * s (unsigned) */
-  "RXO_ediv",  /* d:64 / s; d = quot, d+1 = rem */
-  "RXO_edivu", /* d:64 / s; d = quot, d+1 = rem */
 
   "RXO_rolc",  /* d <<= 1 through carry */
   "RXO_rorc",  /* d >>= 1 through carry*/
@@ -145,7 +143,8 @@ static const char * optype_names[] = {
   "Ps++",      /* [Rn+] */
   "--Pr",      /* [-Rn] */
   " cc ",      /* eq, gtu, etc */
-  "Flag"       /* [UIOSZC] */
+  "Flag",      /* [UIOSZC] */
+  "RbRi"       /* [Rb + scale * Ri] */
 };
 
 #define N_RXO (sizeof(id_names)/sizeof(id_names[0]))
@@ -296,8 +295,20 @@ _rx_abort (const char *file, int line)
 }
 
 static unsigned char *get_byte_base;
+static RX_Opcode_Decoded **decode_cache_base;
 static SI get_byte_page;
 
+static inline void
+maybe_get_mem_page (SI tpc)
+{
+  if (((tpc ^ get_byte_page) & NONPAGE_MASK) || enable_counting)
+    {
+      get_byte_page = tpc & NONPAGE_MASK;
+      get_byte_base = rx_mem_ptr (get_byte_page, MPA_READING) - get_byte_page;
+      decode_cache_base = rx_mem_decode_cache (get_byte_page) - get_byte_page;
+    }
+}
+
 /* This gets called a *lot* so optimize it.  */
 static int
 rx_get_byte (void *vdata)
@@ -309,20 +320,16 @@ rx_get_byte (void *vdata)
   if (rx_big_endian)
     tpc ^= 3;
 
-  if (((tpc ^ get_byte_page) & NONPAGE_MASK) || enable_counting)
-    {
-      get_byte_page = tpc & NONPAGE_MASK;
-      get_byte_base = rx_mem_ptr (get_byte_page, MPA_READING) - get_byte_page;
-    }
+  maybe_get_mem_page (tpc);
 
   rx_data->dpc ++;
   return get_byte_base [tpc];
 }
 
 static int
-get_op (RX_Opcode_Decoded *rd, int i)
+get_op (const RX_Opcode_Decoded *rd, int i)
 {
-  RX_Opcode_Operand *o = rd->op + i;
+  const RX_Opcode_Operand *o = rd->op + i;
   int addr, rv = 0;
 
   switch (o->type)
@@ -343,8 +350,11 @@ get_op (RX_Opcode_Decoded *rd, int i)
       /* fall through */
     case RX_Operand_Postinc:   /* [Rn+] */
     case RX_Operand_Indirect:  /* [Rn + addend] */
+    case RX_Operand_TwoReg:    /* [Rn + scale * R2] */
 #ifdef CYCLE_ACCURATE
       RL (o->reg);
+      if (o->type == RX_Operand_TwoReg)
+       RL (rd->op[2].reg);
       regs.rt = -1;
       if (regs.m2m == M2M_BOTH)
        {
@@ -359,7 +369,11 @@ get_op (RX_Opcode_Decoded *rd, int i)
       memory_source = 1;
 #endif
 
-      addr = get_reg (o->reg) + o->addend;
+      if (o->type == RX_Operand_TwoReg)
+       addr = get_reg (o->reg) * size2bytes[rd->size] + get_reg (rd->op[2].reg);
+      else
+       addr = get_reg (o->reg) + o->addend;
+
       switch (o->size)
        {
        case RX_AnySize:
@@ -440,9 +454,9 @@ get_op (RX_Opcode_Decoded *rd, int i)
 }
 
 static void
-put_op (RX_Opcode_Decoded *rd, int i, int v)
+put_op (const RX_Opcode_Decoded *rd, int i, int v)
 {
-  RX_Opcode_Operand *o = rd->op + i;
+  const RX_Opcode_Operand *o = rd->op + i;
   int addr;
 
   switch (o->size)
@@ -504,6 +518,7 @@ put_op (RX_Opcode_Decoded *rd, int i, int v)
       /* fall through */
     case RX_Operand_Postinc:   /* [Rn+] */
     case RX_Operand_Indirect:  /* [Rn + addend] */
+    case RX_Operand_TwoReg:    /* [Rn + scale * R2] */
 
 #ifdef CYCLE_ACCURATE
       if (regs.m2m == M2M_BOTH)
@@ -518,7 +533,11 @@ put_op (RX_Opcode_Decoded *rd, int i, int v)
       memory_dest = 1;
 #endif
 
-      addr = get_reg (o->reg) + o->addend;
+      if (o->type == RX_Operand_TwoReg)
+       addr = get_reg (o->reg) * size2bytes[rd->size] + get_reg (rd->op[2].reg);
+      else
+       addr = get_reg (o->reg) + o->addend;
+
       switch (o->size)
        {
        case RX_AnySize:
@@ -559,19 +578,19 @@ put_op (RX_Opcode_Decoded *rd, int i, int v)
     }
 }
 
-#define PD(x) put_op (&opcode, 0, x)
-#define PS(x) put_op (&opcode, 1, x)
-#define PS2(x) put_op (&opcode, 2, x)
-#define GD() get_op (&opcode, 0)
-#define GS() get_op (&opcode, 1)
-#define GS2() get_op (&opcode, 2)
-#define DSZ() size2bytes[opcode.op[0].size]
-#define SSZ() size2bytes[opcode.op[0].size]
-#define S2SZ() size2bytes[opcode.op[0].size]
+#define PD(x) put_op (opcode, 0, x)
+#define PS(x) put_op (opcode, 1, x)
+#define PS2(x) put_op (opcode, 2, x)
+#define GD() get_op (opcode, 0)
+#define GS() get_op (opcode, 1)
+#define GS2() get_op (opcode, 2)
+#define DSZ() size2bytes[opcode->op[0].size]
+#define SSZ() size2bytes[opcode->op[0].size]
+#define S2SZ() size2bytes[opcode->op[0].size]
 
 /* "Universal" sources.  */
-#define US1() ((opcode.op[2].type == RX_Operand_None) ? GD() : GS())
-#define US2() ((opcode.op[2].type == RX_Operand_None) ? GS() : GS2())
+#define US1() ((opcode->op[2].type == RX_Operand_None) ? GD() : GS())
+#define US2() ((opcode->op[2].type == RX_Operand_None) ? GS() : GS2())
 
 static void
 push(int val)
@@ -828,7 +847,7 @@ do_fp_exception (unsigned long opcode_pc)
 }
 
 static int
-op_is_memory (RX_Opcode_Decoded *rd, int i)
+op_is_memory (const RX_Opcode_Decoded *rd, int i)
 {
   switch (rd->op[i].type)
     {
@@ -840,7 +859,9 @@ op_is_memory (RX_Opcode_Decoded *rd, int i)
       return 0;
     }
 }
-#define OM(i) op_is_memory (&opcode, i)
+#define OM(i) op_is_memory (opcode, i)
+
+#define DO_RETURN(x) { longjmp (decode_jmp_buf, x); }
 
 int
 decode_opcode ()
@@ -852,8 +873,7 @@ decode_opcode ()
   long long sll;
   unsigned long opcode_pc;
   RX_Data rx_data;
-  RX_Opcode_Decoded opcode;
-  int rv;
+  const RX_Opcode_Decoded *opcode;
 #ifdef CYCLE_STATS
   unsigned long long prev_cycle_count;
 #endif
@@ -861,9 +881,6 @@ decode_opcode ()
   int tx;
 #endif
 
-  if ((rv = setjmp (decode_jmp_buf)))
-    return rv;
-
 #ifdef CYCLE_STATS
   prev_cycle_count = regs.cycle_count;
 #endif
@@ -875,9 +892,25 @@ decode_opcode ()
 
   rx_cycles ++;
 
-  rx_data.dpc = opcode_pc = regs.r_pc;
-  memset (&opcode, 0, sizeof(opcode));
-  opcode_size = rx_decode_opcode (opcode_pc, &opcode, rx_get_byte, &rx_data);
+  maybe_get_mem_page (regs.r_pc);
+
+  opcode_pc = regs.r_pc;
+
+  /* Note that we don't word-swap this point, there's no point.  */
+  if (decode_cache_base[opcode_pc] == NULL)
+    {
+      RX_Opcode_Decoded *opcode_w;
+      rx_data.dpc = opcode_pc;
+      opcode_w = decode_cache_base[opcode_pc] = calloc (1, sizeof (RX_Opcode_Decoded));
+      opcode_size = rx_decode_opcode (opcode_pc, opcode_w,
+                                     rx_get_byte, &rx_data);
+      opcode = opcode_w;
+    }
+  else
+    {
+      opcode = decode_cache_base[opcode_pc];
+      opcode_size = opcode->n_bytes;
+    }
 
 #ifdef CYCLE_ACCURATE
   if (branch_alignment_penalty)
@@ -896,11 +929,11 @@ decode_opcode ()
 
   regs.r_pc += opcode_size;
 
-  rx_flagmask = opcode.flags_s;
-  rx_flagand = ~(int)opcode.flags_0;
-  rx_flagor = opcode.flags_1;
+  rx_flagmask = opcode->flags_s;
+  rx_flagand = ~(int)opcode->flags_0;
+  rx_flagor = opcode->flags_1;
 
-  switch (opcode.id)
+  switch (opcode->id)
     {
     case RXO_abs:
       sll = GS ();
@@ -928,7 +961,7 @@ decode_opcode ()
     case RXO_bclr:
       ma = GD ();
       mb = GS ();
-      if (opcode.op[0].type == RX_Operand_Register)
+      if (opcode->op[0].type == RX_Operand_Register)
        mb &= 0x1f;
       else
        mb &= 0x07;
@@ -940,7 +973,7 @@ decode_opcode ()
     case RXO_bmcc:
       ma = GD ();
       mb = GS ();
-      if (opcode.op[0].type == RX_Operand_Register)
+      if (opcode->op[0].type == RX_Operand_Register)
        mb &= 0x1f;
       else
        mb &= 0x07;
@@ -955,7 +988,7 @@ decode_opcode ()
     case RXO_bnot:
       ma = GD ();
       mb = GS ();
-      if (opcode.op[0].type == RX_Operand_Register)
+      if (opcode->op[0].type == RX_Operand_Register)
        mb &= 0x1f;
       else
        mb &= 0x07;
@@ -965,7 +998,7 @@ decode_opcode ()
       break;
 
     case RXO_branch:
-      if (GS())
+      if (opcode->op[1].type == RX_Operand_None || GS())
        {
 #ifdef CYCLE_ACCURATE
          SI old_pc = regs.r_pc;
@@ -987,9 +1020,6 @@ decode_opcode ()
            }
 #ifdef CYCLE_STATS
          branch_stalls ++;
-         /* This is just for statistics */
-         if (opcode.op[1].reg == 14)
-           opcode.op[1].type = RX_Operand_None;
 #endif
 #endif
        }
@@ -1032,11 +1062,11 @@ decode_opcode ()
       {
        int old_psw = regs.r_psw;
        if (rx_in_gdb)
-         return RX_MAKE_HIT_BREAK ();
+         DO_RETURN (RX_MAKE_HIT_BREAK ());
        if (regs.r_intb == 0)
          {
            tprintf("BREAK hit, no vector table.\n");
-           return RX_MAKE_EXITED(1);
+           DO_RETURN (RX_MAKE_EXITED(1));
          }
        regs.r_psw &= ~(FLAGBIT_I | FLAGBIT_U | FLAGBIT_PM);
        pushpc (old_psw);
@@ -1049,7 +1079,7 @@ decode_opcode ()
     case RXO_bset:
       ma = GD ();
       mb = GS ();
-      if (opcode.op[0].type == RX_Operand_Register)
+      if (opcode->op[0].type == RX_Operand_Register)
        mb &= 0x1f;
       else
        mb &= 0x07;
@@ -1061,7 +1091,7 @@ decode_opcode ()
     case RXO_btst:
       ma = GS ();
       mb = GS2 ();
-      if (opcode.op[1].type == RX_Operand_Register)
+      if (opcode->op[1].type == RX_Operand_Register)
        mb &= 0x1f;
       else
        mb &= 0x07;
@@ -1071,7 +1101,7 @@ decode_opcode ()
       break;
 
     case RXO_clrpsw:
-      v = 1 << opcode.op[0].reg;
+      v = 1 << opcode->op[0].reg;
       if (FLAG_PM
          && (v == FLAGBIT_I
              || v == FLAGBIT_U))
@@ -1120,60 +1150,13 @@ decode_opcode ()
       cycles (20);
       break;
 
-    case RXO_ediv:
-      ma = GS();
-      mb = GD();
-      tprintf("%d / %d = ", mb, ma);
-      if (ma == 0 || (ma == -1 && (unsigned int) mb == 0x80000000))
-       {
-         tprintf("#NAN\n");
-         set_flags (FLAGBIT_O, FLAGBIT_O);
-       }
-      else
-       {
-         v = mb/ma;
-         mb = mb%ma;
-         tprintf("%d, rem %d\n", v, mb);
-         set_flags (FLAGBIT_O, 0);
-         PD (v);
-         opcode.op[0].reg ++;
-         PD (mb);
-       }
-      /* Note: spec says 3 to 22 cycles, we are pessimistic.  */
-      cycles (22);
-      break;
-
-    case RXO_edivu:
-      uma = GS();
-      umb = GD();
-      tprintf("%u / %u = ", umb, uma);
-      if (uma == 0)
-       {
-         tprintf("#NAN\n");
-         set_flags (FLAGBIT_O, FLAGBIT_O);
-       }
-      else
-       {
-         v = umb/uma;
-         umb = umb%uma;
-         tprintf("%u, rem %u\n", v, umb);
-         set_flags (FLAGBIT_O, 0);
-         PD (v);
-         opcode.op[0].reg ++;
-         PD (umb);
-       }
-      /* Note: spec says 2 to 20 cycles, we are pessimistic.  */
-      cycles (20);
-      break;
-
     case RXO_emul:
       ma = GD ();
       mb = GS ();
       sll = (long long)ma * (long long)mb;
       tprintf("%d * %d = %lld\n", ma, mb, sll);
-      PD (sll);
-      opcode.op[0].reg ++;
-      PD (sll >> 32);
+      put_reg (opcode->op[0].reg, sll);
+      put_reg (opcode->op[0].reg + 1, sll >> 32);
       E2;
       break;
 
@@ -1182,9 +1165,8 @@ decode_opcode ()
       umb = GS ();
       ll = (long long)uma * (long long)umb;
       tprintf("%#x * %#x = %#llx\n", uma, umb, ll);
-      PD (ll);
-      opcode.op[0].reg ++;
-      PD (ll >> 32);
+      put_reg (opcode->op[0].reg, ll);
+      put_reg (opcode->op[0].reg + 1, ll >> 32);
       E2;
       break;
 
@@ -1242,7 +1224,7 @@ decode_opcode ()
       v = GS ();
       if (v == 255)
        {
-         return rx_syscall (regs.r[5]);
+         DO_RETURN (rx_syscall (regs.r[5]));
        }
       else
        {
@@ -1278,7 +1260,7 @@ decode_opcode ()
        regs.link_register = regs.r_pc;
 #endif
        pushpc (get_reg (pc));
-       if (opcode.id == RXO_jsrrel)
+       if (opcode->id == RXO_jsrrel)
          v += regs.r_pc;
 #ifdef CYCLE_ACCURATE
        delta = v - regs.r_pc;
@@ -1323,12 +1305,6 @@ decode_opcode ()
       else
        PD (mb);
       E (1);
-#ifdef CYCLE_STATS
-      if (opcode.op[0].type == RX_Operand_Register
-         && opcode.op[1].type == RX_Operand_Register
-         && opcode.op[0].reg == opcode.op[1].reg)
-       opcode.id = RXO_nop3;
-#endif
       break;
 
     case RXO_min:
@@ -1344,8 +1320,8 @@ decode_opcode ()
     case RXO_mov:
       v = GS ();
 
-      if (opcode.op[0].type == RX_Operand_Register
-         && opcode.op[0].reg == 16 /* PSW */)
+      if (opcode->op[0].type == RX_Operand_Register
+         && opcode->op[0].reg == 16 /* PSW */)
        {
          /* Special case, LDC and POPC can't ever modify PM.  */
          int pm = regs.r_psw & FLAGBIT_PM;
@@ -1360,16 +1336,16 @@ decode_opcode ()
       if (FLAG_PM)
        {
          /* various things can't be changed in user mode.  */
-         if (opcode.op[0].type == RX_Operand_Register)
-           if (opcode.op[0].reg == 32)
+         if (opcode->op[0].type == RX_Operand_Register)
+           if (opcode->op[0].reg == 32)
              {
                v &= ~ (FLAGBIT_I | FLAGBIT_U | FLAGBITS_IPL);
                v |= regs.r_psw & (FLAGBIT_I | FLAGBIT_U | FLAGBITS_IPL);
              }
-         if (opcode.op[0].reg == 34 /* ISP */
-             || opcode.op[0].reg == 37 /* BPSW */
-             || opcode.op[0].reg == 39 /* INTB */
-             || opcode.op[0].reg == 38 /* VCT */)
+         if (opcode->op[0].reg == 34 /* ISP */
+             || opcode->op[0].reg == 37 /* BPSW */
+             || opcode->op[0].reg == 39 /* INTB */
+             || opcode->op[0].reg == 38 /* VCT */)
            /* These are ignored.  */
            break;
        }
@@ -1381,10 +1357,10 @@ decode_opcode ()
       PD (v);
 
 #ifdef CYCLE_ACCURATE
-      if ((opcode.op[0].type == RX_Operand_Predec
-          && opcode.op[1].type == RX_Operand_Register)
-         || (opcode.op[0].type == RX_Operand_Postinc
-             && opcode.op[1].type == RX_Operand_Register))
+      if ((opcode->op[0].type == RX_Operand_Predec
+          && opcode->op[1].type == RX_Operand_Register)
+         || (opcode->op[0].type == RX_Operand_Postinc
+             && opcode->op[1].type == RX_Operand_Register))
        {
          /* Special case: push reg doesn't cause a memory stall.  */
          memory_dest = 0;
@@ -1393,32 +1369,14 @@ decode_opcode ()
 #endif
 
       set_sz (v, DSZ());
-#ifdef CYCLE_STATS
-      if (opcode.op[0].type == RX_Operand_Register
-         && opcode.op[1].type == RX_Operand_Register
-         && opcode.op[0].reg == opcode.op[1].reg)
-       opcode.id = RXO_nop2;
-#endif
       break;
 
     case RXO_movbi:
-      /* We cheat to save on code duplication. */
-      regs.r_temp = (get_reg (opcode.op[1].reg) * size2bytes[opcode.size]
-                    + get_reg (opcode.op[2].reg));
-      opcode.op[1].reg = r_temp_idx;
-      opcode.op[1].type = RX_Operand_Indirect;
-      opcode.op[1].addend = 0;
       PD (GS ());
       cycles (1);
       break;
 
     case RXO_movbir:
-      /* We cheat to save on code duplication. */
-      regs.r_temp = (get_reg (opcode.op[1].reg) * size2bytes[opcode.size]
-                    + get_reg (opcode.op[2].reg));
-      opcode.op[1].reg = r_temp_idx;
-      opcode.op[1].type = RX_Operand_Indirect;
-      opcode.op[1].addend = 0;
       PS (GD ());
       cycles (1);
       break;
@@ -1478,6 +1436,8 @@ decode_opcode ()
       break;
 
     case RXO_nop:
+    case RXO_nop2:
+    case RXO_nop3:
       E1;
       break;
 
@@ -1487,14 +1447,14 @@ decode_opcode ()
 
     case RXO_popm:
       /* POPM cannot pop R0 (sp).  */
-      if (opcode.op[1].reg == 0 || opcode.op[2].reg == 0)
+      if (opcode->op[1].reg == 0 || opcode->op[2].reg == 0)
        EXCEPTION (EX_UNDEFINED);
-      if (opcode.op[1].reg >= opcode.op[2].reg)
+      if (opcode->op[1].reg >= opcode->op[2].reg)
        {
          regs.r_pc = opcode_pc;
-         return RX_MAKE_STOPPED (SIGILL);
+         DO_RETURN (RX_MAKE_STOPPED (SIGILL));
        }
-      for (v = opcode.op[1].reg; v <= opcode.op[2].reg; v++)
+      for (v = opcode->op[1].reg; v <= opcode->op[2].reg; v++)
        {
          cycles (1);
          RLD (v);
@@ -1504,19 +1464,19 @@ decode_opcode ()
 
     case RXO_pushm:
       /* PUSHM cannot push R0 (sp).  */
-      if (opcode.op[1].reg == 0 || opcode.op[2].reg == 0)
+      if (opcode->op[1].reg == 0 || opcode->op[2].reg == 0)
        EXCEPTION (EX_UNDEFINED);
-      if (opcode.op[1].reg >= opcode.op[2].reg)
+      if (opcode->op[1].reg >= opcode->op[2].reg)
        {
          regs.r_pc = opcode_pc;
          return RX_MAKE_STOPPED (SIGILL);
        }
-      for (v = opcode.op[2].reg; v >= opcode.op[1].reg; v--)
+      for (v = opcode->op[2].reg; v >= opcode->op[1].reg; v--)
        {
          RL (v);
          push (get_reg (v));
        }
-      cycles (opcode.op[2].reg - opcode.op[1].reg + 1);
+      cycles (opcode->op[2].reg - opcode->op[1].reg + 1);
       break;
 
     case RXO_racw:
@@ -1573,7 +1533,7 @@ decode_opcode ()
        {
          long long tmp;
 
-         switch (opcode.size)
+         switch (opcode->size)
            {
            case RX_Long:
              ma = mem_get_si (regs.r[1]);
@@ -1627,7 +1587,7 @@ decode_opcode ()
       else
        set_flags (FLAGBIT_O|FLAGBIT_S, ma);
 #ifdef CYCLE_ACCURATE
-      switch (opcode.size)
+      switch (opcode->size)
        {
        case RX_Long:
          cycles (6 + 4 * tx);
@@ -1725,17 +1685,17 @@ decode_opcode ()
       break;
 
     case RXO_rtsd:
-      if (opcode.op[2].type == RX_Operand_Register)
+      if (opcode->op[2].type == RX_Operand_Register)
        {
          int i;
          /* RTSD cannot pop R0 (sp).  */
-         put_reg (0, get_reg (0) + GS() - (opcode.op[0].reg-opcode.op[2].reg+1)*4);
-         if (opcode.op[2].reg == 0)
+         put_reg (0, get_reg (0) + GS() - (opcode->op[0].reg-opcode->op[2].reg+1)*4);
+         if (opcode->op[2].reg == 0)
            EXCEPTION (EX_UNDEFINED);
 #ifdef CYCLE_ACCURATE
-         tx = opcode.op[0].reg - opcode.op[2].reg + 1;
+         tx = opcode->op[0].reg - opcode->op[2].reg + 1;
 #endif
-         for (i = opcode.op[2].reg; i <= opcode.op[0].reg; i ++)
+         for (i = opcode->op[2].reg; i <= opcode->op[0].reg; i ++)
            {
              RLD (i);
              put_reg (i, pop ());
@@ -1807,7 +1767,7 @@ decode_opcode ()
       break;
 
     case RXO_setpsw:
-      v = 1 << opcode.op[0].reg;
+      v = 1 << opcode->op[0].reg;
       if (FLAG_PM
          && (v == FLAGBIT_I
              || v == FLAGBIT_U))
@@ -1880,7 +1840,7 @@ decode_opcode ()
 #ifdef CYCLE_ACCURATE
       tx = regs.r[3];
 #endif
-      switch (opcode.size)
+      switch (opcode->size)
        {
        case RX_Long:
          while (regs.r[3] != 0)
@@ -1923,7 +1883,7 @@ decode_opcode ()
     case RXO_stop:
       PRIVILEDGED ();
       regs.r_psw |= FLAGBIT_I;
-      return RX_MAKE_STOPPED(0);
+      DO_RETURN (RX_MAKE_STOPPED(0));
 
     case RXO_sub:
       MATH_OP (-, 0);
@@ -1939,7 +1899,7 @@ decode_opcode ()
          cycles (3);
          break;
        }
-      switch (opcode.size)
+      switch (opcode->size)
        {
        case RX_Long:
          uma = get_reg (2);
@@ -1993,7 +1953,7 @@ decode_opcode ()
 #endif
       if (regs.r[3] == 0)
        break;
-      switch (opcode.size)
+      switch (opcode->size)
        {
        case RX_Long:
          uma = get_reg (2);
@@ -2043,7 +2003,7 @@ decode_opcode ()
     case RXO_wait:
       PRIVILEDGED ();
       regs.r_psw |= FLAGBIT_I;
-      return RX_MAKE_STOPPED(0);
+      DO_RETURN (RX_MAKE_STOPPED(0));
 
     case RXO_xchg:
 #ifdef CYCLE_ACCURATE
@@ -2082,7 +2042,7 @@ decode_opcode ()
 #ifdef CYCLE_STATS
   if (prev_cycle_count == regs.cycle_count)
     {
-      printf("Cycle count not updated! id %s\n", id_names[opcode.id]);
+      printf("Cycle count not updated! id %s\n", id_names[opcode->id]);
       abort ();
     }
 #endif
@@ -2090,15 +2050,15 @@ decode_opcode ()
 #ifdef CYCLE_STATS
   if (running_benchmark)
     {
-      int omap = op_lookup (opcode.op[0].type, opcode.op[1].type, opcode.op[2].type);
+      int omap = op_lookup (opcode->op[0].type, opcode->op[1].type, opcode->op[2].type);
 
 
-      cycles_per_id[opcode.id][omap] += regs.cycle_count - prev_cycle_count;
-      times_per_id[opcode.id][omap] ++;
+      cycles_per_id[opcode->id][omap] += regs.cycle_count - prev_cycle_count;
+      times_per_id[opcode->id][omap] ++;
 
-      times_per_pair[prev_opcode_id][po0][opcode.id][omap] ++;
+      times_per_pair[prev_opcode_id][po0][opcode->id][omap] ++;
 
-      prev_opcode_id = opcode.id;
+      prev_opcode_id = opcode->id;
       po0 = omap;
     }
 #endif