Check sh_type/sh_flags/sh_addralign/sh_entsize when copying sh_link/sh_info
[binutils-gdb.git] / opcodes / rl78-decode.c
index 7fb2519722f2f9e98bdcc1f856083d3e84f349b0..756da877e68d8180afdc4d8f18a311888a225de9 100644 (file)
@@ -1,5 +1,26 @@
 #line 1 "rl78-decode.opc"
 /* -*- c -*- */
+/* Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Contributed by Red Hat.
+   Written by DJ Delorie.
+
+   This file is part of the GNU opcodes library.
+
+   This library is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
 #include "sysdep.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -144,7 +165,8 @@ int
 rl78_decode_opcode (unsigned long pc AU,
                  RL78_Opcode_Decoded * rl78,
                  int (* getbyte)(void *),
-                 void * ptr)
+                 void * ptr,
+                 RL78_Dis_Isa isa)
 {
   LocalData lds, * ld = &lds;
   unsigned char op_buf[20] = {0};
@@ -179,7 +201,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("nop");
-#line 887 "rl78-decode.opc"
+#line 912 "rl78-decode.opc"
           ID(nop);
         
         /*----------------------------------------------------------------------*/
@@ -192,7 +214,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x07:
         {
           /** 0000 0rw1                        addw    %0, %1                          */
-#line 253 "rl78-decode.opc"
+#line 274 "rl78-decode.opc"
           int rw AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -202,22 +224,22 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rw = 0x%x\n", rw);
             }
           SYNTAX("addw %0, %1");
-#line 253 "rl78-decode.opc"
+#line 274 "rl78-decode.opc"
           ID(add); W(); DR(AX); SRW(rw); Fzac;
         
         }
       break;
     case 0x02:
         {
-          /** 0000 0010                        addw    %0, %e1%!1                      */
+          /** 0000 0010                        addw    %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0000 0010                    addw    %0, %e1%!1                      */",
+                     "/** 0000 0010                    addw    %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("addw %0, %e1%!1");
-#line 244 "rl78-decode.opc"
+          SYNTAX("addw %0, %e!1");
+#line 265 "rl78-decode.opc"
           ID(add); W(); DR(AX); SM(None, IMMU(2)); Fzac;
         
         }
@@ -232,7 +254,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addw %0, #%1");
-#line 250 "rl78-decode.opc"
+#line 271 "rl78-decode.opc"
           ID(add); W(); DR(AX); SC(IMMU(2)); Fzac;
         
         }
@@ -247,7 +269,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addw %0, %1");
-#line 256 "rl78-decode.opc"
+#line 277 "rl78-decode.opc"
           ID(add); W(); DR(AX); SM(None, SADDR); Fzac;
         
         }
@@ -262,7 +284,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xch  a, x");
-#line 1210 "rl78-decode.opc"
+#line 1235 "rl78-decode.opc"
           ID(xch); DR(A); SR(X);
         
         /*----------------------------------------------------------------------*/
@@ -271,15 +293,15 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0x09:
         {
-          /** 0000 1001                        mov     %0, %e1%1                       */
+          /** 0000 1001                        mov     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0000 1001                    mov     %0, %e1%1                       */",
+                     "/** 0000 1001                    mov     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 657 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e1");
+#line 678 "rl78-decode.opc"
           ID(mov); DR(A); SM(B, IMMU(2));
         
         }
@@ -294,7 +316,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, #%1");
-#line 207 "rl78-decode.opc"
+#line 228 "rl78-decode.opc"
           ID(add); DM(None, SADDR); SC(IMMU(1)); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -311,7 +333,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, %1");
-#line 201 "rl78-decode.opc"
+#line 222 "rl78-decode.opc"
           ID(add); DR(A); SM(None, SADDR); Fzac;
         
         }
@@ -326,52 +348,52 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, #%1");
-#line 195 "rl78-decode.opc"
+#line 216 "rl78-decode.opc"
           ID(add); DR(A); SC(IMMU(1)); Fzac;
         
         }
       break;
     case 0x0d:
         {
-          /** 0000 1101                        add     %0, %e1%1                       */
+          /** 0000 1101                        add     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0000 1101                    add     %0, %e1%1                       */",
+                     "/** 0000 1101                    add     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("add  %0, %e1%1");
-#line 183 "rl78-decode.opc"
+          SYNTAX("add  %0, %e1");
+#line 204 "rl78-decode.opc"
           ID(add); DR(A); SM(HL, 0); Fzac;
         
         }
       break;
     case 0x0e:
         {
-          /** 0000 1110                        add     %0, %e1%1                       */
+          /** 0000 1110                        add     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0000 1110                    add     %0, %e1%1                       */",
+                     "/** 0000 1110                    add     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("add  %0, %e1%1");
-#line 189 "rl78-decode.opc"
+          SYNTAX("add  %0, %ea1");
+#line 210 "rl78-decode.opc"
           ID(add); DR(A); SM(HL, IMMU(1)); Fzac;
-        
+          
         }
       break;
     case 0x0f:
         {
-          /** 0000 1111                        add     %0, %e1%!1                      */
+          /** 0000 1111                        add     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0000 1111                    add     %0, %e1%!1                      */",
+                     "/** 0000 1111                    add     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("add  %0, %e1%!1");
-#line 180 "rl78-decode.opc"
+          SYNTAX("add  %0, %e!1");
+#line 201 "rl78-decode.opc"
           ID(add); DR(A); SM(None, IMMU(2)); Fzac;
         
         }
@@ -386,7 +408,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addw %0, #%1");
-#line 259 "rl78-decode.opc"
+#line 280 "rl78-decode.opc"
           ID(add); W(); DR(SP); SC(IMMU(1)); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -403,7 +425,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("es:");
-#line 172 "rl78-decode.opc"
+#line 193 "rl78-decode.opc"
           DE(); SE();
           op ++;
           pc ++;
@@ -418,7 +440,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x16:
         {
           /** 0001 0ra0                        movw    %0, %1                          */
-#line 835 "rl78-decode.opc"
+#line 859 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -428,7 +450,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("movw %0, %1");
-#line 835 "rl78-decode.opc"
+#line 859 "rl78-decode.opc"
           ID(mov); W(); DRW(ra); SR(AX);
         
         }
@@ -438,7 +460,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x17:
         {
           /** 0001 0ra1                        movw    %0, %1                          */
-#line 832 "rl78-decode.opc"
+#line 856 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -448,37 +470,37 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("movw %0, %1");
-#line 832 "rl78-decode.opc"
+#line 856 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SRW(ra);
         
         }
       break;
     case 0x18:
         {
-          /** 0001 1000                        mov     %e0%0, %1                       */
+          /** 0001 1000                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0001 1000                    mov     %e0%0, %1                       */",
+                     "/** 0001 1000                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, %1");
-#line 708 "rl78-decode.opc"
+          SYNTAX("mov  %e0, %1");
+#line 729 "rl78-decode.opc"
           ID(mov); DM(B, IMMU(2)); SR(A);      
         
         }
       break;
     case 0x19:
         {
-          /** 0001 1001                        mov     %e0%0, #%1                      */
+          /** 0001 1001                        mov     %e0, #%1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0001 1001                    mov     %e0%0, #%1                      */",
+                     "/** 0001 1001                    mov     %e0, #%1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, #%1");
-#line 705 "rl78-decode.opc"
+          SYNTAX("mov  %e0, #%1");
+#line 726 "rl78-decode.opc"
           ID(mov); DM(B, IMMU(2)); SC(IMMU(1));        
         
         }
@@ -493,7 +515,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, #%1");
-#line 239 "rl78-decode.opc"
+#line 260 "rl78-decode.opc"
           ID(addc); DM(None, SADDR); SC(IMMU(1)); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -510,7 +532,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, %1");
-#line 236 "rl78-decode.opc"
+#line 257 "rl78-decode.opc"
           ID(addc); DR(A); SM(None, SADDR); Fzac;
         
         }
@@ -525,52 +547,52 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, #%1");
-#line 227 "rl78-decode.opc"
+#line 248 "rl78-decode.opc"
           ID(addc); DR(A); SC(IMMU(1)); Fzac;
         
         }
       break;
     case 0x1d:
         {
-          /** 0001 1101                        addc    %0, %e1%1                       */
+          /** 0001 1101                        addc    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0001 1101                    addc    %0, %e1%1                       */",
+                     "/** 0001 1101                    addc    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("addc %0, %e1%1");
-#line 215 "rl78-decode.opc"
+          SYNTAX("addc %0, %e1");
+#line 236 "rl78-decode.opc"
           ID(addc); DR(A); SM(HL, 0); Fzac;
         
         }
       break;
     case 0x1e:
         {
-          /** 0001 1110                        addc    %0, %e1%1                       */
+          /** 0001 1110                        addc    %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0001 1110                    addc    %0, %e1%1                       */",
+                     "/** 0001 1110                    addc    %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("addc %0, %e1%1");
-#line 224 "rl78-decode.opc"
+          SYNTAX("addc %0, %ea1");
+#line 245 "rl78-decode.opc"
           ID(addc); DR(A); SM(HL, IMMU(1)); Fzac;
         
         }
       break;
     case 0x1f:
         {
-          /** 0001 1111                        addc    %0, %e1%!1                      */
+          /** 0001 1111                        addc    %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0001 1111                    addc    %0, %e1%!1                      */",
+                     "/** 0001 1111                    addc    %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("addc %0, %e1%!1");
-#line 212 "rl78-decode.opc"
+          SYNTAX("addc %0, %e!1");
+#line 233 "rl78-decode.opc"
           ID(addc); DR(A); SM(None, IMMU(2)); Fzac;
         
         }
@@ -585,7 +607,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subw %0, #%1");
-#line 1174 "rl78-decode.opc"
+#line 1199 "rl78-decode.opc"
           ID(sub); W(); DR(SP); SC(IMMU(1)); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -598,7 +620,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x27:
         {
           /** 0010 0rw1                        subw    %0, %1                          */
-#line 1168 "rl78-decode.opc"
+#line 1193 "rl78-decode.opc"
           int rw AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -608,22 +630,22 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rw = 0x%x\n", rw);
             }
           SYNTAX("subw %0, %1");
-#line 1168 "rl78-decode.opc"
+#line 1193 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SRW(rw); Fzac;
         
         }
       break;
     case 0x22:
         {
-          /** 0010 0010                        subw    %0, %e1%!1                      */
+          /** 0010 0010                        subw    %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0010 0010                    subw    %0, %e1%!1                      */",
+                     "/** 0010 0010                    subw    %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("subw %0, %e1%!1");
-#line 1159 "rl78-decode.opc"
+          SYNTAX("subw %0, %e!1");
+#line 1184 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SM(None, IMMU(2)); Fzac;
         
         }
@@ -638,7 +660,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subw %0, #%1");
-#line 1165 "rl78-decode.opc"
+#line 1190 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SC(IMMU(2)); Fzac;
         
         }
@@ -653,37 +675,37 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subw %0, %1");
-#line 1171 "rl78-decode.opc"
+#line 1196 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SM(None, SADDR); Fzac;
         
         }
       break;
     case 0x28:
         {
-          /** 0010 1000                        mov     %e0%0, %1                       */
+          /** 0010 1000                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0010 1000                    mov     %e0%0, %1                       */",
+                     "/** 0010 1000                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, %1");
-#line 720 "rl78-decode.opc"
+          SYNTAX("mov  %e0, %1");
+#line 741 "rl78-decode.opc"
           ID(mov); DM(C, IMMU(2)); SR(A);
         
         }
       break;
     case 0x29:
         {
-          /** 0010 1001                        mov     %0, %e1%1                       */
+          /** 0010 1001                        mov     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0010 1001                    mov     %0, %e1%1                       */",
+                     "/** 0010 1001                    mov     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 663 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e1");
+#line 684 "rl78-decode.opc"
           ID(mov); DR(A); SM(C, IMMU(2));
         
         }
@@ -698,7 +720,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, #%1");
-#line 1122 "rl78-decode.opc"
+#line 1147 "rl78-decode.opc"
           ID(sub); DM(None, SADDR); SC(IMMU(1)); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -715,7 +737,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, %1");
-#line 1116 "rl78-decode.opc"
+#line 1141 "rl78-decode.opc"
           ID(sub); DR(A); SM(None, SADDR); Fzac;
         
         }
@@ -730,52 +752,52 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, #%1");
-#line 1110 "rl78-decode.opc"
+#line 1135 "rl78-decode.opc"
           ID(sub); DR(A); SC(IMMU(1)); Fzac;
         
         }
       break;
     case 0x2d:
         {
-          /** 0010 1101                        sub     %0, %e1%1                       */
+          /** 0010 1101                        sub     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0010 1101                    sub     %0, %e1%1                       */",
+                     "/** 0010 1101                    sub     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("sub  %0, %e1%1");
-#line 1098 "rl78-decode.opc"
+          SYNTAX("sub  %0, %e1");
+#line 1123 "rl78-decode.opc"
           ID(sub); DR(A); SM(HL, 0); Fzac;
         
         }
       break;
     case 0x2e:
         {
-          /** 0010 1110                        sub     %0, %e1%1                       */
+          /** 0010 1110                        sub     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0010 1110                    sub     %0, %e1%1                       */",
+                     "/** 0010 1110                    sub     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("sub  %0, %e1%1");
-#line 1104 "rl78-decode.opc"
+          SYNTAX("sub  %0, %ea1");
+#line 1129 "rl78-decode.opc"
           ID(sub); DR(A); SM(HL, IMMU(1)); Fzac;
         
         }
       break;
     case 0x2f:
         {
-          /** 0010 1111                        sub     %0, %e1%!1                      */
+          /** 0010 1111                        sub     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0010 1111                    sub     %0, %e1%!1                      */",
+                     "/** 0010 1111                    sub     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("sub  %0, %e1%!1");
-#line 1095 "rl78-decode.opc"
+          SYNTAX("sub  %0, %e!1");
+#line 1120 "rl78-decode.opc"
           ID(sub); DR(A); SM(None, IMMU(2)); Fzac;
         
         }
@@ -786,7 +808,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x36:
         {
           /** 0011 0rg0                        movw    %0, #%1                         */
-#line 829 "rl78-decode.opc"
+#line 853 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -796,7 +818,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("movw %0, #%1");
-#line 829 "rl78-decode.opc"
+#line 853 "rl78-decode.opc"
           ID(mov); W(); DRW(rg); SC(IMMU(2));
         
         }
@@ -808,7 +830,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0011 0001 0bit 0000                btclr   %s1, $%a0                       */
-#line 395 "rl78-decode.opc"
+#line 416 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -818,7 +840,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btclr  %s1, $%a0");
-#line 395 "rl78-decode.opc"
+#line 416 "rl78-decode.opc"
                 ID(branch_cond_clear); SM(None, SADDR); SB(bit); DC(pc+IMMS(1)+4); COND(T);
               
               /*----------------------------------------------------------------------*/
@@ -828,7 +850,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x01:
               {
                 /** 0011 0001 0bit 0001                btclr   %1, $%a0                        */
-#line 389 "rl78-decode.opc"
+#line 410 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -838,7 +860,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btclr  %1, $%a0");
-#line 389 "rl78-decode.opc"
+#line 410 "rl78-decode.opc"
                 ID(branch_cond_clear); DC(pc+IMMS(1)+3); SR(A); SB(bit); COND(T);
               
               }
@@ -846,7 +868,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x02:
               {
                 /** 0011 0001 0bit 0010                bt      %s1, $%a0                       */
-#line 381 "rl78-decode.opc"
+#line 402 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -856,7 +878,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bt     %s1, $%a0");
-#line 381 "rl78-decode.opc"
+#line 402 "rl78-decode.opc"
                 ID(branch_cond); SM(None, SADDR); SB(bit); DC(pc+IMMS(1)+4); COND(T);
               
               /*----------------------------------------------------------------------*/
@@ -866,7 +888,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x03:
               {
                 /** 0011 0001 0bit 0011                bt      %1, $%a0                        */
-#line 375 "rl78-decode.opc"
+#line 396 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -876,7 +898,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bt     %1, $%a0");
-#line 375 "rl78-decode.opc"
+#line 396 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(A); SB(bit); COND(T);
               
               }
@@ -884,7 +906,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x04:
               {
                 /** 0011 0001 0bit 0100                bf      %s1, $%a0                       */
-#line 342 "rl78-decode.opc"
+#line 363 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -894,7 +916,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bf     %s1, $%a0");
-#line 342 "rl78-decode.opc"
+#line 363 "rl78-decode.opc"
                 ID(branch_cond); SM(None, SADDR); SB(bit); DC(pc+IMMS(1)+4); COND(F);
               
               /*----------------------------------------------------------------------*/
@@ -904,7 +926,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x05:
               {
                 /** 0011 0001 0bit 0101                bf      %1, $%a0                        */
-#line 336 "rl78-decode.opc"
+#line 357 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -914,7 +936,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bf     %1, $%a0");
-#line 336 "rl78-decode.opc"
+#line 357 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(A); SB(bit); COND(F);
               
               }
@@ -922,7 +944,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x07:
               {
                 /** 0011 0001 0cnt 0111                shl     %0, %1                          */
-#line 1051 "rl78-decode.opc"
+#line 1076 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -932,7 +954,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shl    %0, %1");
-#line 1051 "rl78-decode.opc"
+#line 1076 "rl78-decode.opc"
                 ID(shl); DR(C); SC(cnt);
               
               }
@@ -940,7 +962,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x08:
               {
                 /** 0011 0001 0cnt 1000                shl     %0, %1                          */
-#line 1048 "rl78-decode.opc"
+#line 1073 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -950,7 +972,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shl    %0, %1");
-#line 1048 "rl78-decode.opc"
+#line 1073 "rl78-decode.opc"
                 ID(shl); DR(B); SC(cnt);
               
               }
@@ -958,7 +980,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x09:
               {
                 /** 0011 0001 0cnt 1001                shl     %0, %1                          */
-#line 1045 "rl78-decode.opc"
+#line 1070 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -968,7 +990,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shl    %0, %1");
-#line 1045 "rl78-decode.opc"
+#line 1070 "rl78-decode.opc"
                 ID(shl); DR(A); SC(cnt);
               
               }
@@ -976,7 +998,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x0a:
               {
                 /** 0011 0001 0cnt 1010                shr     %0, %1                          */
-#line 1062 "rl78-decode.opc"
+#line 1087 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -986,7 +1008,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shr    %0, %1");
-#line 1062 "rl78-decode.opc"
+#line 1087 "rl78-decode.opc"
                 ID(shr); DR(A); SC(cnt);
               
               }
@@ -994,7 +1016,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x0b:
               {
                 /** 0011 0001 0cnt 1011                sar     %0, %1                          */
-#line 1009 "rl78-decode.opc"
+#line 1034 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1004,7 +1026,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("sar    %0, %1");
-#line 1009 "rl78-decode.opc"
+#line 1034 "rl78-decode.opc"
                 ID(sar); DR(A); SC(cnt);
               
               }
@@ -1013,7 +1035,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x8c:
               {
                 /** 0011 0001 wcnt 1100                shlw    %0, %1                          */
-#line 1057 "rl78-decode.opc"
+#line 1082 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1023,7 +1045,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("shlw   %0, %1");
-#line 1057 "rl78-decode.opc"
+#line 1082 "rl78-decode.opc"
                 ID(shl); W(); DR(BC); SC(wcnt);
               
               /*----------------------------------------------------------------------*/
@@ -1034,7 +1056,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x8d:
               {
                 /** 0011 0001 wcnt 1101                shlw    %0, %1                          */
-#line 1054 "rl78-decode.opc"
+#line 1079 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1044,7 +1066,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("shlw   %0, %1");
-#line 1054 "rl78-decode.opc"
+#line 1079 "rl78-decode.opc"
                 ID(shl); W(); DR(AX); SC(wcnt);
               
               }
@@ -1053,7 +1075,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x8e:
               {
                 /** 0011 0001 wcnt 1110                shrw    %0, %1                          */
-#line 1065 "rl78-decode.opc"
+#line 1090 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1063,7 +1085,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("shrw   %0, %1");
-#line 1065 "rl78-decode.opc"
+#line 1090 "rl78-decode.opc"
                 ID(shr); W(); DR(AX); SC(wcnt);
               
               /*----------------------------------------------------------------------*/
@@ -1074,7 +1096,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x8f:
               {
                 /** 0011 0001 wcnt 1111                sarw    %0, %1                          */
-#line 1012 "rl78-decode.opc"
+#line 1037 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1084,7 +1106,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("sarw   %0, %1");
-#line 1012 "rl78-decode.opc"
+#line 1037 "rl78-decode.opc"
                 ID(sar); W(); DR(AX); SC(wcnt);
               
               /*----------------------------------------------------------------------*/
@@ -1094,7 +1116,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x80:
               {
                 /** 0011 0001 1bit 0000                btclr   %s1, $%a0                       */
-#line 392 "rl78-decode.opc"
+#line 413 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1104,25 +1126,25 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btclr  %s1, $%a0");
-#line 392 "rl78-decode.opc"
+#line 413 "rl78-decode.opc"
                 ID(branch_cond_clear); SM(None, SFR); SB(bit); DC(pc+IMMS(1)+4); COND(T);
               
               }
             break;
           case 0x81:
               {
-                /** 0011 0001 1bit 0001                btclr   %e1%1, $%a0                     */
-#line 386 "rl78-decode.opc"
+                /** 0011 0001 1bit 0001                btclr   %e1, $%a0                       */
+#line 407 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0011 0001 1bit 0001            btclr   %e1%1, $%a0                     */",
+                           "/** 0011 0001 1bit 0001            btclr   %e1, $%a0                       */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("btclr  %e1%1, $%a0");
-#line 386 "rl78-decode.opc"
+                SYNTAX("btclr  %e1, $%a0");
+#line 407 "rl78-decode.opc"
                 ID(branch_cond_clear); DC(pc+IMMS(1)+3); SM(HL,0); SB(bit); COND(T);
               
               }
@@ -1130,7 +1152,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x82:
               {
                 /** 0011 0001 1bit 0010                bt      %s1, $%a0                       */
-#line 378 "rl78-decode.opc"
+#line 399 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1140,25 +1162,25 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bt     %s1, $%a0");
-#line 378 "rl78-decode.opc"
+#line 399 "rl78-decode.opc"
                 ID(branch_cond); SM(None, SFR); SB(bit); DC(pc+IMMS(1)+4); COND(T);
               
               }
             break;
           case 0x83:
               {
-                /** 0011 0001 1bit 0011                bt      %e1%1, $%a0                     */
-#line 372 "rl78-decode.opc"
+                /** 0011 0001 1bit 0011                bt      %e1, $%a0                       */
+#line 393 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0011 0001 1bit 0011            bt      %e1%1, $%a0                     */",
+                           "/** 0011 0001 1bit 0011            bt      %e1, $%a0                       */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("bt     %e1%1, $%a0");
-#line 372 "rl78-decode.opc"
+                SYNTAX("bt     %e1, $%a0");
+#line 393 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SM(HL,0); SB(bit); COND(T);
               
               }
@@ -1166,7 +1188,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x84:
               {
                 /** 0011 0001 1bit 0100                bf      %s1, $%a0                       */
-#line 339 "rl78-decode.opc"
+#line 360 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1176,25 +1198,25 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bf     %s1, $%a0");
-#line 339 "rl78-decode.opc"
+#line 360 "rl78-decode.opc"
                 ID(branch_cond); SM(None, SFR); SB(bit); DC(pc+IMMS(1)+4); COND(F);
               
               }
             break;
           case 0x85:
               {
-                /** 0011 0001 1bit 0101                bf      %e1%1, $%a0                     */
-#line 333 "rl78-decode.opc"
+                /** 0011 0001 1bit 0101                bf      %e1, $%a0                       */
+#line 354 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0011 0001 1bit 0101            bf      %e1%1, $%a0                     */",
+                           "/** 0011 0001 1bit 0101            bf      %e1, $%a0                       */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("bf     %e1%1, $%a0");
-#line 333 "rl78-decode.opc"
+                SYNTAX("bf     %e1, $%a0");
+#line 354 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SM(HL,0); SB(bit); COND(F);
               
               }
@@ -1207,7 +1229,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x37:
         {
           /** 0011 0ra1                        xchw    %0, %1                          */
-#line 1215 "rl78-decode.opc"
+#line 1240 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -1217,7 +1239,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("xchw %0, %1");
-#line 1215 "rl78-decode.opc"
+#line 1240 "rl78-decode.opc"
           ID(xch); W(); DR(AX); SRW(ra);
         
         /*----------------------------------------------------------------------*/
@@ -1226,30 +1248,30 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0x38:
         {
-          /** 0011 1000                        mov     %e0%0, #%1                      */
+          /** 0011 1000                        mov     %e0, #%1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0011 1000                    mov     %e0%0, #%1                      */",
+                     "/** 0011 1000                    mov     %e0, #%1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, #%1");
-#line 717 "rl78-decode.opc"
+          SYNTAX("mov  %e0, #%1");
+#line 738 "rl78-decode.opc"
           ID(mov); DM(C, IMMU(2)); SC(IMMU(1));        
         
         }
       break;
     case 0x39:
         {
-          /** 0011 1001                        mov     %e0%0, #%1                      */
+          /** 0011 1001                        mov     %e0, #%1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0011 1001                    mov     %e0%0, #%1                      */",
+                     "/** 0011 1001                    mov     %e0, #%1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, #%1");
-#line 711 "rl78-decode.opc"
+          SYNTAX("mov  %e0, #%1");
+#line 732 "rl78-decode.opc"
           ID(mov); DM(BC, IMMU(2)); SC(IMMU(1));       
         
         }
@@ -1264,7 +1286,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, #%1");
-#line 1154 "rl78-decode.opc"
+#line 1179 "rl78-decode.opc"
           ID(subc); DM(None, SADDR); SC(IMMU(1)); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -1281,7 +1303,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, %1");
-#line 1151 "rl78-decode.opc"
+#line 1176 "rl78-decode.opc"
           ID(subc); DR(A); SM(None, SADDR); Fzac;
         
         }
@@ -1296,67 +1318,67 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, #%1");
-#line 1142 "rl78-decode.opc"
+#line 1167 "rl78-decode.opc"
           ID(subc); DR(A); SC(IMMU(1)); Fzac;
         
         }
       break;
     case 0x3d:
         {
-          /** 0011 1101                        subc    %0, %e1%1                       */
+          /** 0011 1101                        subc    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0011 1101                    subc    %0, %e1%1                       */",
+                     "/** 0011 1101                    subc    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("subc %0, %e1%1");
-#line 1130 "rl78-decode.opc"
+          SYNTAX("subc %0, %e1");
+#line 1155 "rl78-decode.opc"
           ID(subc); DR(A); SM(HL, 0); Fzac;
         
         }
       break;
     case 0x3e:
         {
-          /** 0011 1110                        subc    %0, %e1%1                       */
+          /** 0011 1110                        subc    %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0011 1110                    subc    %0, %e1%1                       */",
+                     "/** 0011 1110                    subc    %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("subc %0, %e1%1");
-#line 1139 "rl78-decode.opc"
+          SYNTAX("subc %0, %ea1");
+#line 1164 "rl78-decode.opc"
           ID(subc); DR(A); SM(HL, IMMU(1)); Fzac;
         
         }
       break;
     case 0x3f:
         {
-          /** 0011 1111                        subc    %0, %e1%!1                      */
+          /** 0011 1111                        subc    %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0011 1111                    subc    %0, %e1%!1                      */",
+                     "/** 0011 1111                    subc    %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("subc %0, %e1%!1");
-#line 1127 "rl78-decode.opc"
+          SYNTAX("subc %0, %e!1");
+#line 1152 "rl78-decode.opc"
           ID(subc); DR(A); SM(None, IMMU(2)); Fzac;
         
         }
       break;
     case 0x40:
         {
-          /** 0100 0000                        cmp     %e0%!0, #%1                     */
+          /** 0100 0000                        cmp     %e!0, #%1                       */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 0000                    cmp     %e0%!0, #%1                     */",
+                     "/** 0100 0000                    cmp     %e!0, #%1                       */",
                      op[0]);
             }
-          SYNTAX("cmp  %e0%!0, #%1");
-#line 459 "rl78-decode.opc"
+          SYNTAX("cmp  %e!0, #%1");
+#line 480 "rl78-decode.opc"
           ID(cmp); DM(None, IMMU(2)); SC(IMMU(1)); Fzac;
         
         }
@@ -1371,22 +1393,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, #%1");
-#line 696 "rl78-decode.opc"
+#line 717 "rl78-decode.opc"
           ID(mov); DR(ES); SC(IMMU(1));        
         
         }
       break;
     case 0x42:
         {
-          /** 0100 0010                        cmpw    %0, %e1%!1                      */
+          /** 0100 0010                        cmpw    %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 0010                    cmpw    %0, %e1%!1                      */",
+                     "/** 0100 0010                    cmpw    %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("cmpw %0, %e1%!1");
-#line 510 "rl78-decode.opc"
+          SYNTAX("cmpw %0, %e!1");
+#line 531 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SM(None, IMMU(2)); Fzac;
         
         }
@@ -1396,7 +1418,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x47:
         {
           /** 0100 0ra1                        cmpw    %0, %1                          */
-#line 519 "rl78-decode.opc"
+#line 540 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -1406,7 +1428,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("cmpw %0, %1");
-#line 519 "rl78-decode.opc"
+#line 540 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SRW(ra); Fzac;
         
         }
@@ -1421,7 +1443,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmpw %0, #%1");
-#line 516 "rl78-decode.opc"
+#line 537 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SC(IMMU(2)); Fzac;
         
         }
@@ -1436,7 +1458,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmpw %0, %1");
-#line 522 "rl78-decode.opc"
+#line 543 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SM(None, SADDR); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -1445,30 +1467,30 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0x48:
         {
-          /** 0100 1000                        mov     %e0%0, %1                       */
+          /** 0100 1000                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 1000                    mov     %e0%0, %1                       */",
+                     "/** 0100 1000                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, %1");
-#line 714 "rl78-decode.opc"
+          SYNTAX("mov  %e0, %1");
+#line 735 "rl78-decode.opc"
           ID(mov); DM(BC, IMMU(2)); SR(A);     
         
         }
       break;
     case 0x49:
         {
-          /** 0100 1001                        mov     %0, %e1%1                       */
+          /** 0100 1001                        mov     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 1001                    mov     %0, %e1%1                       */",
+                     "/** 0100 1001                    mov     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 660 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e1");
+#line 681 "rl78-decode.opc"
           ID(mov); DR(A); SM(BC, IMMU(2));
         
         }
@@ -1483,7 +1505,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, #%1");
-#line 462 "rl78-decode.opc"
+#line 483 "rl78-decode.opc"
           ID(cmp); DM(None, SADDR); SC(IMMU(1)); Fzac;
         
         }
@@ -1498,7 +1520,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, %1");
-#line 489 "rl78-decode.opc"
+#line 510 "rl78-decode.opc"
           ID(cmp); DR(A); SM(None, SADDR); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -1515,52 +1537,52 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, #%1");
-#line 480 "rl78-decode.opc"
+#line 501 "rl78-decode.opc"
           ID(cmp); DR(A); SC(IMMU(1)); Fzac;
         
         }
       break;
     case 0x4d:
         {
-          /** 0100 1101                        cmp     %0, %e1%1                       */
+          /** 0100 1101                        cmp     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 1101                    cmp     %0, %e1%1                       */",
+                     "/** 0100 1101                    cmp     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("cmp  %0, %e1%1");
-#line 468 "rl78-decode.opc"
+          SYNTAX("cmp  %0, %e1");
+#line 489 "rl78-decode.opc"
           ID(cmp); DR(A); SM(HL, 0); Fzac;
         
         }
       break;
     case 0x4e:
         {
-          /** 0100 1110                        cmp     %0, %e1%1                       */
+          /** 0100 1110                        cmp     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 1110                    cmp     %0, %e1%1                       */",
+                     "/** 0100 1110                    cmp     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("cmp  %0, %e1%1");
-#line 477 "rl78-decode.opc"
+          SYNTAX("cmp  %0, %ea1");
+#line 498 "rl78-decode.opc"
           ID(cmp); DR(A); SM(HL, IMMU(1)); Fzac;
         
         }
       break;
     case 0x4f:
         {
-          /** 0100 1111                        cmp     %0, %e1%!1                      */
+          /** 0100 1111                        cmp     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 1111                    cmp     %0, %e1%!1                      */",
+                     "/** 0100 1111                    cmp     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("cmp  %0, %e1%!1");
-#line 465 "rl78-decode.opc"
+          SYNTAX("cmp  %0, %e!1");
+#line 486 "rl78-decode.opc"
           ID(cmp); DR(A); SM(None, IMMU(2)); Fzac;
         
         }
@@ -1575,7 +1597,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x57:
         {
           /** 0101 0reg                        mov     %0, #%1                         */
-#line 648 "rl78-decode.opc"
+#line 669 "rl78-decode.opc"
           int reg AU = op[0] & 0x07;
           if (trace)
             {
@@ -1585,37 +1607,37 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  reg = 0x%x\n", reg);
             }
           SYNTAX("mov  %0, #%1");
-#line 648 "rl78-decode.opc"
+#line 669 "rl78-decode.opc"
           ID(mov); DRB(reg); SC(IMMU(1));
         
         }
       break;
     case 0x58:
         {
-          /** 0101 1000                        movw    %e0%0, %1                       */
+          /** 0101 1000                        movw    %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0101 1000                    movw    %e0%0, %1                       */",
+                     "/** 0101 1000                    movw    %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %e0%0, %1");
-#line 847 "rl78-decode.opc"
+          SYNTAX("movw %e0, %1");
+#line 871 "rl78-decode.opc"
           ID(mov); W(); DM(B, IMMU(2)); SR(AX);
         
         }
       break;
     case 0x59:
         {
-          /** 0101 1001                        movw    %0, %e1%1                       */
+          /** 0101 1001                        movw    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0101 1001                    movw    %0, %e1%1                       */",
+                     "/** 0101 1001                    movw    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%1");
-#line 838 "rl78-decode.opc"
+          SYNTAX("movw %0, %e1");
+#line 862 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(B, IMMU(2));
         
         }
@@ -1630,7 +1652,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, #%1");
-#line 291 "rl78-decode.opc"
+#line 312 "rl78-decode.opc"
           ID(and); DM(None, SADDR); SC(IMMU(1)); Fz;
         
         /*----------------------------------------------------------------------*/
@@ -1647,7 +1669,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, %1");
-#line 288 "rl78-decode.opc"
+#line 309 "rl78-decode.opc"
           ID(and); DR(A); SM(None, SADDR); Fz;
         
         }
@@ -1662,52 +1684,52 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, #%1");
-#line 279 "rl78-decode.opc"
+#line 300 "rl78-decode.opc"
           ID(and); DR(A); SC(IMMU(1)); Fz;
         
         }
       break;
     case 0x5d:
         {
-          /** 0101 1101                        and     %0, %e1%1                       */
+          /** 0101 1101                        and     %0, %e1                 */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0101 1101                    and     %0, %e1%1                       */",
+                     "/** 0101 1101                    and     %0, %e1                 */",
                      op[0]);
             }
-          SYNTAX("and  %0, %e1%1");
-#line 267 "rl78-decode.opc"
+          SYNTAX("and  %0, %e1");
+#line 288 "rl78-decode.opc"
           ID(and); DR(A); SM(HL, 0); Fz;
         
         }
       break;
     case 0x5e:
         {
-          /** 0101 1110                        and     %0, %e1%1                       */
+          /** 0101 1110                        and     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0101 1110                    and     %0, %e1%1                       */",
+                     "/** 0101 1110                    and     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("and  %0, %e1%1");
-#line 273 "rl78-decode.opc"
+          SYNTAX("and  %0, %ea1");
+#line 294 "rl78-decode.opc"
           ID(and); DR(A); SM(HL, IMMU(1)); Fz;
         
         }
       break;
     case 0x5f:
         {
-          /** 0101 1111                        and     %0, %e1%!1                      */
+          /** 0101 1111                        and     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0101 1111                    and     %0, %e1%!1                      */",
+                     "/** 0101 1111                    and     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("and  %0, %e1%!1");
-#line 264 "rl78-decode.opc"
+          SYNTAX("and  %0, %e!1");
+#line 285 "rl78-decode.opc"
           ID(and); DR(A); SM(None, IMMU(2)); Fz;
         
         }
@@ -1721,7 +1743,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x67:
         {
           /** 0110 0rba                        mov     %0, %1                          */
-#line 651 "rl78-decode.opc"
+#line 672 "rl78-decode.opc"
           int rba AU = op[0] & 0x07;
           if (trace)
             {
@@ -1731,7 +1753,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rba = 0x%x\n", rba);
             }
           SYNTAX("mov  %0, %1");
-#line 651 "rl78-decode.opc"
+#line 672 "rl78-decode.opc"
           ID(mov); DR(A); SRB(rba);
         
         }
@@ -1750,7 +1772,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x07:
               {
                 /** 0110 0001 0000 0reg                add     %0, %1                          */
-#line 204 "rl78-decode.opc"
+#line 225 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1760,7 +1782,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("add    %0, %1");
-#line 204 "rl78-decode.opc"
+#line 225 "rl78-decode.opc"
                 ID(add); DRB(reg); SR(A); Fzac;
               
               }
@@ -1774,7 +1796,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x0f:
               {
                 /** 0110 0001 0000 1rba                add     %0, %1                          */
-#line 198 "rl78-decode.opc"
+#line 219 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1784,22 +1806,22 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("add    %0, %1");
-#line 198 "rl78-decode.opc"
+#line 219 "rl78-decode.opc"
                 ID(add); DR(A); SRB(rba); Fzac;
               
               }
             break;
           case 0x09:
               {
-                /** 0110 0001 0000 1001                addw    %0, %e1%1                       */
+                /** 0110 0001 0000 1001                addw    %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0000 1001            addw    %0, %e1%1                       */",
+                           "/** 0110 0001 0000 1001            addw    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("addw   %0, %e1%1");
-#line 247 "rl78-decode.opc"
+                SYNTAX("addw   %0, %ea1");
+#line 268 "rl78-decode.opc"
                 ID(add); W(); DR(AX); SM(HL, IMMU(1)); Fzac;
               
               }
@@ -1814,7 +1836,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x17:
               {
                 /** 0110 0001 0001 0reg                addc    %0, %1                          */
-#line 233 "rl78-decode.opc"
+#line 254 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1824,7 +1846,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("addc   %0, %1");
-#line 233 "rl78-decode.opc"
+#line 254 "rl78-decode.opc"
                 ID(addc); DRB(reg); SR(A); Fzac;
               
               }
@@ -1838,7 +1860,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x1f:
               {
                 /** 0110 0001 0001 1rba                addc    %0, %1                          */
-#line 230 "rl78-decode.opc"
+#line 251 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1848,7 +1870,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("addc   %0, %1");
-#line 230 "rl78-decode.opc"
+#line 251 "rl78-decode.opc"
                 ID(addc); DR(A); SRB(rba); Fzac;
               
               }
@@ -1863,7 +1885,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x27:
               {
                 /** 0110 0001 0010 0reg                sub     %0, %1                          */
-#line 1119 "rl78-decode.opc"
+#line 1144 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1873,7 +1895,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("sub    %0, %1");
-#line 1119 "rl78-decode.opc"
+#line 1144 "rl78-decode.opc"
                 ID(sub); DRB(reg); SR(A); Fzac;
               
               }
@@ -1887,7 +1909,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x2f:
               {
                 /** 0110 0001 0010 1rba                sub     %0, %1                          */
-#line 1113 "rl78-decode.opc"
+#line 1138 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1897,22 +1919,22 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("sub    %0, %1");
-#line 1113 "rl78-decode.opc"
+#line 1138 "rl78-decode.opc"
                 ID(sub); DR(A); SRB(rba); Fzac;
               
               }
             break;
           case 0x29:
               {
-                /** 0110 0001 0010 1001                subw    %0, %e1%1                       */
+                /** 0110 0001 0010 1001                subw    %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0010 1001            subw    %0, %e1%1                       */",
+                           "/** 0110 0001 0010 1001            subw    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("subw   %0, %e1%1");
-#line 1162 "rl78-decode.opc"
+                SYNTAX("subw   %0, %ea1");
+#line 1187 "rl78-decode.opc"
                 ID(sub); W(); DR(AX); SM(HL, IMMU(1)); Fzac;
               
               }
@@ -1927,7 +1949,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x37:
               {
                 /** 0110 0001 0011 0reg                subc    %0, %1                          */
-#line 1148 "rl78-decode.opc"
+#line 1173 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1937,7 +1959,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("subc   %0, %1");
-#line 1148 "rl78-decode.opc"
+#line 1173 "rl78-decode.opc"
                 ID(subc); DRB(reg); SR(A); Fzac;
               
               }
@@ -1951,7 +1973,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x3f:
               {
                 /** 0110 0001 0011 1rba                subc    %0, %1                          */
-#line 1145 "rl78-decode.opc"
+#line 1170 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1961,7 +1983,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("subc   %0, %1");
-#line 1145 "rl78-decode.opc"
+#line 1170 "rl78-decode.opc"
                 ID(subc); DR(A); SRB(rba); Fzac;
               
               }
@@ -1976,7 +1998,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x47:
               {
                 /** 0110 0001 0100 0reg                cmp     %0, %1                          */
-#line 486 "rl78-decode.opc"
+#line 507 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1986,7 +2008,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("cmp    %0, %1");
-#line 486 "rl78-decode.opc"
+#line 507 "rl78-decode.opc"
                 ID(cmp); DRB(reg); SR(A); Fzac;
               
               }
@@ -2000,7 +2022,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x4f:
               {
                 /** 0110 0001 0100 1rba                cmp     %0, %1                          */
-#line 483 "rl78-decode.opc"
+#line 504 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2010,22 +2032,22 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("cmp    %0, %1");
-#line 483 "rl78-decode.opc"
+#line 504 "rl78-decode.opc"
                 ID(cmp); DR(A); SRB(rba); Fzac;
               
               }
             break;
           case 0x49:
               {
-                /** 0110 0001 0100 1001                cmpw    %0, %e1%1                       */
+                /** 0110 0001 0100 1001                cmpw    %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0100 1001            cmpw    %0, %e1%1                       */",
+                           "/** 0110 0001 0100 1001            cmpw    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("cmpw   %0, %e1%1");
-#line 513 "rl78-decode.opc"
+                SYNTAX("cmpw   %0, %ea1");
+#line 534 "rl78-decode.opc"
                 ID(cmp); W(); DR(AX); SM(HL, IMMU(1)); Fzac;
               
               }
@@ -2040,7 +2062,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x57:
               {
                 /** 0110 0001 0101 0reg                and     %0, %1                          */
-#line 285 "rl78-decode.opc"
+#line 306 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2050,7 +2072,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("and    %0, %1");
-#line 285 "rl78-decode.opc"
+#line 306 "rl78-decode.opc"
                 ID(and); DRB(reg); SR(A); Fz;
               
               }
@@ -2064,7 +2086,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x5f:
               {
                 /** 0110 0001 0101 1rba                and     %0, %1                          */
-#line 282 "rl78-decode.opc"
+#line 303 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2074,22 +2096,22 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("and    %0, %1");
-#line 282 "rl78-decode.opc"
+#line 303 "rl78-decode.opc"
                 ID(and); DR(A); SRB(rba); Fz;
               
               }
             break;
           case 0x59:
               {
-                /** 0110 0001 0101 1001                inc     %e0%0                           */
+                /** 0110 0001 0101 1001                inc     %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0101 1001            inc     %e0%0                           */",
+                           "/** 0110 0001 0101 1001            inc     %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("inc    %e0%0");
-#line 563 "rl78-decode.opc"
+                SYNTAX("inc    %ea0");
+#line 584 "rl78-decode.opc"
                 ID(add); DM(HL, IMMU(1)); SC(1); Fza;
               
               }
@@ -2104,7 +2126,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x67:
               {
                 /** 0110 0001 0110 0reg                or      %0, %1                          */
-#line 937 "rl78-decode.opc"
+#line 962 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2114,7 +2136,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("or     %0, %1");
-#line 937 "rl78-decode.opc"
+#line 962 "rl78-decode.opc"
                 ID(or); DRB(reg); SR(A); Fz;
               
               }
@@ -2128,7 +2150,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x6f:
               {
                 /** 0110 0001 0110 1rba                or      %0, %1                          */
-#line 934 "rl78-decode.opc"
+#line 959 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2138,22 +2160,22 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("or     %0, %1");
-#line 934 "rl78-decode.opc"
+#line 959 "rl78-decode.opc"
                 ID(or); DR(A); SRB(rba); Fz;
               
               }
             break;
           case 0x69:
               {
-                /** 0110 0001 0110 1001                dec     %e0%0                           */
+                /** 0110 0001 0110 1001                dec     %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0110 1001            dec     %e0%0                           */",
+                           "/** 0110 0001 0110 1001            dec     %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("dec    %e0%0");
-#line 530 "rl78-decode.opc"
+                SYNTAX("dec    %ea0");
+#line 551 "rl78-decode.opc"
                 ID(sub); DM(HL, IMMU(1)); SC(1); Fza;
               
               }
@@ -2168,7 +2190,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x77:
               {
                 /** 0110 0001 0111 0reg                xor     %0, %1                          */
-#line 1241 "rl78-decode.opc"
+#line 1266 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2178,7 +2200,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("xor    %0, %1");
-#line 1241 "rl78-decode.opc"
+#line 1266 "rl78-decode.opc"
                 ID(xor); DRB(reg); SR(A); Fz;
               
               }
@@ -2192,7 +2214,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7f:
               {
                 /** 0110 0001 0111 1rba                xor     %0, %1                          */
-#line 1238 "rl78-decode.opc"
+#line 1263 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2202,22 +2224,22 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("xor    %0, %1");
-#line 1238 "rl78-decode.opc"
+#line 1263 "rl78-decode.opc"
                 ID(xor); DR(A); SRB(rba); Fz;
               
               }
             break;
           case 0x79:
               {
-                /** 0110 0001 0111 1001                incw    %e0%0                           */
+                /** 0110 0001 0111 1001                incw    %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0111 1001            incw    %e0%0                           */",
+                           "/** 0110 0001 0111 1001            incw    %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("incw   %e0%0");
-#line 577 "rl78-decode.opc"
+                SYNTAX("incw   %ea0");
+#line 598 "rl78-decode.opc"
                 ID(add); W(); DM(HL, IMMU(1)); SC(1);
               
               }
@@ -2225,30 +2247,30 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x80:
           case 0x81:
               {
-                /** 0110 0001 1000 000         add     %0, %e1%1                       */
+                /** 0110 0001 1000 000         add     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1000 000             add     %0, %e1%1                       */",
+                           "/** 0110 0001 1000 000             add     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("add    %0, %e1%1");
-#line 186 "rl78-decode.opc"
+                SYNTAX("add    %0, %e1");
+#line 207 "rl78-decode.opc"
                 ID(add); DR(A); SM2(HL, B, 0); Fzac;
               
               }
             break;
           case 0x82:
               {
-                /** 0110 0001 1000 0010                add     %0, %e1%1                       */
+                /** 0110 0001 1000 0010                add     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1000 0010            add     %0, %e1%1                       */",
+                           "/** 0110 0001 1000 0010            add     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("add    %0, %e1%1");
-#line 192 "rl78-decode.opc"
+                SYNTAX("add    %0, %e1");
+#line 213 "rl78-decode.opc"
                 ID(add); DR(A); SM2(HL, C, 0); Fzac;
               
               }
@@ -2287,9 +2309,9 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf7:
               {
                 /** 0110 0001 1nnn 01mm                callt   [%x0]                           */
-#line 412 "rl78-decode.opc"
+#line 433 "rl78-decode.opc"
                 int nnn AU = (op[1] >> 4) & 0x07;
-#line 412 "rl78-decode.opc"
+#line 433 "rl78-decode.opc"
                 int mm AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -2300,7 +2322,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  mm = 0x%x\n", mm);
                   }
                 SYNTAX("callt  [%x0]");
-#line 412 "rl78-decode.opc"
+#line 433 "rl78-decode.opc"
                 ID(call); DM(None, 0x80 + mm*16 + nnn*2);
               
               /*----------------------------------------------------------------------*/
@@ -2316,7 +2338,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x8f:
               {
                 /** 0110 0001 1000 1reg                xch     %0, %1                          */
-#line 1200 "rl78-decode.opc"
+#line 1225 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2326,7 +2348,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("xch    %0, %1");
-#line 1200 "rl78-decode.opc"
+#line 1225 "rl78-decode.opc"
                 /* Note: DECW uses reg == X, so this must follow DECW */
                 ID(xch); DR(A); SRB(reg);
               
@@ -2334,45 +2356,45 @@ rl78_decode_opcode (unsigned long pc AU,
             break;
           case 0x89:
               {
-                /** 0110 0001 1000 1001                decw    %e0%0                           */
+                /** 0110 0001 1000 1001                decw    %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1000 1001            decw    %e0%0                           */",
+                           "/** 0110 0001 1000 1001            decw    %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("decw   %e0%0");
-#line 544 "rl78-decode.opc"
+                SYNTAX("decw   %ea0");
+#line 565 "rl78-decode.opc"
                 ID(sub); W(); DM(HL, IMMU(1)); SC(1);
               
               }
             break;
           case 0x90:
               {
-                /** 0110 0001 1001 0000                addc    %0, %e1%1                       */
+                /** 0110 0001 1001 0000                addc    %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1001 0000            addc    %0, %e1%1                       */",
+                           "/** 0110 0001 1001 0000            addc    %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("addc   %0, %e1%1");
-#line 218 "rl78-decode.opc"
+                SYNTAX("addc   %0, %e1");
+#line 239 "rl78-decode.opc"
                 ID(addc); DR(A); SM2(HL, B, 0); Fzac;
               
               }
             break;
           case 0x92:
               {
-                /** 0110 0001 1001 0010                addc    %0, %e1%1                       */
+                /** 0110 0001 1001 0010                addc    %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1001 0010            addc    %0, %e1%1                       */",
+                           "/** 0110 0001 1001 0010            addc    %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("addc   %0, %e1%1");
-#line 221 "rl78-decode.opc"
+                SYNTAX("addc   %0, %e1");
+#line 242 "rl78-decode.opc"
                 ID(addc); DR(A); SM2(HL, C, 0); Fzac;
               
               }
@@ -2380,30 +2402,30 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xa0:
           case 0xa1:
               {
-                /** 0110 0001 1010 000         sub     %0, %e1%1                       */
+                /** 0110 0001 1010 000         sub     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 000             sub     %0, %e1%1                       */",
+                           "/** 0110 0001 1010 000             sub     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("sub    %0, %e1%1");
-#line 1101 "rl78-decode.opc"
+                SYNTAX("sub    %0, %e1");
+#line 1126 "rl78-decode.opc"
                 ID(sub); DR(A); SM2(HL, B, 0); Fzac;
               
               }
             break;
           case 0xa2:
               {
-                /** 0110 0001 1010 0010                sub     %0, %e1%1                       */
+                /** 0110 0001 1010 0010                sub     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 0010            sub     %0, %e1%1                       */",
+                           "/** 0110 0001 1010 0010            sub     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("sub    %0, %e1%1");
-#line 1107 "rl78-decode.opc"
+                SYNTAX("sub    %0, %e1");
+#line 1132 "rl78-decode.opc"
                 ID(sub); DR(A); SM2(HL, C, 0); Fzac;
               
               }
@@ -2418,37 +2440,37 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %1");
-#line 1204 "rl78-decode.opc"
+#line 1229 "rl78-decode.opc"
                 ID(xch); DR(A); SM(None, SADDR);
               
               }
             break;
           case 0xa9:
               {
-                /** 0110 0001 1010 1001                xch     %0, %e1%1                       */
+                /** 0110 0001 1010 1001                xch     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1001            xch     %0, %e1%1                       */",
+                           "/** 0110 0001 1010 1001            xch     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1%1");
-#line 1197 "rl78-decode.opc"
+                SYNTAX("xch    %0, %e1");
+#line 1222 "rl78-decode.opc"
                 ID(xch); DR(A); SM2(HL, C, 0);
               
               }
             break;
           case 0xaa:
               {
-                /** 0110 0001 1010 1010                xch     %0, %e1%!1                      */
+                /** 0110 0001 1010 1010                xch     %0, %e!1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1010            xch     %0, %e1%!1                      */",
+                           "/** 0110 0001 1010 1010            xch     %0, %e!1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1%!1");
-#line 1179 "rl78-decode.opc"
+                SYNTAX("xch    %0, %e!1");
+#line 1204 "rl78-decode.opc"
                 ID(xch); DR(A); SM(None, IMMU(2));
               
               }
@@ -2463,97 +2485,97 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %1");
-#line 1207 "rl78-decode.opc"
+#line 1232 "rl78-decode.opc"
                 ID(xch); DR(A); SM(None, SFR);
               
               }
             break;
           case 0xac:
               {
-                /** 0110 0001 1010 1100                xch     %0, %e1%1                       */
+                /** 0110 0001 1010 1100                xch     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1100            xch     %0, %e1%1                       */",
+                           "/** 0110 0001 1010 1100            xch     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1%1");
-#line 1188 "rl78-decode.opc"
+                SYNTAX("xch    %0, %e1");
+#line 1213 "rl78-decode.opc"
                 ID(xch); DR(A); SM(HL, 0);
               
               }
             break;
           case 0xad:
               {
-                /** 0110 0001 1010 1101                xch     %0, %e1%1                       */
+                /** 0110 0001 1010 1101                xch     %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1101            xch     %0, %e1%1                       */",
+                           "/** 0110 0001 1010 1101            xch     %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1%1");
-#line 1194 "rl78-decode.opc"
+                SYNTAX("xch    %0, %ea1");
+#line 1219 "rl78-decode.opc"
                 ID(xch); DR(A); SM(HL, IMMU(1));
               
               }
             break;
           case 0xae:
               {
-                /** 0110 0001 1010 1110                xch     %0, %e1%1                       */
+                /** 0110 0001 1010 1110                xch     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1110            xch     %0, %e1%1                       */",
+                           "/** 0110 0001 1010 1110            xch     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1%1");
-#line 1182 "rl78-decode.opc"
+                SYNTAX("xch    %0, %e1");
+#line 1207 "rl78-decode.opc"
                 ID(xch); DR(A); SM(DE, 0);
               
               }
             break;
           case 0xaf:
               {
-                /** 0110 0001 1010 1111                xch     %0, %e1%1                       */
+                /** 0110 0001 1010 1111                xch     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1111            xch     %0, %e1%1                       */",
+                           "/** 0110 0001 1010 1111            xch     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1%1");
-#line 1185 "rl78-decode.opc"
+                SYNTAX("xch    %0, %e1");
+#line 1210 "rl78-decode.opc"
                 ID(xch); DR(A); SM(DE, IMMU(1));
               
               }
             break;
           case 0xb0:
               {
-                /** 0110 0001 1011 0000                subc    %0, %e1%1                       */
+                /** 0110 0001 1011 0000                subc    %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1011 0000            subc    %0, %e1%1                       */",
+                           "/** 0110 0001 1011 0000            subc    %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("subc   %0, %e1%1");
-#line 1133 "rl78-decode.opc"
+                SYNTAX("subc   %0, %e1");
+#line 1158 "rl78-decode.opc"
                 ID(subc); DR(A); SM2(HL, B, 0); Fzac;
               
               }
             break;
           case 0xb2:
               {
-                /** 0110 0001 1011 0010                subc    %0, %e1%1                       */
+                /** 0110 0001 1011 0010                subc    %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1011 0010            subc    %0, %e1%1                       */",
+                           "/** 0110 0001 1011 0010            subc    %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("subc   %0, %e1%1");
-#line 1136 "rl78-decode.opc"
+                SYNTAX("subc   %0, %e1");
+#line 1161 "rl78-decode.opc"
                 ID(subc); DR(A); SM2(HL, C, 0); Fzac;
               
               }
@@ -2568,52 +2590,52 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("mov    %0, %1");
-#line 702 "rl78-decode.opc"
+#line 723 "rl78-decode.opc"
                 ID(mov); DR(ES); SM(None, SADDR);      
               
               }
             break;
           case 0xb9:
               {
-                /** 0110 0001 1011 1001                xch     %0, %e1%1                       */
+                /** 0110 0001 1011 1001                xch     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1011 1001            xch     %0, %e1%1                       */",
+                           "/** 0110 0001 1011 1001            xch     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1%1");
-#line 1191 "rl78-decode.opc"
+                SYNTAX("xch    %0, %e1");
+#line 1216 "rl78-decode.opc"
                 ID(xch); DR(A); SM2(HL, B, 0);
               
               }
             break;
           case 0xc0:
               {
-                /** 0110 0001 1100 0000                cmp     %0, %e1%1                       */
+                /** 0110 0001 1100 0000                cmp     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1100 0000            cmp     %0, %e1%1                       */",
+                           "/** 0110 0001 1100 0000            cmp     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("cmp    %0, %e1%1");
-#line 471 "rl78-decode.opc"
+                SYNTAX("cmp    %0, %e1");
+#line 492 "rl78-decode.opc"
                 ID(cmp); DR(A); SM2(HL, B, 0); Fzac;
               
               }
             break;
           case 0xc2:
               {
-                /** 0110 0001 1100 0010                cmp     %0, %e1%1                       */
+                /** 0110 0001 1100 0010                cmp     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1100 0010            cmp     %0, %e1%1                       */",
+                           "/** 0110 0001 1100 0010            cmp     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("cmp    %0, %e1%1");
-#line 474 "rl78-decode.opc"
+                SYNTAX("cmp    %0, %e1");
+#line 495 "rl78-decode.opc"
                 ID(cmp); DR(A); SM2(HL, C, 0); Fzac;
               
               }
@@ -2628,7 +2650,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("bh     $%a0");
-#line 319 "rl78-decode.opc"
+#line 340 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(None); COND(H);
               
               }
@@ -2643,22 +2665,22 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1070 "rl78-decode.opc"
+#line 1095 "rl78-decode.opc"
                 ID(skip); COND(C);
               
               }
             break;
           case 0xc9:
               {
-                /** 0110 0001 1100 1001                mov     %0, %e1%1                       */
+                /** 0110 0001 1100 1001                mov     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1100 1001            mov     %0, %e1%1                       */",
+                           "/** 0110 0001 1100 1001            mov     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("mov    %0, %e1%1");
-#line 639 "rl78-decode.opc"
+                SYNTAX("mov    %0, %e1");
+#line 660 "rl78-decode.opc"
                 ID(mov); DR(A); SM2(HL, B, 0);
               
               }
@@ -2669,7 +2691,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfa:
               {
                 /** 0110 0001 11rg 1010                call    %0                              */
-#line 409 "rl78-decode.opc"
+#line 430 "rl78-decode.opc"
                 int rg AU = (op[1] >> 4) & 0x03;
                 if (trace)
                   {
@@ -2679,7 +2701,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rg = 0x%x\n", rg);
                   }
                 SYNTAX("call   %0");
-#line 409 "rl78-decode.opc"
+#line 430 "rl78-decode.opc"
                 ID(call); DRW(rg);
               
               }
@@ -2694,7 +2716,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("br     ax");
-#line 359 "rl78-decode.opc"
+#line 380 "rl78-decode.opc"
                 ID(branch); DR(AX);
               
               /*----------------------------------------------------------------------*/
@@ -2711,7 +2733,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("brk");
-#line 367 "rl78-decode.opc"
+#line 388 "rl78-decode.opc"
                 ID(break);
               
               /*----------------------------------------------------------------------*/
@@ -2728,7 +2750,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("pop    %s0");
-#line 965 "rl78-decode.opc"
+#line 990 "rl78-decode.opc"
                 ID(mov); W(); DR(PSW); SPOP();
               
               /*----------------------------------------------------------------------*/
@@ -2737,15 +2759,15 @@ rl78_decode_opcode (unsigned long pc AU,
             break;
           case 0xce:
               {
-                /** 0110 0001 1100 1110                movs    %e0%0, %1                       */
+                /** 0110 0001 1100 1110                movs    %ea0, %1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1100 1110            movs    %e0%0, %1                       */",
+                           "/** 0110 0001 1100 1110            movs    %ea0, %1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("movs   %e0%0, %1");
-#line 787 "rl78-decode.opc"
+                SYNTAX("movs   %ea0, %1");
+#line 811 "rl78-decode.opc"
                 ID(mov); DM(HL, IMMU(1)); SR(X); Fzc;
               
               /*----------------------------------------------------------------------*/
@@ -2758,7 +2780,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xff:
               {
                 /** 0110 0001 11rb 1111                sel     rb%1                            */
-#line 1017 "rl78-decode.opc"
+#line 1042 "rl78-decode.opc"
                 int rb AU = (op[1] >> 4) & 0x03;
                 if (trace)
                   {
@@ -2768,7 +2790,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rb = 0x%x\n", rb);
                   }
                 SYNTAX("sel    rb%1");
-#line 1017 "rl78-decode.opc"
+#line 1042 "rl78-decode.opc"
                 ID(sel); SC(rb);
               
               /*----------------------------------------------------------------------*/
@@ -2777,30 +2799,30 @@ rl78_decode_opcode (unsigned long pc AU,
             break;
           case 0xd0:
               {
-                /** 0110 0001 1101 0000                and     %0, %e1%1                       */
+                /** 0110 0001 1101 0000                and     %0, %e1                 */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1101 0000            and     %0, %e1%1                       */",
+                           "/** 0110 0001 1101 0000            and     %0, %e1                 */",
                            op[0], op[1]);
                   }
-                SYNTAX("and    %0, %e1%1");
-#line 270 "rl78-decode.opc"
+                SYNTAX("and    %0, %e1");
+#line 291 "rl78-decode.opc"
                 ID(and); DR(A); SM2(HL, B, 0); Fz;
               
               }
             break;
           case 0xd2:
               {
-                /** 0110 0001 1101 0010                and     %0, %e1%1                       */
+                /** 0110 0001 1101 0010                and     %0, %e1                 */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1101 0010            and     %0, %e1%1                       */",
+                           "/** 0110 0001 1101 0010            and     %0, %e1                 */",
                            op[0], op[1]);
                   }
-                SYNTAX("and    %0, %e1%1");
-#line 276 "rl78-decode.opc"
+                SYNTAX("and    %0, %e1");
+#line 297 "rl78-decode.opc"
                 ID(and); DR(A); SM2(HL, C, 0); Fz;
               
               }
@@ -2815,7 +2837,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("bnh    $%a0");
-#line 322 "rl78-decode.opc"
+#line 343 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(None); COND(NH);
               
               }
@@ -2830,22 +2852,22 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1076 "rl78-decode.opc"
+#line 1101 "rl78-decode.opc"
                 ID(skip); COND(NC);
               
               }
             break;
           case 0xd9:
               {
-                /** 0110 0001 1101 1001                mov     %e0%0, %1                       */
+                /** 0110 0001 1101 1001                mov     %e0, %1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1101 1001            mov     %e0%0, %1                       */",
+                           "/** 0110 0001 1101 1001            mov     %e0, %1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("mov    %e0%0, %1");
-#line 606 "rl78-decode.opc"
+                SYNTAX("mov    %e0, %1");
+#line 627 "rl78-decode.opc"
                 ID(mov); DM2(HL, B, 0); SR(A);
               
               }
@@ -2860,7 +2882,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("ror    %0, %1");
-#line 998 "rl78-decode.opc"
+#line 1023 "rl78-decode.opc"
                 ID(ror); DR(A); SC(1);
               
               }
@@ -2875,7 +2897,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rolc   %0, %1");
-#line 992 "rl78-decode.opc"
+#line 1017 "rl78-decode.opc"
                 ID(rolc); DR(A); SC(1);
               
               }
@@ -2890,7 +2912,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("push   %s1");
-#line 973 "rl78-decode.opc"
+#line 998 "rl78-decode.opc"
                 ID(mov); W(); DPUSH(); SR(PSW);
               
               /*----------------------------------------------------------------------*/
@@ -2899,15 +2921,15 @@ rl78_decode_opcode (unsigned long pc AU,
             break;
           case 0xde:
               {
-                /** 0110 0001 1101 1110                cmps    %0, %e1%1                       */
+                /** 0110 0001 1101 1110                cmps    %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1101 1110            cmps    %0, %e1%1                       */",
+                           "/** 0110 0001 1101 1110            cmps    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("cmps   %0, %e1%1");
-#line 505 "rl78-decode.opc"
+                SYNTAX("cmps   %0, %ea1");
+#line 526 "rl78-decode.opc"
                 ID(cmp); DR(X); SM(HL, IMMU(1)); Fzac;
               
               /*----------------------------------------------------------------------*/
@@ -2916,30 +2938,30 @@ rl78_decode_opcode (unsigned long pc AU,
             break;
           case 0xe0:
               {
-                /** 0110 0001 1110 0000                or      %0, %e1%1                       */
+                /** 0110 0001 1110 0000                or      %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1110 0000            or      %0, %e1%1                       */",
+                           "/** 0110 0001 1110 0000            or      %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("or     %0, %e1%1");
-#line 922 "rl78-decode.opc"
+                SYNTAX("or     %0, %e1");
+#line 947 "rl78-decode.opc"
                 ID(or); DR(A); SM2(HL, B, 0); Fz;
               
               }
             break;
           case 0xe2:
               {
-                /** 0110 0001 1110 0010                or      %0, %e1%1                       */
+                /** 0110 0001 1110 0010                or      %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1110 0010            or      %0, %e1%1                       */",
+                           "/** 0110 0001 1110 0010            or      %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("or     %0, %e1%1");
-#line 928 "rl78-decode.opc"
+                SYNTAX("or     %0, %e1");
+#line 953 "rl78-decode.opc"
                 ID(or); DR(A); SM2(HL, C, 0); Fz;
               
               }
@@ -2954,7 +2976,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1073 "rl78-decode.opc"
+#line 1098 "rl78-decode.opc"
                 ID(skip); COND(H);
               
               }
@@ -2969,7 +2991,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1085 "rl78-decode.opc"
+#line 1110 "rl78-decode.opc"
                 ID(skip); COND(Z);
               
               /*----------------------------------------------------------------------*/
@@ -2978,15 +3000,15 @@ rl78_decode_opcode (unsigned long pc AU,
             break;
           case 0xe9:
               {
-                /** 0110 0001 1110 1001                mov     %0, %e1%1                       */
+                /** 0110 0001 1110 1001                mov     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1110 1001            mov     %0, %e1%1                       */",
+                           "/** 0110 0001 1110 1001            mov     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("mov    %0, %e1%1");
-#line 642 "rl78-decode.opc"
+                SYNTAX("mov    %0, %e1");
+#line 663 "rl78-decode.opc"
                 ID(mov); DR(A); SM2(HL, C, 0);
               
               }
@@ -3001,7 +3023,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rol    %0, %1");
-#line 989 "rl78-decode.opc"
+#line 1014 "rl78-decode.opc"
                 ID(rol); DR(A); SC(1);
               
               }
@@ -3016,7 +3038,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("retb");
-#line 984 "rl78-decode.opc"
+#line 1009 "rl78-decode.opc"
                 ID(reti);
               
               /*----------------------------------------------------------------------*/
@@ -3033,7 +3055,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("halt");
-#line 555 "rl78-decode.opc"
+#line 576 "rl78-decode.opc"
                 ID(halt);
               
               /*----------------------------------------------------------------------*/
@@ -3044,7 +3066,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfe:
               {
                 /** 0110 0001 111r 1110                rolwc   %0, %1                          */
-#line 995 "rl78-decode.opc"
+#line 1020 "rl78-decode.opc"
                 int r AU = (op[1] >> 4) & 0x01;
                 if (trace)
                   {
@@ -3054,37 +3076,37 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  r = 0x%x\n", r);
                   }
                 SYNTAX("rolwc  %0, %1");
-#line 995 "rl78-decode.opc"
+#line 1020 "rl78-decode.opc"
                 ID(rolc); W(); DRW(r); SC(1);
               
               }
             break;
           case 0xf0:
               {
-                /** 0110 0001 1111 0000                xor     %0, %e1%1                       */
+                /** 0110 0001 1111 0000                xor     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1111 0000            xor     %0, %e1%1                       */",
+                           "/** 0110 0001 1111 0000            xor     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xor    %0, %e1%1");
-#line 1226 "rl78-decode.opc"
+                SYNTAX("xor    %0, %e1");
+#line 1251 "rl78-decode.opc"
                 ID(xor); DR(A); SM2(HL, B, 0); Fz;
               
               }
             break;
           case 0xf2:
               {
-                /** 0110 0001 1111 0010                xor     %0, %e1%1                       */
+                /** 0110 0001 1111 0010                xor     %0, %e1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1111 0010            xor     %0, %e1%1                       */",
+                           "/** 0110 0001 1111 0010            xor     %0, %e1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xor    %0, %e1%1");
-#line 1232 "rl78-decode.opc"
+                SYNTAX("xor    %0, %e1");
+#line 1257 "rl78-decode.opc"
                 ID(xor); DR(A); SM2(HL, C, 0); Fz;
               
               }
@@ -3099,7 +3121,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1079 "rl78-decode.opc"
+#line 1104 "rl78-decode.opc"
                 ID(skip); COND(NH);
               
               }
@@ -3114,22 +3136,22 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1082 "rl78-decode.opc"
+#line 1107 "rl78-decode.opc"
                 ID(skip); COND(NZ);
               
               }
             break;
           case 0xf9:
               {
-                /** 0110 0001 1111 1001                mov     %e0%0, %1                       */
+                /** 0110 0001 1111 1001                mov     %e0, %1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1111 1001            mov     %e0%0, %1                       */",
+                           "/** 0110 0001 1111 1001            mov     %e0, %1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("mov    %e0%0, %1");
-#line 615 "rl78-decode.opc"
+                SYNTAX("mov    %e0, %1");
+#line 636 "rl78-decode.opc"
                 ID(mov); DM2(HL, C, 0); SR(A);
               
               }
@@ -3144,7 +3166,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rorc   %0, %1");
-#line 1001 "rl78-decode.opc"
+#line 1026 "rl78-decode.opc"
                 ID(rorc); DR(A); SC(1);
               
               /*----------------------------------------------------------------------*/
@@ -3164,22 +3186,22 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("reti");
-#line 981 "rl78-decode.opc"
+#line 1006 "rl78-decode.opc"
                 ID(reti);
               
               }
             break;
           case 0xfd:
               {
-                /** 0110 0001 1111 1101        stop                                    */
+                /** 0110 0001 1111 1101        stop                                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1111 1101    stop                                    */",
+                           "/** 0110 0001 1111 1101    stop                                            */",
                            op[0], op[1]);
                   }
                 SYNTAX("stop");
-#line 1090 "rl78-decode.opc"
+#line 1115 "rl78-decode.opc"
                 ID(stop);
               
               /*----------------------------------------------------------------------*/
@@ -3191,30 +3213,30 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0x68:
         {
-          /** 0110 1000                        movw    %e0%0, %1                       */
+          /** 0110 1000                        movw    %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0110 1000                    movw    %e0%0, %1                       */",
+                     "/** 0110 1000                    movw    %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %e0%0, %1");
-#line 850 "rl78-decode.opc"
+          SYNTAX("movw %e0, %1");
+#line 874 "rl78-decode.opc"
           ID(mov); W(); DM(C, IMMU(2)); SR(AX);
         
         }
       break;
     case 0x69:
         {
-          /** 0110 1001                        movw    %0, %e1%1                       */
+          /** 0110 1001                        movw    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0110 1001                    movw    %0, %e1%1                       */",
+                     "/** 0110 1001                    movw    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%1");
-#line 841 "rl78-decode.opc"
+          SYNTAX("movw %0, %e1");
+#line 865 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(C, IMMU(2));
         
         }
@@ -3229,7 +3251,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, #%1");
-#line 943 "rl78-decode.opc"
+#line 968 "rl78-decode.opc"
           ID(or); DM(None, SADDR); SC(IMMU(1)); Fz;
         
         /*----------------------------------------------------------------------*/
@@ -3246,7 +3268,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, %1");
-#line 940 "rl78-decode.opc"
+#line 965 "rl78-decode.opc"
           ID(or); DR(A); SM(None, SADDR); Fz;
         
         }
@@ -3261,52 +3283,52 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, #%1");
-#line 931 "rl78-decode.opc"
+#line 956 "rl78-decode.opc"
           ID(or); DR(A); SC(IMMU(1)); Fz;
         
         }
       break;
     case 0x6d:
         {
-          /** 0110 1101                        or      %0, %e1%1                       */
+          /** 0110 1101                        or      %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0110 1101                    or      %0, %e1%1                       */",
+                     "/** 0110 1101                    or      %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("or   %0, %e1%1");
-#line 919 "rl78-decode.opc"
+          SYNTAX("or   %0, %e1");
+#line 944 "rl78-decode.opc"
           ID(or); DR(A); SM(HL, 0); Fz;
         
         }
       break;
     case 0x6e:
         {
-          /** 0110 1110                        or      %0, %e1%1                       */
+          /** 0110 1110                        or      %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0110 1110                    or      %0, %e1%1                       */",
+                     "/** 0110 1110                    or      %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("or   %0, %e1%1");
-#line 925 "rl78-decode.opc"
+          SYNTAX("or   %0, %ea1");
+#line 950 "rl78-decode.opc"
           ID(or); DR(A); SM(HL, IMMU(1)); Fz;
         
         }
       break;
     case 0x6f:
         {
-          /** 0110 1111                        or      %0, %e1%!1                      */
+          /** 0110 1111                        or      %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0110 1111                    or      %0, %e1%!1                      */",
+                     "/** 0110 1111                    or      %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("or   %0, %e1%!1");
-#line 916 "rl78-decode.opc"
+          SYNTAX("or   %0, %e!1");
+#line 941 "rl78-decode.opc"
           ID(or); DR(A); SM(None, IMMU(2)); Fz;
         
         }
@@ -3320,7 +3342,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x77:
         {
           /** 0111 0rba                        mov     %0, %1                          */
-#line 675 "rl78-decode.opc"
+#line 696 "rl78-decode.opc"
           int rba AU = op[0] & 0x07;
           if (trace)
             {
@@ -3330,7 +3352,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rba = 0x%x\n", rba);
             }
           SYNTAX("mov  %0, %1");
-#line 675 "rl78-decode.opc"
+#line 696 "rl78-decode.opc"
           ID(mov); DRB(rba); SR(A);
         
         }
@@ -3348,18 +3370,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x60:
           case 0x70:
               {
-                /** 0111 0001 0bit 0000                set1    %e0%!0                          */
-#line 1022 "rl78-decode.opc"
+                /** 0111 0001 0bit 0000                set1    %e!0                            */
+#line 1047 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 0bit 0000            set1    %e0%!0                          */",
+                           "/** 0111 0001 0bit 0000            set1    %e!0                            */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("set1   %e0%!0");
-#line 1022 "rl78-decode.opc"
+                SYNTAX("set1   %e!0");
+#line 1047 "rl78-decode.opc"
                 ID(mov); DM(None, IMMU(2)); DB(bit); SC(1);
               
               }
@@ -3374,7 +3396,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x71:
               {
                 /** 0111 0001 0bit 0001                mov1    %0, cy                          */
-#line 779 "rl78-decode.opc"
+#line 803 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3384,7 +3406,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   %0, cy");
-#line 779 "rl78-decode.opc"
+#line 803 "rl78-decode.opc"
                 ID(mov); DM(None, SADDR); DB(bit); SCY();
               
               }
@@ -3399,7 +3421,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x72:
               {
                 /** 0111 0001 0bit 0010                set1    %0                              */
-#line 1040 "rl78-decode.opc"
+#line 1065 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3409,7 +3431,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %0");
-#line 1040 "rl78-decode.opc"
+#line 1065 "rl78-decode.opc"
                 ID(mov); DM(None, SADDR); DB(bit); SC(1);
               
               /*----------------------------------------------------------------------*/
@@ -3426,7 +3448,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x73:
               {
                 /** 0111 0001 0bit 0011                clr1    %0                              */
-#line 435 "rl78-decode.opc"
+#line 456 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3436,7 +3458,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %0");
-#line 435 "rl78-decode.opc"
+#line 456 "rl78-decode.opc"
                 ID(mov); DM(None, SADDR); DB(bit); SC(0);
               
               /*----------------------------------------------------------------------*/
@@ -3453,7 +3475,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x74:
               {
                 /** 0111 0001 0bit 0100                mov1    cy, %1                          */
-#line 773 "rl78-decode.opc"
+#line 797 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3463,7 +3485,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   cy, %1");
-#line 773 "rl78-decode.opc"
+#line 797 "rl78-decode.opc"
                 ID(mov); DCY(); SM(None, SADDR); SB(bit);
               
               }
@@ -3478,7 +3500,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x75:
               {
                 /** 0111 0001 0bit 0101                and1    cy, %s1                         */
-#line 305 "rl78-decode.opc"
+#line 326 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3488,7 +3510,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("and1   cy, %s1");
-#line 305 "rl78-decode.opc"
+#line 326 "rl78-decode.opc"
                 ID(and); DCY(); SM(None, SADDR); SB(bit);
               
               /*----------------------------------------------------------------------*/
@@ -3508,7 +3530,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x76:
               {
                 /** 0111 0001 0bit 0110                or1     cy, %s1                         */
-#line 957 "rl78-decode.opc"
+#line 982 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3518,7 +3540,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("or1    cy, %s1");
-#line 957 "rl78-decode.opc"
+#line 982 "rl78-decode.opc"
                 ID(or); DCY(); SM(None, SADDR); SB(bit);
               
               /*----------------------------------------------------------------------*/
@@ -3535,7 +3557,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x77:
               {
                 /** 0111 0001 0bit 0111                xor1    cy, %s1                         */
-#line 1261 "rl78-decode.opc"
+#line 1286 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3545,7 +3567,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("xor1   cy, %s1");
-#line 1261 "rl78-decode.opc"
+#line 1286 "rl78-decode.opc"
                 ID(xor); DCY(); SM(None, SADDR); SB(bit);
               
               /*----------------------------------------------------------------------*/
@@ -3561,18 +3583,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x68:
           case 0x78:
               {
-                /** 0111 0001 0bit 1000                clr1    %e0%!0                          */
-#line 417 "rl78-decode.opc"
+                /** 0111 0001 0bit 1000                clr1    %e!0                            */
+#line 438 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 0bit 1000            clr1    %e0%!0                          */",
+                           "/** 0111 0001 0bit 1000            clr1    %e!0                            */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("clr1   %e0%!0");
-#line 417 "rl78-decode.opc"
+                SYNTAX("clr1   %e!0");
+#line 438 "rl78-decode.opc"
                 ID(mov); DM(None, IMMU(2)); DB(bit); SC(0);
               
               }
@@ -3587,7 +3609,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x79:
               {
                 /** 0111 0001 0bit 1001                mov1    %s0, cy                         */
-#line 782 "rl78-decode.opc"
+#line 806 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3597,7 +3619,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   %s0, cy");
-#line 782 "rl78-decode.opc"
+#line 806 "rl78-decode.opc"
                 ID(mov); DM(None, SFR); DB(bit); SCY();
               
               /*----------------------------------------------------------------------*/
@@ -3614,7 +3636,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7a:
               {
                 /** 0111 0001 0bit 1010                set1    %s0                             */
-#line 1034 "rl78-decode.opc"
+#line 1059 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3624,7 +3646,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %s0");
-#line 1034 "rl78-decode.opc"
+#line 1059 "rl78-decode.opc"
                 op0 = SFR;
                 ID(mov); DM(None, op0); DB(bit); SC(1);
                 if (op0 == RL78_SFR_PSW && bit == 7)
@@ -3642,7 +3664,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7b:
               {
                 /** 0111 0001 0bit 1011                clr1    %s0                             */
-#line 429 "rl78-decode.opc"
+#line 450 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3652,7 +3674,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %s0");
-#line 429 "rl78-decode.opc"
+#line 450 "rl78-decode.opc"
                 op0 = SFR;
                 ID(mov); DM(None, op0); DB(bit); SC(0);
                 if (op0 == RL78_SFR_PSW && bit == 7)
@@ -3670,7 +3692,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7c:
               {
                 /** 0111 0001 0bit 1100                mov1    cy, %s1                         */
-#line 776 "rl78-decode.opc"
+#line 800 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3680,7 +3702,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   cy, %s1");
-#line 776 "rl78-decode.opc"
+#line 800 "rl78-decode.opc"
                 ID(mov); DCY(); SM(None, SFR); SB(bit);
               
               }
@@ -3695,7 +3717,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7d:
               {
                 /** 0111 0001 0bit 1101                and1    cy, %s1                         */
-#line 302 "rl78-decode.opc"
+#line 323 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3705,7 +3727,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("and1   cy, %s1");
-#line 302 "rl78-decode.opc"
+#line 323 "rl78-decode.opc"
                 ID(and); DCY(); SM(None, SFR); SB(bit);
               
               }
@@ -3720,7 +3742,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7e:
               {
                 /** 0111 0001 0bit 1110                or1     cy, %s1                         */
-#line 954 "rl78-decode.opc"
+#line 979 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3730,7 +3752,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("or1    cy, %s1");
-#line 954 "rl78-decode.opc"
+#line 979 "rl78-decode.opc"
                 ID(or); DCY(); SM(None, SFR); SB(bit);
               
               }
@@ -3745,7 +3767,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7f:
               {
                 /** 0111 0001 0bit 1111                xor1    cy, %s1                         */
-#line 1258 "rl78-decode.opc"
+#line 1283 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3755,7 +3777,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("xor1   cy, %s1");
-#line 1258 "rl78-decode.opc"
+#line 1283 "rl78-decode.opc"
                 ID(xor); DCY(); SM(None, SFR); SB(bit);
               
               }
@@ -3770,7 +3792,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("set1   cy");
-#line 1031 "rl78-decode.opc"
+#line 1056 "rl78-decode.opc"
                 ID(mov); DCY(); SC(1);
               
               }
@@ -3784,18 +3806,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe1:
           case 0xf1:
               {
-                /** 0111 0001 1bit 0001                mov1    %e0%0, cy                       */
-#line 761 "rl78-decode.opc"
+                /** 0111 0001 1bit 0001                mov1    %e0, cy                         */
+#line 785 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 0001            mov1    %e0%0, cy                       */",
+                           "/** 0111 0001 1bit 0001            mov1    %e0, cy                         */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("mov1   %e0%0, cy");
-#line 761 "rl78-decode.opc"
+                SYNTAX("mov1   %e0, cy");
+#line 785 "rl78-decode.opc"
                 ID(mov); DM(HL, 0); DB(bit); SCY();
               
               }
@@ -3809,18 +3831,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe2:
           case 0xf2:
               {
-                /** 0111 0001 1bit 0010                set1    %e0%0                           */
-#line 1025 "rl78-decode.opc"
+                /** 0111 0001 1bit 0010                set1    %e0                             */
+#line 1050 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 0010            set1    %e0%0                           */",
+                           "/** 0111 0001 1bit 0010            set1    %e0                             */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("set1   %e0%0");
-#line 1025 "rl78-decode.opc"
+                SYNTAX("set1   %e0");
+#line 1050 "rl78-decode.opc"
                 ID(mov); DM(HL, 0); DB(bit); SC(1);
               
               }
@@ -3834,18 +3856,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe3:
           case 0xf3:
               {
-                /** 0111 0001 1bit 0011                clr1    %e0%0                           */
-#line 420 "rl78-decode.opc"
+                /** 0111 0001 1bit 0011                clr1    %e0                             */
+#line 441 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 0011            clr1    %e0%0                           */",
+                           "/** 0111 0001 1bit 0011            clr1    %e0                             */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("clr1   %e0%0");
-#line 420 "rl78-decode.opc"
+                SYNTAX("clr1   %e0");
+#line 441 "rl78-decode.opc"
                 ID(mov); DM(HL, 0); DB(bit); SC(0);
               
               }
@@ -3859,18 +3881,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe4:
           case 0xf4:
               {
-                /** 0111 0001 1bit 0100                mov1    cy, %e1%1                       */
-#line 767 "rl78-decode.opc"
+                /** 0111 0001 1bit 0100                mov1    cy, %e1                         */
+#line 791 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 0100            mov1    cy, %e1%1                       */",
+                           "/** 0111 0001 1bit 0100            mov1    cy, %e1                         */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("mov1   cy, %e1%1");
-#line 767 "rl78-decode.opc"
+                SYNTAX("mov1   cy, %e1");
+#line 791 "rl78-decode.opc"
                 ID(mov); DCY(); SM(HL, 0); SB(bit);
               
               }
@@ -3884,18 +3906,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe5:
           case 0xf5:
               {
-                /** 0111 0001 1bit 0101                and1    cy, %e1%1                       */
-#line 296 "rl78-decode.opc"
+                /** 0111 0001 1bit 0101                and1    cy, %e1                 */
+#line 317 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 0101            and1    cy, %e1%1                       */",
+                           "/** 0111 0001 1bit 0101            and1    cy, %e1                 */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("and1   cy, %e1%1");
-#line 296 "rl78-decode.opc"
+                SYNTAX("and1   cy, %e1");
+#line 317 "rl78-decode.opc"
                 ID(and); DCY(); SM(HL, 0); SB(bit);
               
               }
@@ -3909,18 +3931,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe6:
           case 0xf6:
               {
-                /** 0111 0001 1bit 0110                or1     cy, %e1%1                       */
-#line 948 "rl78-decode.opc"
+                /** 0111 0001 1bit 0110                or1     cy, %e1                         */
+#line 973 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 0110            or1     cy, %e1%1                       */",
+                           "/** 0111 0001 1bit 0110            or1     cy, %e1                         */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("or1    cy, %e1%1");
-#line 948 "rl78-decode.opc"
+                SYNTAX("or1    cy, %e1");
+#line 973 "rl78-decode.opc"
                 ID(or); DCY(); SM(HL, 0); SB(bit);
               
               }
@@ -3934,18 +3956,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe7:
           case 0xf7:
               {
-                /** 0111 0001 1bit 0111                xor1    cy, %e1%1                       */
-#line 1252 "rl78-decode.opc"
+                /** 0111 0001 1bit 0111                xor1    cy, %e1                         */
+#line 1277 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 0111            xor1    cy, %e1%1                       */",
+                           "/** 0111 0001 1bit 0111            xor1    cy, %e1                         */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("xor1   cy, %e1%1");
-#line 1252 "rl78-decode.opc"
+                SYNTAX("xor1   cy, %e1");
+#line 1277 "rl78-decode.opc"
                 ID(xor); DCY(); SM(HL, 0); SB(bit);
               
               }
@@ -3960,7 +3982,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("clr1   cy");
-#line 426 "rl78-decode.opc"
+#line 447 "rl78-decode.opc"
                 ID(mov); DCY(); SC(0);
               
               }
@@ -3974,18 +3996,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xe9:
           case 0xf9:
               {
-                /** 0111 0001 1bit 1001                mov1    %e0%0, cy                       */
-#line 764 "rl78-decode.opc"
+                /** 0111 0001 1bit 1001                mov1    %e0, cy                         */
+#line 788 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 1001            mov1    %e0%0, cy                       */",
+                           "/** 0111 0001 1bit 1001            mov1    %e0, cy                         */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("mov1   %e0%0, cy");
-#line 764 "rl78-decode.opc"
+                SYNTAX("mov1   %e0, cy");
+#line 788 "rl78-decode.opc"
                 ID(mov); DR(A); DB(bit); SCY();
               
               }
@@ -4000,7 +4022,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfa:
               {
                 /** 0111 0001 1bit 1010                set1    %0                              */
-#line 1028 "rl78-decode.opc"
+#line 1053 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4010,7 +4032,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %0");
-#line 1028 "rl78-decode.opc"
+#line 1053 "rl78-decode.opc"
                 ID(mov); DR(A); DB(bit); SC(1);
               
               }
@@ -4025,7 +4047,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfb:
               {
                 /** 0111 0001 1bit 1011                clr1    %0                              */
-#line 423 "rl78-decode.opc"
+#line 444 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4035,7 +4057,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %0");
-#line 423 "rl78-decode.opc"
+#line 444 "rl78-decode.opc"
                 ID(mov); DR(A); DB(bit); SC(0);
               
               }
@@ -4049,18 +4071,18 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xec:
           case 0xfc:
               {
-                /** 0111 0001 1bit 1100                mov1    cy, %e1%1                       */
-#line 770 "rl78-decode.opc"
+                /** 0111 0001 1bit 1100                mov1    cy, %e1                         */
+#line 794 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0111 0001 1bit 1100            mov1    cy, %e1%1                       */",
+                           "/** 0111 0001 1bit 1100            mov1    cy, %e1                         */",
                            op[0], op[1]);
                     printf ("  bit = 0x%x\n", bit);
                   }
-                SYNTAX("mov1   cy, %e1%1");
-#line 770 "rl78-decode.opc"
+                SYNTAX("mov1   cy, %e1");
+#line 794 "rl78-decode.opc"
                 ID(mov); DCY(); SR(A); SB(bit);
               
               }
@@ -4075,7 +4097,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfd:
               {
                 /** 0111 0001 1bit 1101                and1    cy, %1                          */
-#line 299 "rl78-decode.opc"
+#line 320 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4085,7 +4107,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("and1   cy, %1");
-#line 299 "rl78-decode.opc"
+#line 320 "rl78-decode.opc"
                 ID(and); DCY(); SR(A); SB(bit);
               
               }
@@ -4100,7 +4122,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfe:
               {
                 /** 0111 0001 1bit 1110                or1     cy, %1                          */
-#line 951 "rl78-decode.opc"
+#line 976 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4110,7 +4132,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("or1    cy, %1");
-#line 951 "rl78-decode.opc"
+#line 976 "rl78-decode.opc"
                 ID(or); DCY(); SR(A); SB(bit);
               
               }
@@ -4125,7 +4147,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xff:
               {
                 /** 0111 0001 1bit 1111                xor1    cy, %1                          */
-#line 1255 "rl78-decode.opc"
+#line 1280 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4135,7 +4157,7 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("xor1   cy, %1");
-#line 1255 "rl78-decode.opc"
+#line 1280 "rl78-decode.opc"
                 ID(xor); DCY(); SR(A); SB(bit);
               
               }
@@ -4150,7 +4172,7 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("not1   cy");
-#line 892 "rl78-decode.opc"
+#line 917 "rl78-decode.opc"
                 ID(xor); DCY(); SC(1);
               
               /*----------------------------------------------------------------------*/
@@ -4162,30 +4184,30 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0x78:
         {
-          /** 0111 1000                        movw    %e0%0, %1                       */
+          /** 0111 1000                        movw    %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0111 1000                    movw    %e0%0, %1                       */",
+                     "/** 0111 1000                    movw    %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %e0%0, %1");
-#line 853 "rl78-decode.opc"
+          SYNTAX("movw %e0, %1");
+#line 877 "rl78-decode.opc"
           ID(mov); W(); DM(BC, IMMU(2)); SR(AX);
         
         }
       break;
     case 0x79:
         {
-          /** 0111 1001                        movw    %0, %e1%1                       */
+          /** 0111 1001                        movw    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0111 1001                    movw    %0, %e1%1                       */",
+                     "/** 0111 1001                    movw    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%1");
-#line 844 "rl78-decode.opc"
+          SYNTAX("movw %0, %e1");
+#line 868 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(BC, IMMU(2));
         
         }
@@ -4200,7 +4222,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, #%1");
-#line 1247 "rl78-decode.opc"
+#line 1272 "rl78-decode.opc"
           ID(xor); DM(None, SADDR); SC(IMMU(1)); Fz;
         
         /*----------------------------------------------------------------------*/
@@ -4217,7 +4239,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, %1");
-#line 1244 "rl78-decode.opc"
+#line 1269 "rl78-decode.opc"
           ID(xor); DR(A); SM(None, SADDR); Fz;
         
         }
@@ -4232,52 +4254,52 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, #%1");
-#line 1235 "rl78-decode.opc"
+#line 1260 "rl78-decode.opc"
           ID(xor); DR(A); SC(IMMU(1)); Fz;
         
         }
       break;
     case 0x7d:
         {
-          /** 0111 1101                        xor     %0, %e1%1                       */
+          /** 0111 1101                        xor     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0111 1101                    xor     %0, %e1%1                       */",
+                     "/** 0111 1101                    xor     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("xor  %0, %e1%1");
-#line 1223 "rl78-decode.opc"
+          SYNTAX("xor  %0, %e1");
+#line 1248 "rl78-decode.opc"
           ID(xor); DR(A); SM(HL, 0); Fz;
         
         }
       break;
     case 0x7e:
         {
-          /** 0111 1110                        xor     %0, %e1%1                       */
+          /** 0111 1110                        xor     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0111 1110                    xor     %0, %e1%1                       */",
+                     "/** 0111 1110                    xor     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("xor  %0, %e1%1");
-#line 1229 "rl78-decode.opc"
+          SYNTAX("xor  %0, %ea1");
+#line 1254 "rl78-decode.opc"
           ID(xor); DR(A); SM(HL, IMMU(1)); Fz;
         
         }
       break;
     case 0x7f:
         {
-          /** 0111 1111                        xor     %0, %e1%!1                      */
+          /** 0111 1111                        xor     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0111 1111                    xor     %0, %e1%!1                      */",
+                     "/** 0111 1111                    xor     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("xor  %0, %e1%!1");
-#line 1220 "rl78-decode.opc"
+          SYNTAX("xor  %0, %e!1");
+#line 1245 "rl78-decode.opc"
           ID(xor); DR(A); SM(None, IMMU(2)); Fz;
         
         }
@@ -4292,7 +4314,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x87:
         {
           /** 1000 0reg                        inc     %0                              */
-#line 566 "rl78-decode.opc"
+#line 587 "rl78-decode.opc"
           int reg AU = op[0] & 0x07;
           if (trace)
             {
@@ -4302,82 +4324,82 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  reg = 0x%x\n", reg);
             }
           SYNTAX("inc  %0");
-#line 566 "rl78-decode.opc"
+#line 587 "rl78-decode.opc"
           ID(add); DRB(reg); SC(1); Fza;
         
         }
       break;
     case 0x88:
         {
-          /** 1000 1000                        mov     %0, %e1%1                       */
+          /** 1000 1000                        mov     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1000                    mov     %0, %e1%1                       */",
+                     "/** 1000 1000                    mov     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 645 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e1");
+#line 666 "rl78-decode.opc"
           ID(mov); DR(A); SM(SP, IMMU(1));
         
         }
       break;
     case 0x89:
         {
-          /** 1000 1001                        mov     %0, %e1%1                       */
+          /** 1000 1001                        mov     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1001                    mov     %0, %e1%1                       */",
+                     "/** 1000 1001                    mov     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 627 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e1");
+#line 648 "rl78-decode.opc"
           ID(mov); DR(A); SM(DE, 0);
         
         }
       break;
     case 0x8a:
         {
-          /** 1000 1010                        mov     %0, %e1%1                       */
+          /** 1000 1010                        mov     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1010                    mov     %0, %e1%1                       */",
+                     "/** 1000 1010                    mov     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 630 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e1");
+#line 651 "rl78-decode.opc"
           ID(mov); DR(A); SM(DE, IMMU(1));
         
         }
       break;
     case 0x8b:
         {
-          /** 1000 1011                        mov     %0, %e1%1                       */
+          /** 1000 1011                        mov     %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1011                    mov     %0, %e1%1                       */",
+                     "/** 1000 1011                    mov     %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 633 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e1");
+#line 654 "rl78-decode.opc"
           ID(mov); DR(A); SM(HL, 0);
         
         }
       break;
     case 0x8c:
         {
-          /** 1000 1100                        mov     %0, %e1%1                       */
+          /** 1000 1100                        mov     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1100                    mov     %0, %e1%1                       */",
+                     "/** 1000 1100                    mov     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%1");
-#line 636 "rl78-decode.opc"
+          SYNTAX("mov  %0, %ea1");
+#line 657 "rl78-decode.opc"
           ID(mov); DR(A); SM(HL, IMMU(1));
         
         }
@@ -4392,7 +4414,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 669 "rl78-decode.opc"
+#line 690 "rl78-decode.opc"
           ID(mov); DR(A); SM(None, SADDR);
         
         }
@@ -4407,22 +4429,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %s1");
-#line 666 "rl78-decode.opc"
+#line 687 "rl78-decode.opc"
           ID(mov); DR(A); SM(None, SFR);
         
         }
       break;
     case 0x8f:
         {
-          /** 1000 1111                        mov     %0, %e1%!1                      */
+          /** 1000 1111                        mov     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1111                    mov     %0, %e1%!1                      */",
+                     "/** 1000 1111                    mov     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%!1");
-#line 624 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e!1");
+#line 645 "rl78-decode.opc"
           ID(mov); DR(A); SM(None, IMMU(2));
         
         }
@@ -4437,7 +4459,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x97:
         {
           /** 1001 0reg                        dec     %0                              */
-#line 533 "rl78-decode.opc"
+#line 554 "rl78-decode.opc"
           int reg AU = op[0] & 0x07;
           if (trace)
             {
@@ -4447,7 +4469,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  reg = 0x%x\n", reg);
             }
           SYNTAX("dec  %0");
-#line 533 "rl78-decode.opc"
+#line 554 "rl78-decode.opc"
           ID(sub); DRB(reg); SC(1); Fza;
         
         }
@@ -4462,67 +4484,67 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 621 "rl78-decode.opc"
+#line 642 "rl78-decode.opc"
           ID(mov); DM(SP, IMMU(1)); SR(A);
         
         }
       break;
     case 0x99:
         {
-          /** 1001 1001                        mov     %e0%0,%1                        */
+          /** 1001 1001                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1001                    mov     %e0%0,%1                        */",
+                     "/** 1001 1001                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0,%1");
-#line 594 "rl78-decode.opc"
+          SYNTAX("mov  %e0%1");
+#line 615 "rl78-decode.opc"
           ID(mov); DM(DE, 0); SR(A);
         
         }
       break;
     case 0x9a:
         {
-          /** 1001 1010                        mov     %e0%0, %1                       */
+          /** 1001 1010                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1010                    mov     %e0%0, %1                       */",
+                     "/** 1001 1010                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, %1");
-#line 600 "rl78-decode.opc"
+          SYNTAX("mov  %e0, %1");
+#line 621 "rl78-decode.opc"
           ID(mov); DM(DE, IMMU(1)); SR(A);
         
         }
       break;
     case 0x9b:
         {
-          /** 1001 1011                        mov     %e0%0,%1                        */
+          /** 1001 1011                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1011                    mov     %e0%0,%1                        */",
+                     "/** 1001 1011                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0,%1");
-#line 603 "rl78-decode.opc"
+          SYNTAX("mov  %e0%1");
+#line 624 "rl78-decode.opc"
           ID(mov); DM(HL, 0); SR(A);
         
         }
       break;
     case 0x9c:
         {
-          /** 1001 1100                        mov     %e0%0, %1                       */
+          /** 1001 1100                        mov     %ea0, %1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1100                    mov     %e0%0, %1                       */",
+                     "/** 1001 1100                    mov     %ea0, %1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, %1");
-#line 612 "rl78-decode.opc"
+          SYNTAX("mov  %ea0, %1");
+#line 633 "rl78-decode.opc"
           ID(mov); DM(HL, IMMU(1)); SR(A);
         
         }
@@ -4537,7 +4559,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 726 "rl78-decode.opc"
+#line 747 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SR(A);
         
         }
@@ -4552,7 +4574,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 756 "rl78-decode.opc"
+#line 780 "rl78-decode.opc"
           ID(mov); DM(None, SFR); SR(A);
         
         /*----------------------------------------------------------------------*/
@@ -4561,30 +4583,30 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0x9f:
         {
-          /** 1001 1111                        mov     %e0%!0, %1                      */
+          /** 1001 1111                        mov     %e!0, %1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1111                    mov     %e0%!0, %1                      */",
+                     "/** 1001 1111                    mov     %e!0, %1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%!0, %1");
-#line 591 "rl78-decode.opc"
+          SYNTAX("mov  %e!0, %1");
+#line 612 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SR(A);
         
         }
       break;
     case 0xa0:
         {
-          /** 1010 0000                        inc     %e0%!0                          */
+          /** 1010 0000                        inc     %e!0                            */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 0000                    inc     %e0%!0                          */",
+                     "/** 1010 0000                    inc     %e!0                            */",
                      op[0]);
             }
-          SYNTAX("inc  %e0%!0");
-#line 560 "rl78-decode.opc"
+          SYNTAX("inc  %e!0");
+#line 581 "rl78-decode.opc"
           ID(add); DM(None, IMMU(2)); SC(1); Fza;
         
         }
@@ -4595,7 +4617,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xa7:
         {
           /** 1010 0rg1                        incw    %0                              */
-#line 580 "rl78-decode.opc"
+#line 601 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -4605,22 +4627,22 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("incw %0");
-#line 580 "rl78-decode.opc"
+#line 601 "rl78-decode.opc"
           ID(add); W(); DRW(rg); SC(1);
         
         }
       break;
     case 0xa2:
         {
-          /** 1010 0010                        incw    %e0%!0                          */
+          /** 1010 0010                        incw    %e!0                            */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 0010                    incw    %e0%!0                          */",
+                     "/** 1010 0010                    incw    %e!0                            */",
                      op[0]);
             }
-          SYNTAX("incw %e0%!0");
-#line 574 "rl78-decode.opc"
+          SYNTAX("incw %e!0");
+#line 595 "rl78-decode.opc"
           ID(add); W(); DM(None, IMMU(2)); SC(1);
         
         }
@@ -4635,7 +4657,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("inc  %0");
-#line 569 "rl78-decode.opc"
+#line 590 "rl78-decode.opc"
           ID(add); DM(None, SADDR); SC(1); Fza;
         
         /*----------------------------------------------------------------------*/
@@ -4652,7 +4674,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("incw %0");
-#line 583 "rl78-decode.opc"
+#line 604 "rl78-decode.opc"
           ID(add); W(); DM(None, SADDR); SC(1);
         
         /*----------------------------------------------------------------------*/
@@ -4669,67 +4691,67 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %1");
-#line 826 "rl78-decode.opc"
+#line 850 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(SP, IMMU(1));
         
         }
       break;
     case 0xa9:
         {
-          /** 1010 1001                        movw    %0, %e1%1                       */
+          /** 1010 1001                        movw    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1001                    movw    %0, %e1%1                       */",
+                     "/** 1010 1001                    movw    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%1");
-#line 814 "rl78-decode.opc"
+          SYNTAX("movw %0, %e1");
+#line 838 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(DE, 0);
         
         }
       break;
     case 0xaa:
         {
-          /** 1010 1010                        movw    %0, %e1%1                       */
+          /** 1010 1010                        movw    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1010                    movw    %0, %e1%1                       */",
+                     "/** 1010 1010                    movw    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%1");
-#line 817 "rl78-decode.opc"
+          SYNTAX("movw %0, %e1");
+#line 841 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(DE, IMMU(1));
         
         }
       break;
     case 0xab:
         {
-          /** 1010 1011                        movw    %0, %e1%1                       */
+          /** 1010 1011                        movw    %0, %e1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1011                    movw    %0, %e1%1                       */",
+                     "/** 1010 1011                    movw    %0, %e1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%1");
-#line 820 "rl78-decode.opc"
+          SYNTAX("movw %0, %e1");
+#line 844 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(HL, 0);
         
         }
       break;
     case 0xac:
         {
-          /** 1010 1100                        movw    %0, %e1%1                       */
+          /** 1010 1100                        movw    %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1100                    movw    %0, %e1%1                       */",
+                     "/** 1010 1100                    movw    %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%1");
-#line 823 "rl78-decode.opc"
+          SYNTAX("movw %0, %ea1");
+#line 847 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(HL, IMMU(1));
         
         }
@@ -4744,7 +4766,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %1");
-#line 856 "rl78-decode.opc"
+#line 880 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(None, SADDR);
         
         }
@@ -4759,22 +4781,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %s1");
-#line 859 "rl78-decode.opc"
+#line 883 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(None, SFR);
         
         }
       break;
     case 0xaf:
         {
-          /** 1010 1111                        movw    %0, %e1%!1                      */
+          /** 1010 1111                        movw    %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1111                    movw    %0, %e1%!1                      */",
+                     "/** 1010 1111                    movw    %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1%!1");
-#line 810 "rl78-decode.opc"
+          SYNTAX("movw %0, %e!1");
+#line 834 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(None, IMMU(2));
         
         
@@ -4782,15 +4804,15 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0xb0:
         {
-          /** 1011 0000                        dec     %e0%!0                          */
+          /** 1011 0000                        dec     %e!0                            */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 0000                    dec     %e0%!0                          */",
+                     "/** 1011 0000                    dec     %e!0                            */",
                      op[0]);
             }
-          SYNTAX("dec  %e0%!0");
-#line 527 "rl78-decode.opc"
+          SYNTAX("dec  %e!0");
+#line 548 "rl78-decode.opc"
           ID(sub); DM(None, IMMU(2)); SC(1); Fza;
         
         }
@@ -4801,7 +4823,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xb7:
         {
           /** 1011 0rg1                        decw    %0                              */
-#line 547 "rl78-decode.opc"
+#line 568 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -4811,22 +4833,22 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("decw %0");
-#line 547 "rl78-decode.opc"
+#line 568 "rl78-decode.opc"
           ID(sub); W(); DRW(rg); SC(1);
         
         }
       break;
     case 0xb2:
         {
-          /** 1011 0010                        decw    %e0%!0                          */
+          /** 1011 0010                        decw    %e!0                            */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 0010                    decw    %e0%!0                          */",
+                     "/** 1011 0010                    decw    %e!0                            */",
                      op[0]);
             }
-          SYNTAX("decw %e0%!0");
-#line 541 "rl78-decode.opc"
+          SYNTAX("decw %e!0");
+#line 562 "rl78-decode.opc"
           ID(sub); W(); DM(None, IMMU(2)); SC(1);
         
         }
@@ -4841,7 +4863,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("dec  %0");
-#line 536 "rl78-decode.opc"
+#line 557 "rl78-decode.opc"
           ID(sub); DM(None, SADDR); SC(1); Fza;
         
         /*----------------------------------------------------------------------*/
@@ -4858,7 +4880,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("decw %0");
-#line 550 "rl78-decode.opc"
+#line 571 "rl78-decode.opc"
           ID(sub); W(); DM(None, SADDR); SC(1);
         
         /*----------------------------------------------------------------------*/
@@ -4875,67 +4897,67 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %1");
-#line 807 "rl78-decode.opc"
+#line 831 "rl78-decode.opc"
           ID(mov); W(); DM(SP, IMMU(1)); SR(AX);
         
         }
       break;
     case 0xb9:
         {
-          /** 1011 1001                        movw    %e0%0, %1                       */
+          /** 1011 1001                        movw    %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1001                    movw    %e0%0, %1                       */",
+                     "/** 1011 1001                    movw    %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %e0%0, %1");
-#line 795 "rl78-decode.opc"
+          SYNTAX("movw %e0, %1");
+#line 819 "rl78-decode.opc"
           ID(mov); W(); DM(DE, 0); SR(AX);
         
         }
       break;
     case 0xba:
         {
-          /** 1011 1010                        movw    %e0%0, %1                       */
+          /** 1011 1010                        movw    %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1010                    movw    %e0%0, %1                       */",
+                     "/** 1011 1010                    movw    %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %e0%0, %1");
-#line 798 "rl78-decode.opc"
+          SYNTAX("movw %e0, %1");
+#line 822 "rl78-decode.opc"
           ID(mov); W(); DM(DE, IMMU(1)); SR(AX);
         
         }
       break;
     case 0xbb:
         {
-          /** 1011 1011                        movw    %e0%0, %1                       */
+          /** 1011 1011                        movw    %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1011                    movw    %e0%0, %1                       */",
+                     "/** 1011 1011                    movw    %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %e0%0, %1");
-#line 801 "rl78-decode.opc"
+          SYNTAX("movw %e0, %1");
+#line 825 "rl78-decode.opc"
           ID(mov); W(); DM(HL, 0); SR(AX);
         
         }
       break;
     case 0xbc:
         {
-          /** 1011 1100                        movw    %e0%0, %1                       */
+          /** 1011 1100                        movw    %ea0, %1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1100                    movw    %e0%0, %1                       */",
+                     "/** 1011 1100                    movw    %ea0, %1                        */",
                      op[0]);
             }
-          SYNTAX("movw %e0%0, %1");
-#line 804 "rl78-decode.opc"
+          SYNTAX("movw %ea0, %1");
+#line 828 "rl78-decode.opc"
           ID(mov); W(); DM(HL, IMMU(1)); SR(AX);
         
         }
@@ -4950,7 +4972,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %1");
-#line 871 "rl78-decode.opc"
+#line 895 "rl78-decode.opc"
           ID(mov); W(); DM(None, SADDR); SR(AX);
         
         }
@@ -4965,7 +4987,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %1");
-#line 877 "rl78-decode.opc"
+#line 901 "rl78-decode.opc"
           ID(mov); W(); DM(None, SFR); SR(AX);
         
         /*----------------------------------------------------------------------*/
@@ -4974,15 +4996,15 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0xbf:
         {
-          /** 1011 1111                        movw    %e0%!0, %1                      */
+          /** 1011 1111                        movw    %e!0, %1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1111                    movw    %e0%!0, %1                      */",
+                     "/** 1011 1111                    movw    %e!0, %1                        */",
                      op[0]);
             }
-          SYNTAX("movw %e0%!0, %1");
-#line 792 "rl78-decode.opc"
+          SYNTAX("movw %e!0, %1");
+#line 816 "rl78-decode.opc"
           ID(mov); W(); DM(None, IMMU(2)); SR(AX);
         
         }
@@ -4993,7 +5015,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xc6:
         {
           /** 1100 0rg0                        pop     %0                              */
-#line 962 "rl78-decode.opc"
+#line 987 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -5003,7 +5025,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("pop  %0");
-#line 962 "rl78-decode.opc"
+#line 987 "rl78-decode.opc"
           ID(mov); W(); DRW(rg); SPOP();
         
         }
@@ -5014,7 +5036,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xc7:
         {
           /** 1100 0rg1                        push    %1                              */
-#line 970 "rl78-decode.opc"
+#line 995 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -5024,7 +5046,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("push %1");
-#line 970 "rl78-decode.opc"
+#line 995 "rl78-decode.opc"
           ID(mov); W(); DPUSH(); SRW(rg);
         
         }
@@ -5039,7 +5061,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, #%1");
-#line 618 "rl78-decode.opc"
+#line 639 "rl78-decode.opc"
           ID(mov); DM(SP, IMMU(1)); SC(IMMU(1));
         
         }
@@ -5054,22 +5076,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, #%1");
-#line 868 "rl78-decode.opc"
+#line 892 "rl78-decode.opc"
           ID(mov); W(); DM(None, SADDR); SC(IMMU(2));
         
         }
       break;
     case 0xca:
         {
-          /** 1100 1010                        mov     %e0%0, #%1                      */
+          /** 1100 1010                        mov     %e0, #%1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1100 1010                    mov     %e0%0, #%1                      */",
+                     "/** 1100 1010                    mov     %e0, #%1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, #%1");
-#line 597 "rl78-decode.opc"
+          SYNTAX("mov  %e0, #%1");
+#line 618 "rl78-decode.opc"
           ID(mov); DM(DE, IMMU(1)); SC(IMMU(1));
         
         }
@@ -5084,22 +5106,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, #%1");
-#line 874 "rl78-decode.opc"
+#line 898 "rl78-decode.opc"
           ID(mov); W(); DM(None, SFR); SC(IMMU(2));
         
         }
       break;
     case 0xcc:
         {
-          /** 1100 1100                        mov     %e0%0, #%1                      */
+          /** 1100 1100                        mov     %ea0, #%1                       */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1100 1100                    mov     %e0%0, #%1                      */",
+                     "/** 1100 1100                    mov     %ea0, #%1                       */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%0, #%1");
-#line 609 "rl78-decode.opc"
+          SYNTAX("mov  %ea0, #%1");
+#line 630 "rl78-decode.opc"
           ID(mov); DM(HL, IMMU(1)); SC(IMMU(1));
         
         }
@@ -5114,7 +5136,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, #%1");
-#line 723 "rl78-decode.opc"
+#line 744 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SC(IMMU(1));
         
         }
@@ -5129,11 +5151,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %s0, #%1");
-#line 729 "rl78-decode.opc"
+#line 750 "rl78-decode.opc"
           op0 = SFR;
           op1 = IMMU(1);
           ID(mov); DM(None, op0); SC(op1);
-          if (op0 == 0xffffb)
+          if (op0 == 0xffffb && isa == RL78_ISA_G14)
             switch (op1)
               {
               case 0x01:
@@ -5146,7 +5168,7 @@ rl78_decode_opcode (unsigned long pc AU,
                rl78->syntax = "divhu"; ID(divhu);
                break;
               case 0x04:
-               rl78->syntax = "divwu"; ID(divwu);
+               rl78->syntax = "divwu <old-encoding>"; ID(divwu);
                break;
               case 0x05:
                rl78->syntax = "machu"; ID(machu);
@@ -5154,21 +5176,24 @@ rl78_decode_opcode (unsigned long pc AU,
               case 0x06:
                rl78->syntax = "mach"; ID(mach);
                break;
+              case 0x0b:
+               rl78->syntax = "divwu"; ID(divwu);
+               break;
               }
         
         }
       break;
     case 0xcf:
         {
-          /** 1100 1111                        mov     %e0%!0, #%1                     */
+          /** 1100 1111                        mov     %e!0, #%1                       */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1100 1111                    mov     %e0%!0, #%1                     */",
+                     "/** 1100 1111                    mov     %e!0, #%1                       */",
                      op[0]);
             }
-          SYNTAX("mov  %e0%!0, #%1");
-#line 588 "rl78-decode.opc"
+          SYNTAX("mov  %e!0, #%1");
+#line 609 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SC(IMMU(1));
         
         }
@@ -5179,7 +5204,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xd3:
         {
           /** 1101 00rg                        cmp0    %0                              */
-#line 497 "rl78-decode.opc"
+#line 518 "rl78-decode.opc"
           int rg AU = op[0] & 0x03;
           if (trace)
             {
@@ -5189,7 +5214,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("cmp0 %0");
-#line 497 "rl78-decode.opc"
+#line 518 "rl78-decode.opc"
           ID(cmp); DRB(rg); SC(0); Fzac;
         
         }
@@ -5204,7 +5229,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp0 %0");
-#line 500 "rl78-decode.opc"
+#line 521 "rl78-decode.opc"
           ID(cmp); DM(None, SADDR); SC(0); Fzac;
         
         /*----------------------------------------------------------------------*/
@@ -5213,15 +5238,15 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0xd5:
         {
-          /** 1101 0101                        cmp0    %e0%!0                          */
+          /** 1101 0101                        cmp0    %e!0                            */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1101 0101                    cmp0    %e0%!0                          */",
+                     "/** 1101 0101                    cmp0    %e!0                            */",
                      op[0]);
             }
-          SYNTAX("cmp0 %e0%!0");
-#line 494 "rl78-decode.opc"
+          SYNTAX("cmp0 %e!0");
+#line 515 "rl78-decode.opc"
           ID(cmp); DM(None, IMMU(2)); SC(0); Fzac;
         
         }
@@ -5236,8 +5261,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mulu x");
-#line 882 "rl78-decode.opc"
-          ID(mulu);
+#line 906 "rl78-decode.opc"
+          if (isa == RL78_ISA_G14)
+            ID(mulu);
         
         /*----------------------------------------------------------------------*/
         
@@ -5253,7 +5279,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("ret");
-#line 978 "rl78-decode.opc"
+#line 1003 "rl78-decode.opc"
           ID(ret);
         
         }
@@ -5268,22 +5294,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 690 "rl78-decode.opc"
+#line 711 "rl78-decode.opc"
           ID(mov); DR(X); SM(None, SADDR);
         
         }
       break;
     case 0xd9:
         {
-          /** 1101 1001                        mov     %0, %e1%!1                      */
+          /** 1101 1001                        mov     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1101 1001                    mov     %0, %e1%!1                      */",
+                     "/** 1101 1001                    mov     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%!1");
-#line 687 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e!1");
+#line 708 "rl78-decode.opc"
           ID(mov); DR(X); SM(None, IMMU(2));
         
         }
@@ -5293,7 +5319,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xfa:
         {
           /** 11ra 1010                        movw    %0, %1                          */
-#line 865 "rl78-decode.opc"
+#line 889 "rl78-decode.opc"
           int ra AU = (op[0] >> 4) & 0x03;
           if (trace)
             {
@@ -5303,7 +5329,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("movw %0, %1");
-#line 865 "rl78-decode.opc"
+#line 889 "rl78-decode.opc"
           ID(mov); W(); DRW(ra); SM(None, SADDR);
         
         }
@@ -5312,18 +5338,18 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xeb:
     case 0xfb:
         {
-          /** 11ra 1011                        movw    %0, %e1%!1                      */
-#line 862 "rl78-decode.opc"
+          /** 11ra 1011                        movw    %0, %e!1                        */
+#line 886 "rl78-decode.opc"
           int ra AU = (op[0] >> 4) & 0x03;
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 11ra 1011                    movw    %0, %e1%!1                      */",
+                     "/** 11ra 1011                    movw    %0, %e!1                        */",
                      op[0]);
               printf ("  ra = 0x%x\n", ra);
             }
-          SYNTAX("movw %0, %e1%!1");
-#line 862 "rl78-decode.opc"
+          SYNTAX("movw %0, %e!1");
+#line 886 "rl78-decode.opc"
           ID(mov); W(); DRW(ra); SM(None, IMMU(2));
         
         }
@@ -5338,7 +5364,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bc   $%a0");
-#line 313 "rl78-decode.opc"
+#line 334 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(C);
         
         }
@@ -5353,7 +5379,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bz   $%a0");
-#line 325 "rl78-decode.opc"
+#line 346 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(Z);
         
         }
@@ -5368,7 +5394,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bnc  $%a0");
-#line 316 "rl78-decode.opc"
+#line 337 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(NC);
         
         }
@@ -5383,7 +5409,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bnz  $%a0");
-#line 328 "rl78-decode.opc"
+#line 349 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(NZ);
         
         /*----------------------------------------------------------------------*/
@@ -5396,7 +5422,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xe3:
         {
           /** 1110 00rg                        oneb    %0                              */
-#line 900 "rl78-decode.opc"
+#line 925 "rl78-decode.opc"
           int rg AU = op[0] & 0x03;
           if (trace)
             {
@@ -5406,7 +5432,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("oneb %0");
-#line 900 "rl78-decode.opc"
+#line 925 "rl78-decode.opc"
           ID(mov); DRB(rg); SC(1);
         
         }
@@ -5421,7 +5447,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("oneb %0");
-#line 903 "rl78-decode.opc"
+#line 928 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SC(1);
         
         /*----------------------------------------------------------------------*/
@@ -5430,15 +5456,15 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0xe5:
         {
-          /** 1110 0101                        oneb    %e0%!0                          */
+          /** 1110 0101                        oneb    %e!0                            */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1110 0101                    oneb    %e0%!0                          */",
+                     "/** 1110 0101                    oneb    %e!0                            */",
                      op[0]);
             }
-          SYNTAX("oneb %e0%!0");
-#line 897 "rl78-decode.opc"
+          SYNTAX("oneb %e!0");
+#line 922 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SC(1);
         
         }
@@ -5453,7 +5479,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("onew %0");
-#line 908 "rl78-decode.opc"
+#line 933 "rl78-decode.opc"
           ID(mov); DR(AX); SC(1);
         
         }
@@ -5468,7 +5494,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("onew %0");
-#line 911 "rl78-decode.opc"
+#line 936 "rl78-decode.opc"
           ID(mov); DR(BC); SC(1);
         
         /*----------------------------------------------------------------------*/
@@ -5485,22 +5511,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 678 "rl78-decode.opc"
+#line 699 "rl78-decode.opc"
           ID(mov); DR(B); SM(None, SADDR);
         
         }
       break;
     case 0xe9:
         {
-          /** 1110 1001                        mov     %0, %e1%!1                      */
+          /** 1110 1001                        mov     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1110 1001                    mov     %0, %e1%!1                      */",
+                     "/** 1110 1001                    mov     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%!1");
-#line 672 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e!1");
+#line 693 "rl78-decode.opc"
           ID(mov); DR(B); SM(None, IMMU(2));
         
         }
@@ -5515,7 +5541,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   !%!a0");
-#line 347 "rl78-decode.opc"
+#line 368 "rl78-decode.opc"
           ID(branch); DC(IMMU(3));
         
         }
@@ -5530,7 +5556,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   %!a0");
-#line 350 "rl78-decode.opc"
+#line 371 "rl78-decode.opc"
           ID(branch); DC(IMMU(2));
         
         }
@@ -5545,7 +5571,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   $%!a0");
-#line 353 "rl78-decode.opc"
+#line 374 "rl78-decode.opc"
           ID(branch); DC(pc+IMMS(2)+3);
         
         }
@@ -5560,7 +5586,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   $%a0");
-#line 356 "rl78-decode.opc"
+#line 377 "rl78-decode.opc"
           ID(branch); DC(pc+IMMS(1)+2);
         
         }
@@ -5571,7 +5597,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xf3:
         {
           /** 1111 00rg                        clrb    %0                              */
-#line 443 "rl78-decode.opc"
+#line 464 "rl78-decode.opc"
           int rg AU = op[0] & 0x03;
           if (trace)
             {
@@ -5581,7 +5607,7 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("clrb %0");
-#line 443 "rl78-decode.opc"
+#line 464 "rl78-decode.opc"
           ID(mov); DRB(rg); SC(0);
         
         }
@@ -5596,7 +5622,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("clrb %0");
-#line 446 "rl78-decode.opc"
+#line 467 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SC(0);
         
         /*----------------------------------------------------------------------*/
@@ -5605,15 +5631,15 @@ rl78_decode_opcode (unsigned long pc AU,
       break;
     case 0xf5:
         {
-          /** 1111 0101                        clrb    %e0%!0                          */
+          /** 1111 0101                        clrb    %e!0                            */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1111 0101                    clrb    %e0%!0                          */",
+                     "/** 1111 0101                    clrb    %e!0                            */",
                      op[0]);
             }
-          SYNTAX("clrb %e0%!0");
-#line 440 "rl78-decode.opc"
+          SYNTAX("clrb %e!0");
+#line 461 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SC(0);
         
         }
@@ -5628,7 +5654,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("clrw %0");
-#line 451 "rl78-decode.opc"
+#line 472 "rl78-decode.opc"
           ID(mov); DR(AX); SC(0);
         
         }
@@ -5643,7 +5669,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("clrw %0");
-#line 454 "rl78-decode.opc"
+#line 475 "rl78-decode.opc"
           ID(mov); DR(BC); SC(0);
         
         /*----------------------------------------------------------------------*/
@@ -5660,22 +5686,22 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 684 "rl78-decode.opc"
+#line 705 "rl78-decode.opc"
           ID(mov); DR(C); SM(None, SADDR);
         
         }
       break;
     case 0xf9:
         {
-          /** 1111 1001                        mov     %0, %e1%!1                      */
+          /** 1111 1001                        mov     %0, %e!1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1111 1001                    mov     %0, %e1%!1                      */",
+                     "/** 1111 1001                    mov     %0, %e!1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1%!1");
-#line 681 "rl78-decode.opc"
+          SYNTAX("mov  %0, %e!1");
+#line 702 "rl78-decode.opc"
           ID(mov); DR(C); SM(None, IMMU(2));
         
         }
@@ -5690,7 +5716,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("call !%!a0");
-#line 400 "rl78-decode.opc"
+#line 421 "rl78-decode.opc"
           ID(call); DC(IMMU(3));
         
         }
@@ -5705,7 +5731,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("call %!a0");
-#line 403 "rl78-decode.opc"
+#line 424 "rl78-decode.opc"
           ID(call); DC(IMMU(2));
         
         }
@@ -5720,7 +5746,7 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("call $%!a0");
-#line 406 "rl78-decode.opc"
+#line 427 "rl78-decode.opc"
           ID(call); DC(pc+IMMS(2)+3);
         
         }
@@ -5735,13 +5761,13 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("brk1");
-#line 364 "rl78-decode.opc"
+#line 385 "rl78-decode.opc"
           ID(break);
         
         }
       break;
   }
-#line 1266 "rl78-decode.opc"
+#line 1291 "rl78-decode.opc"
 
   return rl78->n_bytes;
 }