Update ChangeLog entry for PR 22163
[deliverable/binutils-gdb.git] / opcodes / rl78-decode.c
index 9cf6e30d0105ad8dc79c90ebdce52a21395e00f0..b2d4bd6a872e781f0a67d4bc34d70cbc697aa64e 100644 (file)
@@ -1,5 +1,26 @@
 #line 1 "rl78-decode.opc"
 /* -*- c -*- */
+/* Copyright (C) 2012-2017 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>
@@ -30,7 +51,9 @@ typedef struct
 #define W() rl78->size = RL78_Word
 
 #define AU ATTRIBUTE_UNUSED
-#define GETBYTE() (ld->op [ld->rl78->n_bytes++] = ld->getbyte (ld->ptr))
+
+#define OP_BUF_LEN 20
+#define GETBYTE() (ld->rl78->n_bytes < (OP_BUF_LEN - 1) ? ld->op [ld->rl78->n_bytes++] = ld->getbyte (ld->ptr): 0)
 #define B ((unsigned long) GETBYTE())
 
 #define SYNTAX(x) rl78->syntax = x
@@ -144,10 +167,11 @@ 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};
+  unsigned char op_buf[OP_BUF_LEN] = {0};
   unsigned char *op = op_buf;
   int op0, op1;
 
@@ -179,11 +203,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("nop");
-#line 886 "rl78-decode.opc"
+#line 913 "rl78-decode.opc"
           ID(nop);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x01:
@@ -192,7 +216,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x07:
         {
           /** 0000 0rw1                        addw    %0, %1                          */
-#line 252 "rl78-decode.opc"
+#line 276 "rl78-decode.opc"
           int rw AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -202,9 +226,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rw = 0x%x\n", rw);
             }
           SYNTAX("addw %0, %1");
-#line 252 "rl78-decode.opc"
+#line 276 "rl78-decode.opc"
           ID(add); W(); DR(AX); SRW(rw); Fzac;
-        
+
         }
       break;
     case 0x02:
@@ -217,9 +241,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addw %0, %e!1");
-#line 243 "rl78-decode.opc"
+#line 267 "rl78-decode.opc"
           ID(add); W(); DR(AX); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x04:
@@ -232,9 +256,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addw %0, #%1");
-#line 249 "rl78-decode.opc"
+#line 273 "rl78-decode.opc"
           ID(add); W(); DR(AX); SC(IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x06:
@@ -247,9 +271,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addw %0, %1");
-#line 255 "rl78-decode.opc"
+#line 279 "rl78-decode.opc"
           ID(add); W(); DR(AX); SM(None, SADDR); Fzac;
-        
+
         }
       break;
     case 0x08:
@@ -262,11 +286,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xch  a, x");
-#line 1209 "rl78-decode.opc"
+#line 1236 "rl78-decode.opc"
           ID(xch); DR(A); SR(X);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x09:
@@ -279,9 +303,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e1");
-#line 656 "rl78-decode.opc"
+#line 680 "rl78-decode.opc"
           ID(mov); DR(A); SM(B, IMMU(2));
-        
+
         }
       break;
     case 0x0a:
@@ -294,11 +318,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, #%1");
-#line 206 "rl78-decode.opc"
+#line 230 "rl78-decode.opc"
           ID(add); DM(None, SADDR); SC(IMMU(1)); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x0b:
@@ -311,9 +335,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, %1");
-#line 200 "rl78-decode.opc"
+#line 224 "rl78-decode.opc"
           ID(add); DR(A); SM(None, SADDR); Fzac;
-        
+
         }
       break;
     case 0x0c:
@@ -326,9 +350,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, #%1");
-#line 194 "rl78-decode.opc"
+#line 218 "rl78-decode.opc"
           ID(add); DR(A); SC(IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x0d:
@@ -341,24 +365,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, %e1");
-#line 182 "rl78-decode.opc"
+#line 206 "rl78-decode.opc"
           ID(add); DR(A); SM(HL, 0); Fzac;
-        
+
         }
       break;
     case 0x0e:
         {
-          /** 0000 1110                        add     %0, %e                        */
+          /** 0000 1110                        add     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0000 1110                    add     %0, %e                        */",
+                     "/** 0000 1110                    add     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("add  %0, %e1");
-#line 188 "rl78-decode.opc"
+          SYNTAX("add  %0, %ea1");
+#line 212 "rl78-decode.opc"
           ID(add); DR(A); SM(HL, IMMU(1)); Fzac;
-          
+
         }
       break;
     case 0x0f:
@@ -371,9 +395,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("add  %0, %e!1");
-#line 179 "rl78-decode.opc"
+#line 203 "rl78-decode.opc"
           ID(add); DR(A); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x10:
@@ -386,11 +410,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addw %0, #%1");
-#line 258 "rl78-decode.opc"
+#line 282 "rl78-decode.opc"
           ID(add); W(); DR(SP); SC(IMMU(1)); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x11:
@@ -403,14 +427,14 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("es:");
-#line 171 "rl78-decode.opc"
+#line 195 "rl78-decode.opc"
           DE(); SE();
           op ++;
           pc ++;
           goto start_again;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x12:
@@ -418,7 +442,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x16:
         {
           /** 0001 0ra0                        movw    %0, %1                          */
-#line 834 "rl78-decode.opc"
+#line 861 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -428,9 +452,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("movw %0, %1");
-#line 834 "rl78-decode.opc"
+#line 861 "rl78-decode.opc"
           ID(mov); W(); DRW(ra); SR(AX);
-        
+
         }
       break;
     case 0x13:
@@ -438,7 +462,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x17:
         {
           /** 0001 0ra1                        movw    %0, %1                          */
-#line 831 "rl78-decode.opc"
+#line 858 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -448,9 +472,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("movw %0, %1");
-#line 831 "rl78-decode.opc"
+#line 858 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SRW(ra);
-        
+
         }
       break;
     case 0x18:
@@ -463,9 +487,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e0, %1");
-#line 707 "rl78-decode.opc"
-          ID(mov); DM(B, IMMU(2)); SR(A);      
-        
+#line 731 "rl78-decode.opc"
+          ID(mov); DM(B, IMMU(2)); SR(A);
+
         }
       break;
     case 0x19:
@@ -478,9 +502,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e0, #%1");
-#line 704 "rl78-decode.opc"
-          ID(mov); DM(B, IMMU(2)); SC(IMMU(1));        
-        
+#line 728 "rl78-decode.opc"
+          ID(mov); DM(B, IMMU(2)); SC(IMMU(1));
+
         }
       break;
     case 0x1a:
@@ -493,11 +517,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, #%1");
-#line 238 "rl78-decode.opc"
+#line 262 "rl78-decode.opc"
           ID(addc); DM(None, SADDR); SC(IMMU(1)); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x1b:
@@ -510,9 +534,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, %1");
-#line 235 "rl78-decode.opc"
+#line 259 "rl78-decode.opc"
           ID(addc); DR(A); SM(None, SADDR); Fzac;
-        
+
         }
       break;
     case 0x1c:
@@ -525,9 +549,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, #%1");
-#line 226 "rl78-decode.opc"
+#line 250 "rl78-decode.opc"
           ID(addc); DR(A); SC(IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x1d:
@@ -540,24 +564,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, %e1");
-#line 214 "rl78-decode.opc"
+#line 238 "rl78-decode.opc"
           ID(addc); DR(A); SM(HL, 0); Fzac;
-        
+
         }
       break;
     case 0x1e:
         {
-          /** 0001 1110                        addc    %0, %e                        */
+          /** 0001 1110                        addc    %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0001 1110                    addc    %0, %e                        */",
+                     "/** 0001 1110                    addc    %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("addc %0, %e1");
-#line 223 "rl78-decode.opc"
+          SYNTAX("addc %0, %ea1");
+#line 247 "rl78-decode.opc"
           ID(addc); DR(A); SM(HL, IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x1f:
@@ -570,9 +594,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("addc %0, %e!1");
-#line 211 "rl78-decode.opc"
+#line 235 "rl78-decode.opc"
           ID(addc); DR(A); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x20:
@@ -585,11 +609,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subw %0, #%1");
-#line 1173 "rl78-decode.opc"
+#line 1200 "rl78-decode.opc"
           ID(sub); W(); DR(SP); SC(IMMU(1)); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x21:
@@ -598,7 +622,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x27:
         {
           /** 0010 0rw1                        subw    %0, %1                          */
-#line 1167 "rl78-decode.opc"
+#line 1194 "rl78-decode.opc"
           int rw AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -608,9 +632,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rw = 0x%x\n", rw);
             }
           SYNTAX("subw %0, %1");
-#line 1167 "rl78-decode.opc"
+#line 1194 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SRW(rw); Fzac;
-        
+
         }
       break;
     case 0x22:
@@ -623,9 +647,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subw %0, %e!1");
-#line 1158 "rl78-decode.opc"
+#line 1185 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x24:
@@ -638,9 +662,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subw %0, #%1");
-#line 1164 "rl78-decode.opc"
+#line 1191 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SC(IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x26:
@@ -653,9 +677,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subw %0, %1");
-#line 1170 "rl78-decode.opc"
+#line 1197 "rl78-decode.opc"
           ID(sub); W(); DR(AX); SM(None, SADDR); Fzac;
-        
+
         }
       break;
     case 0x28:
@@ -668,9 +692,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e0, %1");
-#line 719 "rl78-decode.opc"
+#line 743 "rl78-decode.opc"
           ID(mov); DM(C, IMMU(2)); SR(A);
-        
+
         }
       break;
     case 0x29:
@@ -683,9 +707,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e1");
-#line 662 "rl78-decode.opc"
+#line 686 "rl78-decode.opc"
           ID(mov); DR(A); SM(C, IMMU(2));
-        
+
         }
       break;
     case 0x2a:
@@ -698,11 +722,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, #%1");
-#line 1121 "rl78-decode.opc"
+#line 1148 "rl78-decode.opc"
           ID(sub); DM(None, SADDR); SC(IMMU(1)); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x2b:
@@ -715,9 +739,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, %1");
-#line 1115 "rl78-decode.opc"
+#line 1142 "rl78-decode.opc"
           ID(sub); DR(A); SM(None, SADDR); Fzac;
-        
+
         }
       break;
     case 0x2c:
@@ -730,9 +754,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, #%1");
-#line 1109 "rl78-decode.opc"
+#line 1136 "rl78-decode.opc"
           ID(sub); DR(A); SC(IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x2d:
@@ -745,24 +769,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, %e1");
-#line 1097 "rl78-decode.opc"
+#line 1124 "rl78-decode.opc"
           ID(sub); DR(A); SM(HL, 0); Fzac;
-        
+
         }
       break;
     case 0x2e:
         {
-          /** 0010 1110                        sub     %0, %e                        */
+          /** 0010 1110                        sub     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0010 1110                    sub     %0, %e                        */",
+                     "/** 0010 1110                    sub     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("sub  %0, %e1");
-#line 1103 "rl78-decode.opc"
+          SYNTAX("sub  %0, %ea1");
+#line 1130 "rl78-decode.opc"
           ID(sub); DR(A); SM(HL, IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x2f:
@@ -775,9 +799,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("sub  %0, %e!1");
-#line 1094 "rl78-decode.opc"
+#line 1121 "rl78-decode.opc"
           ID(sub); DR(A); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x30:
@@ -786,7 +810,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x36:
         {
           /** 0011 0rg0                        movw    %0, #%1                         */
-#line 828 "rl78-decode.opc"
+#line 855 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -796,9 +820,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("movw %0, #%1");
-#line 828 "rl78-decode.opc"
+#line 855 "rl78-decode.opc"
           ID(mov); W(); DRW(rg); SC(IMMU(2));
-        
+
         }
       break;
     case 0x31:
@@ -808,7 +832,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x00:
               {
                 /** 0011 0001 0bit 0000                btclr   %s1, $%a0                       */
-#line 394 "rl78-decode.opc"
+#line 418 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -818,17 +842,17 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btclr  %s1, $%a0");
-#line 394 "rl78-decode.opc"
+#line 418 "rl78-decode.opc"
                 ID(branch_cond_clear); SM(None, SADDR); SB(bit); DC(pc+IMMS(1)+4); COND(T);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x01:
               {
                 /** 0011 0001 0bit 0001                btclr   %1, $%a0                        */
-#line 388 "rl78-decode.opc"
+#line 412 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -838,15 +862,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btclr  %1, $%a0");
-#line 388 "rl78-decode.opc"
+#line 412 "rl78-decode.opc"
                 ID(branch_cond_clear); DC(pc+IMMS(1)+3); SR(A); SB(bit); COND(T);
-              
+
               }
             break;
           case 0x02:
               {
                 /** 0011 0001 0bit 0010                bt      %s1, $%a0                       */
-#line 380 "rl78-decode.opc"
+#line 404 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -856,17 +880,17 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bt     %s1, $%a0");
-#line 380 "rl78-decode.opc"
+#line 404 "rl78-decode.opc"
                 ID(branch_cond); SM(None, SADDR); SB(bit); DC(pc+IMMS(1)+4); COND(T);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x03:
               {
                 /** 0011 0001 0bit 0011                bt      %1, $%a0                        */
-#line 374 "rl78-decode.opc"
+#line 398 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -876,15 +900,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bt     %1, $%a0");
-#line 374 "rl78-decode.opc"
+#line 398 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(A); SB(bit); COND(T);
-              
+
               }
             break;
           case 0x04:
               {
                 /** 0011 0001 0bit 0100                bf      %s1, $%a0                       */
-#line 341 "rl78-decode.opc"
+#line 365 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -894,17 +918,17 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bf     %s1, $%a0");
-#line 341 "rl78-decode.opc"
+#line 365 "rl78-decode.opc"
                 ID(branch_cond); SM(None, SADDR); SB(bit); DC(pc+IMMS(1)+4); COND(F);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x05:
               {
                 /** 0011 0001 0bit 0101                bf      %1, $%a0                        */
-#line 335 "rl78-decode.opc"
+#line 359 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -914,15 +938,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bf     %1, $%a0");
-#line 335 "rl78-decode.opc"
+#line 359 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(A); SB(bit); COND(F);
-              
+
               }
             break;
           case 0x07:
               {
                 /** 0011 0001 0cnt 0111                shl     %0, %1                          */
-#line 1050 "rl78-decode.opc"
+#line 1077 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -932,15 +956,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shl    %0, %1");
-#line 1050 "rl78-decode.opc"
+#line 1077 "rl78-decode.opc"
                 ID(shl); DR(C); SC(cnt);
-              
+
               }
             break;
           case 0x08:
               {
                 /** 0011 0001 0cnt 1000                shl     %0, %1                          */
-#line 1047 "rl78-decode.opc"
+#line 1074 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -950,15 +974,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shl    %0, %1");
-#line 1047 "rl78-decode.opc"
+#line 1074 "rl78-decode.opc"
                 ID(shl); DR(B); SC(cnt);
-              
+
               }
             break;
           case 0x09:
               {
                 /** 0011 0001 0cnt 1001                shl     %0, %1                          */
-#line 1044 "rl78-decode.opc"
+#line 1071 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -968,15 +992,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shl    %0, %1");
-#line 1044 "rl78-decode.opc"
+#line 1071 "rl78-decode.opc"
                 ID(shl); DR(A); SC(cnt);
-              
+
               }
             break;
           case 0x0a:
               {
                 /** 0011 0001 0cnt 1010                shr     %0, %1                          */
-#line 1061 "rl78-decode.opc"
+#line 1088 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -986,15 +1010,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("shr    %0, %1");
-#line 1061 "rl78-decode.opc"
+#line 1088 "rl78-decode.opc"
                 ID(shr); DR(A); SC(cnt);
-              
+
               }
             break;
           case 0x0b:
               {
                 /** 0011 0001 0cnt 1011                sar     %0, %1                          */
-#line 1008 "rl78-decode.opc"
+#line 1035 "rl78-decode.opc"
                 int cnt AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1004,16 +1028,16 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  cnt = 0x%x\n", cnt);
                   }
                 SYNTAX("sar    %0, %1");
-#line 1008 "rl78-decode.opc"
+#line 1035 "rl78-decode.opc"
                 ID(sar); DR(A); SC(cnt);
-              
+
               }
             break;
           case 0x0c:
           case 0x8c:
               {
                 /** 0011 0001 wcnt 1100                shlw    %0, %1                          */
-#line 1056 "rl78-decode.opc"
+#line 1083 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1023,18 +1047,18 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("shlw   %0, %1");
-#line 1056 "rl78-decode.opc"
+#line 1083 "rl78-decode.opc"
                 ID(shl); W(); DR(BC); SC(wcnt);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x0d:
           case 0x8d:
               {
                 /** 0011 0001 wcnt 1101                shlw    %0, %1                          */
-#line 1053 "rl78-decode.opc"
+#line 1080 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1044,16 +1068,16 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("shlw   %0, %1");
-#line 1053 "rl78-decode.opc"
+#line 1080 "rl78-decode.opc"
                 ID(shl); W(); DR(AX); SC(wcnt);
-              
+
               }
             break;
           case 0x0e:
           case 0x8e:
               {
                 /** 0011 0001 wcnt 1110                shrw    %0, %1                          */
-#line 1064 "rl78-decode.opc"
+#line 1091 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1063,18 +1087,18 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("shrw   %0, %1");
-#line 1064 "rl78-decode.opc"
+#line 1091 "rl78-decode.opc"
                 ID(shr); W(); DR(AX); SC(wcnt);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x0f:
           case 0x8f:
               {
                 /** 0011 0001 wcnt 1111                sarw    %0, %1                          */
-#line 1011 "rl78-decode.opc"
+#line 1038 "rl78-decode.opc"
                 int wcnt AU = (op[1] >> 4) & 0x0f;
                 if (trace)
                   {
@@ -1084,17 +1108,17 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  wcnt = 0x%x\n", wcnt);
                   }
                 SYNTAX("sarw   %0, %1");
-#line 1011 "rl78-decode.opc"
+#line 1038 "rl78-decode.opc"
                 ID(sar); W(); DR(AX); SC(wcnt);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x80:
               {
                 /** 0011 0001 1bit 0000                btclr   %s1, $%a0                       */
-#line 391 "rl78-decode.opc"
+#line 415 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1104,15 +1128,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btclr  %s1, $%a0");
-#line 391 "rl78-decode.opc"
+#line 415 "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, $%a0                       */
-#line 385 "rl78-decode.opc"
+#line 409 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1122,15 +1146,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("btclr  %e1, $%a0");
-#line 385 "rl78-decode.opc"
+#line 409 "rl78-decode.opc"
                 ID(branch_cond_clear); DC(pc+IMMS(1)+3); SM(HL,0); SB(bit); COND(T);
-              
+
               }
             break;
           case 0x82:
               {
                 /** 0011 0001 1bit 0010                bt      %s1, $%a0                       */
-#line 377 "rl78-decode.opc"
+#line 401 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1140,15 +1164,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bt     %s1, $%a0");
-#line 377 "rl78-decode.opc"
+#line 401 "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, $%a0                       */
-#line 371 "rl78-decode.opc"
+#line 395 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1158,15 +1182,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bt     %e1, $%a0");
-#line 371 "rl78-decode.opc"
+#line 395 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SM(HL,0); SB(bit); COND(T);
-              
+
               }
             break;
           case 0x84:
               {
                 /** 0011 0001 1bit 0100                bf      %s1, $%a0                       */
-#line 338 "rl78-decode.opc"
+#line 362 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1176,15 +1200,15 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bf     %s1, $%a0");
-#line 338 "rl78-decode.opc"
+#line 362 "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, $%a0                       */
-#line 332 "rl78-decode.opc"
+#line 356 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -1194,9 +1218,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("bf     %e1, $%a0");
-#line 332 "rl78-decode.opc"
+#line 356 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SM(HL,0); SB(bit); COND(F);
-              
+
               }
             break;
           default: UNSUPPORTED(); break;
@@ -1207,7 +1231,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x37:
         {
           /** 0011 0ra1                        xchw    %0, %1                          */
-#line 1214 "rl78-decode.opc"
+#line 1241 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -1217,11 +1241,11 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("xchw %0, %1");
-#line 1214 "rl78-decode.opc"
+#line 1241 "rl78-decode.opc"
           ID(xch); W(); DR(AX); SRW(ra);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x38:
@@ -1234,9 +1258,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e0, #%1");
-#line 716 "rl78-decode.opc"
-          ID(mov); DM(C, IMMU(2)); SC(IMMU(1));        
-        
+#line 740 "rl78-decode.opc"
+          ID(mov); DM(C, IMMU(2)); SC(IMMU(1));
+
         }
       break;
     case 0x39:
@@ -1249,9 +1273,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e0, #%1");
-#line 710 "rl78-decode.opc"
-          ID(mov); DM(BC, IMMU(2)); SC(IMMU(1));       
-        
+#line 734 "rl78-decode.opc"
+          ID(mov); DM(BC, IMMU(2)); SC(IMMU(1));
+
         }
       break;
     case 0x3a:
@@ -1264,11 +1288,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, #%1");
-#line 1153 "rl78-decode.opc"
+#line 1180 "rl78-decode.opc"
           ID(subc); DM(None, SADDR); SC(IMMU(1)); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x3b:
@@ -1281,9 +1305,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, %1");
-#line 1150 "rl78-decode.opc"
+#line 1177 "rl78-decode.opc"
           ID(subc); DR(A); SM(None, SADDR); Fzac;
-        
+
         }
       break;
     case 0x3c:
@@ -1296,9 +1320,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, #%1");
-#line 1141 "rl78-decode.opc"
+#line 1168 "rl78-decode.opc"
           ID(subc); DR(A); SC(IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x3d:
@@ -1311,24 +1335,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, %e1");
-#line 1129 "rl78-decode.opc"
+#line 1156 "rl78-decode.opc"
           ID(subc); DR(A); SM(HL, 0); Fzac;
-        
+
         }
       break;
     case 0x3e:
         {
-          /** 0011 1110                        subc    %0, %e                        */
+          /** 0011 1110                        subc    %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0011 1110                    subc    %0, %e                        */",
+                     "/** 0011 1110                    subc    %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("subc %0, %e1");
-#line 1138 "rl78-decode.opc"
+          SYNTAX("subc %0, %ea1");
+#line 1165 "rl78-decode.opc"
           ID(subc); DR(A); SM(HL, IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x3f:
@@ -1341,9 +1365,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("subc %0, %e!1");
-#line 1126 "rl78-decode.opc"
+#line 1153 "rl78-decode.opc"
           ID(subc); DR(A); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x40:
@@ -1356,9 +1380,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %e!0, #%1");
-#line 458 "rl78-decode.opc"
+#line 482 "rl78-decode.opc"
           ID(cmp); DM(None, IMMU(2)); SC(IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x41:
@@ -1371,9 +1395,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, #%1");
-#line 695 "rl78-decode.opc"
-          ID(mov); DR(ES); SC(IMMU(1));        
-        
+#line 719 "rl78-decode.opc"
+          ID(mov); DR(ES); SC(IMMU(1));
+
         }
       break;
     case 0x42:
@@ -1386,9 +1410,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmpw %0, %e!1");
-#line 509 "rl78-decode.opc"
+#line 533 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x43:
@@ -1396,7 +1420,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x47:
         {
           /** 0100 0ra1                        cmpw    %0, %1                          */
-#line 518 "rl78-decode.opc"
+#line 542 "rl78-decode.opc"
           int ra AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -1406,9 +1430,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("cmpw %0, %1");
-#line 518 "rl78-decode.opc"
+#line 542 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SRW(ra); Fzac;
-        
+
         }
       break;
     case 0x44:
@@ -1421,9 +1445,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmpw %0, #%1");
-#line 515 "rl78-decode.opc"
+#line 539 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SC(IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x46:
@@ -1436,11 +1460,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmpw %0, %1");
-#line 521 "rl78-decode.opc"
+#line 545 "rl78-decode.opc"
           ID(cmp); W(); DR(AX); SM(None, SADDR); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x48:
@@ -1453,9 +1477,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e0, %1");
-#line 713 "rl78-decode.opc"
-          ID(mov); DM(BC, IMMU(2)); SR(A);     
-        
+#line 737 "rl78-decode.opc"
+          ID(mov); DM(BC, IMMU(2)); SR(A);
+
         }
       break;
     case 0x49:
@@ -1468,9 +1492,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e1");
-#line 659 "rl78-decode.opc"
+#line 683 "rl78-decode.opc"
           ID(mov); DR(A); SM(BC, IMMU(2));
-        
+
         }
       break;
     case 0x4a:
@@ -1483,9 +1507,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, #%1");
-#line 461 "rl78-decode.opc"
+#line 485 "rl78-decode.opc"
           ID(cmp); DM(None, SADDR); SC(IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x4b:
@@ -1498,11 +1522,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, %1");
-#line 488 "rl78-decode.opc"
+#line 512 "rl78-decode.opc"
           ID(cmp); DR(A); SM(None, SADDR); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x4c:
@@ -1515,9 +1539,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, #%1");
-#line 479 "rl78-decode.opc"
+#line 503 "rl78-decode.opc"
           ID(cmp); DR(A); SC(IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x4d:
@@ -1530,24 +1554,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, %e1");
-#line 467 "rl78-decode.opc"
+#line 491 "rl78-decode.opc"
           ID(cmp); DR(A); SM(HL, 0); Fzac;
-        
+
         }
       break;
     case 0x4e:
         {
-          /** 0100 1110                        cmp     %0, %e                        */
+          /** 0100 1110                        cmp     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0100 1110                    cmp     %0, %e                        */",
+                     "/** 0100 1110                    cmp     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("cmp  %0, %e1");
-#line 476 "rl78-decode.opc"
+          SYNTAX("cmp  %0, %ea1");
+#line 500 "rl78-decode.opc"
           ID(cmp); DR(A); SM(HL, IMMU(1)); Fzac;
-        
+
         }
       break;
     case 0x4f:
@@ -1560,9 +1584,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp  %0, %e!1");
-#line 464 "rl78-decode.opc"
+#line 488 "rl78-decode.opc"
           ID(cmp); DR(A); SM(None, IMMU(2)); Fzac;
-        
+
         }
       break;
     case 0x50:
@@ -1575,7 +1599,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x57:
         {
           /** 0101 0reg                        mov     %0, #%1                         */
-#line 647 "rl78-decode.opc"
+#line 671 "rl78-decode.opc"
           int reg AU = op[0] & 0x07;
           if (trace)
             {
@@ -1585,9 +1609,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  reg = 0x%x\n", reg);
             }
           SYNTAX("mov  %0, #%1");
-#line 647 "rl78-decode.opc"
+#line 671 "rl78-decode.opc"
           ID(mov); DRB(reg); SC(IMMU(1));
-        
+
         }
       break;
     case 0x58:
@@ -1600,9 +1624,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %e0, %1");
-#line 846 "rl78-decode.opc"
+#line 873 "rl78-decode.opc"
           ID(mov); W(); DM(B, IMMU(2)); SR(AX);
-        
+
         }
       break;
     case 0x59:
@@ -1615,9 +1639,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %e1");
-#line 837 "rl78-decode.opc"
+#line 864 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(B, IMMU(2));
-        
+
         }
       break;
     case 0x5a:
@@ -1630,11 +1654,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, #%1");
-#line 290 "rl78-decode.opc"
+#line 314 "rl78-decode.opc"
           ID(and); DM(None, SADDR); SC(IMMU(1)); Fz;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x5b:
@@ -1647,9 +1671,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, %1");
-#line 287 "rl78-decode.opc"
+#line 311 "rl78-decode.opc"
           ID(and); DR(A); SM(None, SADDR); Fz;
-        
+
         }
       break;
     case 0x5c:
@@ -1662,9 +1686,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, #%1");
-#line 278 "rl78-decode.opc"
+#line 302 "rl78-decode.opc"
           ID(and); DR(A); SC(IMMU(1)); Fz;
-        
+
         }
       break;
     case 0x5d:
@@ -1677,24 +1701,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, %e1");
-#line 266 "rl78-decode.opc"
+#line 290 "rl78-decode.opc"
           ID(and); DR(A); SM(HL, 0); Fz;
-        
+
         }
       break;
     case 0x5e:
         {
-          /** 0101 1110                        and     %0, %e1                 */
+          /** 0101 1110                        and     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0101 1110                    and     %0, %e1                 */",
+                     "/** 0101 1110                    and     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("and  %0, %e1");
-#line 272 "rl78-decode.opc"
+          SYNTAX("and  %0, %ea1");
+#line 296 "rl78-decode.opc"
           ID(and); DR(A); SM(HL, IMMU(1)); Fz;
-        
+
         }
       break;
     case 0x5f:
@@ -1707,9 +1731,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("and  %0, %e!1");
-#line 263 "rl78-decode.opc"
+#line 287 "rl78-decode.opc"
           ID(and); DR(A); SM(None, IMMU(2)); Fz;
-        
+
         }
       break;
     case 0x60:
@@ -1721,7 +1745,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x67:
         {
           /** 0110 0rba                        mov     %0, %1                          */
-#line 650 "rl78-decode.opc"
+#line 674 "rl78-decode.opc"
           int rba AU = op[0] & 0x07;
           if (trace)
             {
@@ -1731,9 +1755,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rba = 0x%x\n", rba);
             }
           SYNTAX("mov  %0, %1");
-#line 650 "rl78-decode.opc"
+#line 674 "rl78-decode.opc"
           ID(mov); DR(A); SRB(rba);
-        
+
         }
       break;
     case 0x61:
@@ -1750,7 +1774,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x07:
               {
                 /** 0110 0001 0000 0reg                add     %0, %1                          */
-#line 203 "rl78-decode.opc"
+#line 227 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1760,9 +1784,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("add    %0, %1");
-#line 203 "rl78-decode.opc"
+#line 227 "rl78-decode.opc"
                 ID(add); DRB(reg); SR(A); Fzac;
-              
+
               }
             break;
           case 0x08:
@@ -1774,7 +1798,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x0f:
               {
                 /** 0110 0001 0000 1rba                add     %0, %1                          */
-#line 197 "rl78-decode.opc"
+#line 221 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1784,24 +1808,24 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("add    %0, %1");
-#line 197 "rl78-decode.opc"
+#line 221 "rl78-decode.opc"
                 ID(add); DR(A); SRB(rba); Fzac;
-              
+
               }
             break;
           case 0x09:
               {
-                /** 0110 0001 0000 1001                addw    %0, %e1                 */
+                /** 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                 */",
+                           "/** 0110 0001 0000 1001            addw    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("addw   %0, %e1");
-#line 246 "rl78-decode.opc"
+                SYNTAX("addw   %0, %ea1");
+#line 270 "rl78-decode.opc"
                 ID(add); W(); DR(AX); SM(HL, IMMU(1)); Fzac;
-              
+
               }
             break;
           case 0x10:
@@ -1814,7 +1838,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x17:
               {
                 /** 0110 0001 0001 0reg                addc    %0, %1                          */
-#line 232 "rl78-decode.opc"
+#line 256 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1824,9 +1848,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("addc   %0, %1");
-#line 232 "rl78-decode.opc"
+#line 256 "rl78-decode.opc"
                 ID(addc); DRB(reg); SR(A); Fzac;
-              
+
               }
             break;
           case 0x18:
@@ -1838,7 +1862,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x1f:
               {
                 /** 0110 0001 0001 1rba                addc    %0, %1                          */
-#line 229 "rl78-decode.opc"
+#line 253 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1848,9 +1872,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("addc   %0, %1");
-#line 229 "rl78-decode.opc"
+#line 253 "rl78-decode.opc"
                 ID(addc); DR(A); SRB(rba); Fzac;
-              
+
               }
             break;
           case 0x20:
@@ -1863,7 +1887,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x27:
               {
                 /** 0110 0001 0010 0reg                sub     %0, %1                          */
-#line 1118 "rl78-decode.opc"
+#line 1145 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1873,9 +1897,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("sub    %0, %1");
-#line 1118 "rl78-decode.opc"
+#line 1145 "rl78-decode.opc"
                 ID(sub); DRB(reg); SR(A); Fzac;
-              
+
               }
             break;
           case 0x28:
@@ -1887,7 +1911,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x2f:
               {
                 /** 0110 0001 0010 1rba                sub     %0, %1                          */
-#line 1112 "rl78-decode.opc"
+#line 1139 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1897,24 +1921,24 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("sub    %0, %1");
-#line 1112 "rl78-decode.opc"
+#line 1139 "rl78-decode.opc"
                 ID(sub); DR(A); SRB(rba); Fzac;
-              
+
               }
             break;
           case 0x29:
               {
-                /** 0110 0001 0010 1001                subw    %0, %e                        */
+                /** 0110 0001 0010 1001                subw    %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0010 1001            subw    %0, %e                        */",
+                           "/** 0110 0001 0010 1001            subw    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("subw   %0, %e1");
-#line 1161 "rl78-decode.opc"
+                SYNTAX("subw   %0, %ea1");
+#line 1188 "rl78-decode.opc"
                 ID(sub); W(); DR(AX); SM(HL, IMMU(1)); Fzac;
-              
+
               }
             break;
           case 0x30:
@@ -1927,7 +1951,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x37:
               {
                 /** 0110 0001 0011 0reg                subc    %0, %1                          */
-#line 1147 "rl78-decode.opc"
+#line 1174 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1937,9 +1961,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("subc   %0, %1");
-#line 1147 "rl78-decode.opc"
+#line 1174 "rl78-decode.opc"
                 ID(subc); DRB(reg); SR(A); Fzac;
-              
+
               }
             break;
           case 0x38:
@@ -1951,7 +1975,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x3f:
               {
                 /** 0110 0001 0011 1rba                subc    %0, %1                          */
-#line 1144 "rl78-decode.opc"
+#line 1171 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1961,9 +1985,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("subc   %0, %1");
-#line 1144 "rl78-decode.opc"
+#line 1171 "rl78-decode.opc"
                 ID(subc); DR(A); SRB(rba); Fzac;
-              
+
               }
             break;
           case 0x40:
@@ -1976,7 +2000,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x47:
               {
                 /** 0110 0001 0100 0reg                cmp     %0, %1                          */
-#line 485 "rl78-decode.opc"
+#line 509 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -1986,9 +2010,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("cmp    %0, %1");
-#line 485 "rl78-decode.opc"
+#line 509 "rl78-decode.opc"
                 ID(cmp); DRB(reg); SR(A); Fzac;
-              
+
               }
             break;
           case 0x48:
@@ -2000,7 +2024,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x4f:
               {
                 /** 0110 0001 0100 1rba                cmp     %0, %1                          */
-#line 482 "rl78-decode.opc"
+#line 506 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2010,24 +2034,24 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("cmp    %0, %1");
-#line 482 "rl78-decode.opc"
+#line 506 "rl78-decode.opc"
                 ID(cmp); DR(A); SRB(rba); Fzac;
-              
+
               }
             break;
           case 0x49:
               {
-                /** 0110 0001 0100 1001                cmpw    %0, %e                        */
+                /** 0110 0001 0100 1001                cmpw    %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0100 1001            cmpw    %0, %e                        */",
+                           "/** 0110 0001 0100 1001            cmpw    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("cmpw   %0, %e1");
-#line 512 "rl78-decode.opc"
+                SYNTAX("cmpw   %0, %ea1");
+#line 536 "rl78-decode.opc"
                 ID(cmp); W(); DR(AX); SM(HL, IMMU(1)); Fzac;
-              
+
               }
             break;
           case 0x50:
@@ -2040,7 +2064,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x57:
               {
                 /** 0110 0001 0101 0reg                and     %0, %1                          */
-#line 284 "rl78-decode.opc"
+#line 308 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2050,9 +2074,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("and    %0, %1");
-#line 284 "rl78-decode.opc"
+#line 308 "rl78-decode.opc"
                 ID(and); DRB(reg); SR(A); Fz;
-              
+
               }
             break;
           case 0x58:
@@ -2064,7 +2088,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x5f:
               {
                 /** 0110 0001 0101 1rba                and     %0, %1                          */
-#line 281 "rl78-decode.opc"
+#line 305 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2074,24 +2098,24 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("and    %0, %1");
-#line 281 "rl78-decode.opc"
+#line 305 "rl78-decode.opc"
                 ID(and); DR(A); SRB(rba); Fz;
-              
+
               }
             break;
           case 0x59:
               {
-                /** 0110 0001 0101 1001                inc     %e                            */
+                /** 0110 0001 0101 1001                inc     %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0101 1001            inc     %e                            */",
+                           "/** 0110 0001 0101 1001            inc     %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("inc    %e0");
-#line 562 "rl78-decode.opc"
+                SYNTAX("inc    %ea0");
+#line 586 "rl78-decode.opc"
                 ID(add); DM(HL, IMMU(1)); SC(1); Fza;
-              
+
               }
             break;
           case 0x60:
@@ -2104,7 +2128,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x67:
               {
                 /** 0110 0001 0110 0reg                or      %0, %1                          */
-#line 936 "rl78-decode.opc"
+#line 963 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2114,9 +2138,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("or     %0, %1");
-#line 936 "rl78-decode.opc"
+#line 963 "rl78-decode.opc"
                 ID(or); DRB(reg); SR(A); Fz;
-              
+
               }
             break;
           case 0x68:
@@ -2128,7 +2152,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x6f:
               {
                 /** 0110 0001 0110 1rba                or      %0, %1                          */
-#line 933 "rl78-decode.opc"
+#line 960 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2138,24 +2162,24 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("or     %0, %1");
-#line 933 "rl78-decode.opc"
+#line 960 "rl78-decode.opc"
                 ID(or); DR(A); SRB(rba); Fz;
-              
+
               }
             break;
           case 0x69:
               {
-                /** 0110 0001 0110 1001                dec     %e                            */
+                /** 0110 0001 0110 1001                dec     %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0110 1001            dec     %e                            */",
+                           "/** 0110 0001 0110 1001            dec     %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("dec    %e0");
-#line 529 "rl78-decode.opc"
+                SYNTAX("dec    %ea0");
+#line 553 "rl78-decode.opc"
                 ID(sub); DM(HL, IMMU(1)); SC(1); Fza;
-              
+
               }
             break;
           case 0x70:
@@ -2168,7 +2192,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x77:
               {
                 /** 0110 0001 0111 0reg                xor     %0, %1                          */
-#line 1240 "rl78-decode.opc"
+#line 1267 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2178,9 +2202,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("xor    %0, %1");
-#line 1240 "rl78-decode.opc"
+#line 1267 "rl78-decode.opc"
                 ID(xor); DRB(reg); SR(A); Fz;
-              
+
               }
             break;
           case 0x78:
@@ -2192,7 +2216,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7f:
               {
                 /** 0110 0001 0111 1rba                xor     %0, %1                          */
-#line 1237 "rl78-decode.opc"
+#line 1264 "rl78-decode.opc"
                 int rba AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2202,24 +2226,24 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rba = 0x%x\n", rba);
                   }
                 SYNTAX("xor    %0, %1");
-#line 1237 "rl78-decode.opc"
+#line 1264 "rl78-decode.opc"
                 ID(xor); DR(A); SRB(rba); Fz;
-              
+
               }
             break;
           case 0x79:
               {
-                /** 0110 0001 0111 1001                incw    %e                            */
+                /** 0110 0001 0111 1001                incw    %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 0111 1001            incw    %e                            */",
+                           "/** 0110 0001 0111 1001            incw    %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("incw   %e0");
-#line 576 "rl78-decode.opc"
+                SYNTAX("incw   %ea0");
+#line 600 "rl78-decode.opc"
                 ID(add); W(); DM(HL, IMMU(1)); SC(1);
-              
+
               }
             break;
           case 0x80:
@@ -2233,9 +2257,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("add    %0, %e1");
-#line 185 "rl78-decode.opc"
+#line 209 "rl78-decode.opc"
                 ID(add); DR(A); SM2(HL, B, 0); Fzac;
-              
+
               }
             break;
           case 0x82:
@@ -2248,9 +2272,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("add    %0, %e1");
-#line 191 "rl78-decode.opc"
+#line 215 "rl78-decode.opc"
                 ID(add); DR(A); SM2(HL, C, 0); Fzac;
-              
+
               }
             break;
           case 0x84:
@@ -2287,9 +2311,9 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf7:
               {
                 /** 0110 0001 1nnn 01mm                callt   [%x0]                           */
-#line 411 "rl78-decode.opc"
+#line 435 "rl78-decode.opc"
                 int nnn AU = (op[1] >> 4) & 0x07;
-#line 411 "rl78-decode.opc"
+#line 435 "rl78-decode.opc"
                 int mm AU = op[1] & 0x03;
                 if (trace)
                   {
@@ -2300,11 +2324,11 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  mm = 0x%x\n", mm);
                   }
                 SYNTAX("callt  [%x0]");
-#line 411 "rl78-decode.opc"
+#line 435 "rl78-decode.opc"
                 ID(call); DM(None, 0x80 + mm*16 + nnn*2);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x88:
@@ -2316,7 +2340,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x8f:
               {
                 /** 0110 0001 1000 1reg                xch     %0, %1                          */
-#line 1199 "rl78-decode.opc"
+#line 1226 "rl78-decode.opc"
                 int reg AU = op[1] & 0x07;
                 if (trace)
                   {
@@ -2326,25 +2350,25 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  reg = 0x%x\n", reg);
                   }
                 SYNTAX("xch    %0, %1");
-#line 1199 "rl78-decode.opc"
+#line 1226 "rl78-decode.opc"
                 /* Note: DECW uses reg == X, so this must follow DECW */
                 ID(xch); DR(A); SRB(reg);
-              
+
               }
             break;
           case 0x89:
               {
-                /** 0110 0001 1000 1001                decw    %e                            */
+                /** 0110 0001 1000 1001                decw    %ea0                            */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1000 1001            decw    %e                            */",
+                           "/** 0110 0001 1000 1001            decw    %ea0                            */",
                            op[0], op[1]);
                   }
-                SYNTAX("decw   %e0");
-#line 543 "rl78-decode.opc"
+                SYNTAX("decw   %ea0");
+#line 567 "rl78-decode.opc"
                 ID(sub); W(); DM(HL, IMMU(1)); SC(1);
-              
+
               }
             break;
           case 0x90:
@@ -2357,9 +2381,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("addc   %0, %e1");
-#line 217 "rl78-decode.opc"
+#line 241 "rl78-decode.opc"
                 ID(addc); DR(A); SM2(HL, B, 0); Fzac;
-              
+
               }
             break;
           case 0x92:
@@ -2372,9 +2396,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("addc   %0, %e1");
-#line 220 "rl78-decode.opc"
+#line 244 "rl78-decode.opc"
                 ID(addc); DR(A); SM2(HL, C, 0); Fzac;
-              
+
               }
             break;
           case 0xa0:
@@ -2388,9 +2412,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sub    %0, %e1");
-#line 1100 "rl78-decode.opc"
+#line 1127 "rl78-decode.opc"
                 ID(sub); DR(A); SM2(HL, B, 0); Fzac;
-              
+
               }
             break;
           case 0xa2:
@@ -2403,9 +2427,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sub    %0, %e1");
-#line 1106 "rl78-decode.opc"
+#line 1133 "rl78-decode.opc"
                 ID(sub); DR(A); SM2(HL, C, 0); Fzac;
-              
+
               }
             break;
           case 0xa8:
@@ -2418,9 +2442,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %1");
-#line 1203 "rl78-decode.opc"
+#line 1230 "rl78-decode.opc"
                 ID(xch); DR(A); SM(None, SADDR);
-              
+
               }
             break;
           case 0xa9:
@@ -2433,9 +2457,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %e1");
-#line 1196 "rl78-decode.opc"
+#line 1223 "rl78-decode.opc"
                 ID(xch); DR(A); SM2(HL, C, 0);
-              
+
               }
             break;
           case 0xaa:
@@ -2448,24 +2472,24 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %e!1");
-#line 1178 "rl78-decode.opc"
+#line 1205 "rl78-decode.opc"
                 ID(xch); DR(A); SM(None, IMMU(2));
-              
+
               }
             break;
           case 0xab:
               {
-                /** 0110 0001 1010 1011                xch     %0, %                         */
+                /** 0110 0001 1010 1011                xch     %0, %s1                         */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1011            xch     %0, %                         */",
+                           "/** 0110 0001 1010 1011            xch     %0, %s1                         */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %1");
-#line 1206 "rl78-decode.opc"
+                SYNTAX("xch    %0, %s1");
+#line 1233 "rl78-decode.opc"
                 ID(xch); DR(A); SM(None, SFR);
-              
+
               }
             break;
           case 0xac:
@@ -2478,24 +2502,24 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %e1");
-#line 1187 "rl78-decode.opc"
+#line 1214 "rl78-decode.opc"
                 ID(xch); DR(A); SM(HL, 0);
-              
+
               }
             break;
           case 0xad:
               {
-                /** 0110 0001 1010 1101                xch     %0, %e                        */
+                /** 0110 0001 1010 1101                xch     %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1101            xch     %0, %e                        */",
+                           "/** 0110 0001 1010 1101            xch     %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1");
-#line 1193 "rl78-decode.opc"
+                SYNTAX("xch    %0, %ea1");
+#line 1220 "rl78-decode.opc"
                 ID(xch); DR(A); SM(HL, IMMU(1));
-              
+
               }
             break;
           case 0xae:
@@ -2508,24 +2532,24 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %e1");
-#line 1181 "rl78-decode.opc"
+#line 1208 "rl78-decode.opc"
                 ID(xch); DR(A); SM(DE, 0);
-              
+
               }
             break;
           case 0xaf:
               {
-                /** 0110 0001 1010 1111                xch     %0, %e1                         */
+                /** 0110 0001 1010 1111                xch     %0, %ea1                                */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1010 1111            xch     %0, %e1                         */",
+                           "/** 0110 0001 1010 1111            xch     %0, %ea1                                */",
                            op[0], op[1]);
                   }
-                SYNTAX("xch    %0, %e1");
-#line 1184 "rl78-decode.opc"
+                SYNTAX("xch    %0, %ea1");
+#line 1211 "rl78-decode.opc"
                 ID(xch); DR(A); SM(DE, IMMU(1));
-              
+
               }
             break;
           case 0xb0:
@@ -2538,9 +2562,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("subc   %0, %e1");
-#line 1132 "rl78-decode.opc"
+#line 1159 "rl78-decode.opc"
                 ID(subc); DR(A); SM2(HL, B, 0); Fzac;
-              
+
               }
             break;
           case 0xb2:
@@ -2553,9 +2577,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("subc   %0, %e1");
-#line 1135 "rl78-decode.opc"
+#line 1162 "rl78-decode.opc"
                 ID(subc); DR(A); SM2(HL, C, 0); Fzac;
-              
+
               }
             break;
           case 0xb8:
@@ -2568,9 +2592,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("mov    %0, %1");
-#line 701 "rl78-decode.opc"
-                ID(mov); DR(ES); SM(None, SADDR);      
-              
+#line 725 "rl78-decode.opc"
+                ID(mov); DR(ES); SM(None, SADDR);
+
               }
             break;
           case 0xb9:
@@ -2583,9 +2607,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xch    %0, %e1");
-#line 1190 "rl78-decode.opc"
+#line 1217 "rl78-decode.opc"
                 ID(xch); DR(A); SM2(HL, B, 0);
-              
+
               }
             break;
           case 0xc0:
@@ -2598,9 +2622,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("cmp    %0, %e1");
-#line 470 "rl78-decode.opc"
+#line 494 "rl78-decode.opc"
                 ID(cmp); DR(A); SM2(HL, B, 0); Fzac;
-              
+
               }
             break;
           case 0xc2:
@@ -2613,9 +2637,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("cmp    %0, %e1");
-#line 473 "rl78-decode.opc"
+#line 497 "rl78-decode.opc"
                 ID(cmp); DR(A); SM2(HL, C, 0); Fzac;
-              
+
               }
             break;
           case 0xc3:
@@ -2628,9 +2652,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("bh     $%a0");
-#line 318 "rl78-decode.opc"
+#line 342 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(None); COND(H);
-              
+
               }
             break;
           case 0xc8:
@@ -2643,9 +2667,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1069 "rl78-decode.opc"
+#line 1096 "rl78-decode.opc"
                 ID(skip); COND(C);
-              
+
               }
             break;
           case 0xc9:
@@ -2658,9 +2682,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("mov    %0, %e1");
-#line 638 "rl78-decode.opc"
+#line 662 "rl78-decode.opc"
                 ID(mov); DR(A); SM2(HL, B, 0);
-              
+
               }
             break;
           case 0xca:
@@ -2669,7 +2693,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfa:
               {
                 /** 0110 0001 11rg 1010                call    %0                              */
-#line 408 "rl78-decode.opc"
+#line 432 "rl78-decode.opc"
                 int rg AU = (op[1] >> 4) & 0x03;
                 if (trace)
                   {
@@ -2679,9 +2703,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rg = 0x%x\n", rg);
                   }
                 SYNTAX("call   %0");
-#line 408 "rl78-decode.opc"
+#line 432 "rl78-decode.opc"
                 ID(call); DRW(rg);
-              
+
               }
             break;
           case 0xcb:
@@ -2694,11 +2718,11 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("br     ax");
-#line 358 "rl78-decode.opc"
+#line 382 "rl78-decode.opc"
                 ID(branch); DR(AX);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xcc:
@@ -2711,11 +2735,11 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("brk");
-#line 366 "rl78-decode.opc"
+#line 390 "rl78-decode.opc"
                 ID(break);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xcd:
@@ -2728,28 +2752,28 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("pop    %s0");
-#line 964 "rl78-decode.opc"
+#line 991 "rl78-decode.opc"
                 ID(mov); W(); DR(PSW); SPOP();
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xce:
               {
-                /** 0110 0001 1100 1110                movs    %e0, %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, %1                         */",
+                           "/** 0110 0001 1100 1110            movs    %ea0, %1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("movs   %e0, %1");
-#line 786 "rl78-decode.opc"
+                SYNTAX("movs   %ea0, %1");
+#line 813 "rl78-decode.opc"
                 ID(mov); DM(HL, IMMU(1)); SR(X); Fzc;
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xcf:
@@ -2758,7 +2782,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xff:
               {
                 /** 0110 0001 11rb 1111                sel     rb%1                            */
-#line 1016 "rl78-decode.opc"
+#line 1043 "rl78-decode.opc"
                 int rb AU = (op[1] >> 4) & 0x03;
                 if (trace)
                   {
@@ -2768,11 +2792,11 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  rb = 0x%x\n", rb);
                   }
                 SYNTAX("sel    rb%1");
-#line 1016 "rl78-decode.opc"
+#line 1043 "rl78-decode.opc"
                 ID(sel); SC(rb);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xd0:
@@ -2785,9 +2809,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("and    %0, %e1");
-#line 269 "rl78-decode.opc"
+#line 293 "rl78-decode.opc"
                 ID(and); DR(A); SM2(HL, B, 0); Fz;
-              
+
               }
             break;
           case 0xd2:
@@ -2800,9 +2824,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("and    %0, %e1");
-#line 275 "rl78-decode.opc"
+#line 299 "rl78-decode.opc"
                 ID(and); DR(A); SM2(HL, C, 0); Fz;
-              
+
               }
             break;
           case 0xd3:
@@ -2815,9 +2839,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("bnh    $%a0");
-#line 321 "rl78-decode.opc"
+#line 345 "rl78-decode.opc"
                 ID(branch_cond); DC(pc+IMMS(1)+3); SR(None); COND(NH);
-              
+
               }
             break;
           case 0xd8:
@@ -2830,9 +2854,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1075 "rl78-decode.opc"
+#line 1102 "rl78-decode.opc"
                 ID(skip); COND(NC);
-              
+
               }
             break;
           case 0xd9:
@@ -2845,9 +2869,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("mov    %e0, %1");
-#line 605 "rl78-decode.opc"
+#line 629 "rl78-decode.opc"
                 ID(mov); DM2(HL, B, 0); SR(A);
-              
+
               }
             break;
           case 0xdb:
@@ -2860,9 +2884,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("ror    %0, %1");
-#line 997 "rl78-decode.opc"
+#line 1024 "rl78-decode.opc"
                 ID(ror); DR(A); SC(1);
-              
+
               }
             break;
           case 0xdc:
@@ -2875,9 +2899,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rolc   %0, %1");
-#line 991 "rl78-decode.opc"
+#line 1018 "rl78-decode.opc"
                 ID(rolc); DR(A); SC(1);
-              
+
               }
             break;
           case 0xdd:
@@ -2890,28 +2914,28 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("push   %s1");
-#line 972 "rl78-decode.opc"
+#line 999 "rl78-decode.opc"
                 ID(mov); W(); DPUSH(); SR(PSW);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xde:
               {
-                /** 0110 0001 1101 1110                cmps    %0, %e                        */
+                /** 0110 0001 1101 1110                cmps    %0, %ea1                        */
                 if (trace)
                   {
                     printf ("\033[33m%s\033[0m  %02x %02x\n",
-                           "/** 0110 0001 1101 1110            cmps    %0, %e                        */",
+                           "/** 0110 0001 1101 1110            cmps    %0, %ea1                        */",
                            op[0], op[1]);
                   }
-                SYNTAX("cmps   %0, %e1");
-#line 504 "rl78-decode.opc"
+                SYNTAX("cmps   %0, %ea1");
+#line 528 "rl78-decode.opc"
                 ID(cmp); DR(X); SM(HL, IMMU(1)); Fzac;
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xe0:
@@ -2924,9 +2948,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("or     %0, %e1");
-#line 921 "rl78-decode.opc"
+#line 948 "rl78-decode.opc"
                 ID(or); DR(A); SM2(HL, B, 0); Fz;
-              
+
               }
             break;
           case 0xe2:
@@ -2939,9 +2963,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("or     %0, %e1");
-#line 927 "rl78-decode.opc"
+#line 954 "rl78-decode.opc"
                 ID(or); DR(A); SM2(HL, C, 0); Fz;
-              
+
               }
             break;
           case 0xe3:
@@ -2954,9 +2978,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1072 "rl78-decode.opc"
+#line 1099 "rl78-decode.opc"
                 ID(skip); COND(H);
-              
+
               }
             break;
           case 0xe8:
@@ -2969,11 +2993,11 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1084 "rl78-decode.opc"
+#line 1111 "rl78-decode.opc"
                 ID(skip); COND(Z);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xe9:
@@ -2986,9 +3010,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("mov    %0, %e1");
-#line 641 "rl78-decode.opc"
+#line 665 "rl78-decode.opc"
                 ID(mov); DR(A); SM2(HL, C, 0);
-              
+
               }
             break;
           case 0xeb:
@@ -3001,9 +3025,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rol    %0, %1");
-#line 988 "rl78-decode.opc"
+#line 1015 "rl78-decode.opc"
                 ID(rol); DR(A); SC(1);
-              
+
               }
             break;
           case 0xec:
@@ -3016,11 +3040,11 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("retb");
-#line 983 "rl78-decode.opc"
+#line 1010 "rl78-decode.opc"
                 ID(reti);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xed:
@@ -3033,18 +3057,18 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("halt");
-#line 554 "rl78-decode.opc"
+#line 578 "rl78-decode.opc"
                 ID(halt);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0xee:
           case 0xfe:
               {
                 /** 0110 0001 111r 1110                rolwc   %0, %1                          */
-#line 994 "rl78-decode.opc"
+#line 1021 "rl78-decode.opc"
                 int r AU = (op[1] >> 4) & 0x01;
                 if (trace)
                   {
@@ -3054,9 +3078,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  r = 0x%x\n", r);
                   }
                 SYNTAX("rolwc  %0, %1");
-#line 994 "rl78-decode.opc"
+#line 1021 "rl78-decode.opc"
                 ID(rolc); W(); DRW(r); SC(1);
-              
+
               }
             break;
           case 0xf0:
@@ -3069,9 +3093,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xor    %0, %e1");
-#line 1225 "rl78-decode.opc"
+#line 1252 "rl78-decode.opc"
                 ID(xor); DR(A); SM2(HL, B, 0); Fz;
-              
+
               }
             break;
           case 0xf2:
@@ -3084,9 +3108,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("xor    %0, %e1");
-#line 1231 "rl78-decode.opc"
+#line 1258 "rl78-decode.opc"
                 ID(xor); DR(A); SM2(HL, C, 0); Fz;
-              
+
               }
             break;
           case 0xf3:
@@ -3099,9 +3123,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1078 "rl78-decode.opc"
+#line 1105 "rl78-decode.opc"
                 ID(skip); COND(NH);
-              
+
               }
             break;
           case 0xf8:
@@ -3114,9 +3138,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("sk%c1");
-#line 1081 "rl78-decode.opc"
+#line 1108 "rl78-decode.opc"
                 ID(skip); COND(NZ);
-              
+
               }
             break;
           case 0xf9:
@@ -3129,9 +3153,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("mov    %e0, %1");
-#line 614 "rl78-decode.opc"
+#line 638 "rl78-decode.opc"
                 ID(mov); DM2(HL, C, 0); SR(A);
-              
+
               }
             break;
           case 0xfb:
@@ -3144,14 +3168,14 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("rorc   %0, %1");
-#line 1000 "rl78-decode.opc"
+#line 1027 "rl78-decode.opc"
                 ID(rorc); DR(A); SC(1);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               /* Note that the branch insns need to be listed before the shift
                  ones, as "shift count of zero" means "branch insn" */
-              
+
               }
             break;
           case 0xfc:
@@ -3164,9 +3188,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("reti");
-#line 980 "rl78-decode.opc"
+#line 1007 "rl78-decode.opc"
                 ID(reti);
-              
+
               }
             break;
           case 0xfd:
@@ -3179,11 +3203,11 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("stop");
-#line 1089 "rl78-decode.opc"
+#line 1116 "rl78-decode.opc"
                 ID(stop);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           default: UNSUPPORTED(); break;
@@ -3199,9 +3223,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %e0, %1");
-#line 849 "rl78-decode.opc"
+#line 876 "rl78-decode.opc"
           ID(mov); W(); DM(C, IMMU(2)); SR(AX);
-        
+
         }
       break;
     case 0x69:
@@ -3214,9 +3238,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %e1");
-#line 840 "rl78-decode.opc"
+#line 867 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(C, IMMU(2));
-        
+
         }
       break;
     case 0x6a:
@@ -3229,11 +3253,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, #%1");
-#line 942 "rl78-decode.opc"
+#line 969 "rl78-decode.opc"
           ID(or); DM(None, SADDR); SC(IMMU(1)); Fz;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x6b:
@@ -3246,9 +3270,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, %1");
-#line 939 "rl78-decode.opc"
+#line 966 "rl78-decode.opc"
           ID(or); DR(A); SM(None, SADDR); Fz;
-        
+
         }
       break;
     case 0x6c:
@@ -3261,9 +3285,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, #%1");
-#line 930 "rl78-decode.opc"
+#line 957 "rl78-decode.opc"
           ID(or); DR(A); SC(IMMU(1)); Fz;
-        
+
         }
       break;
     case 0x6d:
@@ -3276,24 +3300,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, %e1");
-#line 918 "rl78-decode.opc"
+#line 945 "rl78-decode.opc"
           ID(or); DR(A); SM(HL, 0); Fz;
-        
+
         }
       break;
     case 0x6e:
         {
-          /** 0110 1110                        or      %0, %e                        */
+          /** 0110 1110                        or      %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0110 1110                    or      %0, %e                        */",
+                     "/** 0110 1110                    or      %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("or   %0, %e1");
-#line 924 "rl78-decode.opc"
+          SYNTAX("or   %0, %ea1");
+#line 951 "rl78-decode.opc"
           ID(or); DR(A); SM(HL, IMMU(1)); Fz;
-        
+
         }
       break;
     case 0x6f:
@@ -3306,9 +3330,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("or   %0, %e!1");
-#line 915 "rl78-decode.opc"
+#line 942 "rl78-decode.opc"
           ID(or); DR(A); SM(None, IMMU(2)); Fz;
-        
+
         }
       break;
     case 0x70:
@@ -3320,7 +3344,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x77:
         {
           /** 0111 0rba                        mov     %0, %1                          */
-#line 674 "rl78-decode.opc"
+#line 698 "rl78-decode.opc"
           int rba AU = op[0] & 0x07;
           if (trace)
             {
@@ -3330,9 +3354,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rba = 0x%x\n", rba);
             }
           SYNTAX("mov  %0, %1");
-#line 674 "rl78-decode.opc"
+#line 698 "rl78-decode.opc"
           ID(mov); DRB(rba); SR(A);
-        
+
         }
       break;
     case 0x71:
@@ -3349,7 +3373,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x70:
               {
                 /** 0111 0001 0bit 0000                set1    %e!0                            */
-#line 1021 "rl78-decode.opc"
+#line 1048 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3359,9 +3383,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %e!0");
-#line 1021 "rl78-decode.opc"
+#line 1048 "rl78-decode.opc"
                 ID(mov); DM(None, IMMU(2)); DB(bit); SC(1);
-              
+
               }
             break;
           case 0x01:
@@ -3374,7 +3398,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x71:
               {
                 /** 0111 0001 0bit 0001                mov1    %0, cy                          */
-#line 778 "rl78-decode.opc"
+#line 805 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3384,9 +3408,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   %0, cy");
-#line 778 "rl78-decode.opc"
+#line 805 "rl78-decode.opc"
                 ID(mov); DM(None, SADDR); DB(bit); SCY();
-              
+
               }
             break;
           case 0x02:
@@ -3399,7 +3423,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x72:
               {
                 /** 0111 0001 0bit 0010                set1    %0                              */
-#line 1039 "rl78-decode.opc"
+#line 1066 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3409,11 +3433,11 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %0");
-#line 1039 "rl78-decode.opc"
+#line 1066 "rl78-decode.opc"
                 ID(mov); DM(None, SADDR); DB(bit); SC(1);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x03:
@@ -3426,7 +3450,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x73:
               {
                 /** 0111 0001 0bit 0011                clr1    %0                              */
-#line 434 "rl78-decode.opc"
+#line 458 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3436,11 +3460,11 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %0");
-#line 434 "rl78-decode.opc"
+#line 458 "rl78-decode.opc"
                 ID(mov); DM(None, SADDR); DB(bit); SC(0);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x04:
@@ -3453,7 +3477,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x74:
               {
                 /** 0111 0001 0bit 0100                mov1    cy, %1                          */
-#line 772 "rl78-decode.opc"
+#line 799 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3463,9 +3487,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   cy, %1");
-#line 772 "rl78-decode.opc"
+#line 799 "rl78-decode.opc"
                 ID(mov); DCY(); SM(None, SADDR); SB(bit);
-              
+
               }
             break;
           case 0x05:
@@ -3478,7 +3502,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x75:
               {
                 /** 0111 0001 0bit 0101                and1    cy, %s1                         */
-#line 304 "rl78-decode.opc"
+#line 328 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3488,14 +3512,14 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("and1   cy, %s1");
-#line 304 "rl78-decode.opc"
+#line 328 "rl78-decode.opc"
                 ID(and); DCY(); SM(None, SADDR); SB(bit);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               /* Note that the branch insns need to be listed before the shift
                  ones, as "shift count of zero" means "branch insn" */
-              
+
               }
             break;
           case 0x06:
@@ -3508,7 +3532,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x76:
               {
                 /** 0111 0001 0bit 0110                or1     cy, %s1                         */
-#line 956 "rl78-decode.opc"
+#line 983 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3518,11 +3542,11 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("or1    cy, %s1");
-#line 956 "rl78-decode.opc"
+#line 983 "rl78-decode.opc"
                 ID(or); DCY(); SM(None, SADDR); SB(bit);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x07:
@@ -3535,7 +3559,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x77:
               {
                 /** 0111 0001 0bit 0111                xor1    cy, %s1                         */
-#line 1260 "rl78-decode.opc"
+#line 1287 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3545,11 +3569,11 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("xor1   cy, %s1");
-#line 1260 "rl78-decode.opc"
+#line 1287 "rl78-decode.opc"
                 ID(xor); DCY(); SM(None, SADDR); SB(bit);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x08:
@@ -3562,7 +3586,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x78:
               {
                 /** 0111 0001 0bit 1000                clr1    %e!0                            */
-#line 416 "rl78-decode.opc"
+#line 440 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3572,9 +3596,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %e!0");
-#line 416 "rl78-decode.opc"
+#line 440 "rl78-decode.opc"
                 ID(mov); DM(None, IMMU(2)); DB(bit); SC(0);
-              
+
               }
             break;
           case 0x09:
@@ -3587,7 +3611,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x79:
               {
                 /** 0111 0001 0bit 1001                mov1    %s0, cy                         */
-#line 781 "rl78-decode.opc"
+#line 808 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3597,11 +3621,11 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   %s0, cy");
-#line 781 "rl78-decode.opc"
+#line 808 "rl78-decode.opc"
                 ID(mov); DM(None, SFR); DB(bit); SCY();
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           case 0x0a:
@@ -3614,7 +3638,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7a:
               {
                 /** 0111 0001 0bit 1010                set1    %s0                             */
-#line 1033 "rl78-decode.opc"
+#line 1060 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3624,12 +3648,12 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %s0");
-#line 1033 "rl78-decode.opc"
+#line 1060 "rl78-decode.opc"
                 op0 = SFR;
                 ID(mov); DM(None, op0); DB(bit); SC(1);
                 if (op0 == RL78_SFR_PSW && bit == 7)
                   rl78->syntax = "ei";
-              
+
               }
             break;
           case 0x0b:
@@ -3642,7 +3666,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7b:
               {
                 /** 0111 0001 0bit 1011                clr1    %s0                             */
-#line 428 "rl78-decode.opc"
+#line 452 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3652,12 +3676,12 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %s0");
-#line 428 "rl78-decode.opc"
+#line 452 "rl78-decode.opc"
                 op0 = SFR;
                 ID(mov); DM(None, op0); DB(bit); SC(0);
                 if (op0 == RL78_SFR_PSW && bit == 7)
                   rl78->syntax = "di";
-              
+
               }
             break;
           case 0x0c:
@@ -3670,7 +3694,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7c:
               {
                 /** 0111 0001 0bit 1100                mov1    cy, %s1                         */
-#line 775 "rl78-decode.opc"
+#line 802 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3680,9 +3704,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   cy, %s1");
-#line 775 "rl78-decode.opc"
+#line 802 "rl78-decode.opc"
                 ID(mov); DCY(); SM(None, SFR); SB(bit);
-              
+
               }
             break;
           case 0x0d:
@@ -3695,7 +3719,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7d:
               {
                 /** 0111 0001 0bit 1101                and1    cy, %s1                         */
-#line 301 "rl78-decode.opc"
+#line 325 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3705,9 +3729,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("and1   cy, %s1");
-#line 301 "rl78-decode.opc"
+#line 325 "rl78-decode.opc"
                 ID(and); DCY(); SM(None, SFR); SB(bit);
-              
+
               }
             break;
           case 0x0e:
@@ -3720,7 +3744,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7e:
               {
                 /** 0111 0001 0bit 1110                or1     cy, %s1                         */
-#line 953 "rl78-decode.opc"
+#line 980 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3730,9 +3754,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("or1    cy, %s1");
-#line 953 "rl78-decode.opc"
+#line 980 "rl78-decode.opc"
                 ID(or); DCY(); SM(None, SFR); SB(bit);
-              
+
               }
             break;
           case 0x0f:
@@ -3745,7 +3769,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0x7f:
               {
                 /** 0111 0001 0bit 1111                xor1    cy, %s1                         */
-#line 1257 "rl78-decode.opc"
+#line 1284 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3755,9 +3779,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("xor1   cy, %s1");
-#line 1257 "rl78-decode.opc"
+#line 1284 "rl78-decode.opc"
                 ID(xor); DCY(); SM(None, SFR); SB(bit);
-              
+
               }
             break;
           case 0x80:
@@ -3770,9 +3794,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("set1   cy");
-#line 1030 "rl78-decode.opc"
+#line 1057 "rl78-decode.opc"
                 ID(mov); DCY(); SC(1);
-              
+
               }
             break;
           case 0x81:
@@ -3785,7 +3809,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf1:
               {
                 /** 0111 0001 1bit 0001                mov1    %e0, cy                         */
-#line 760 "rl78-decode.opc"
+#line 787 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3795,9 +3819,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   %e0, cy");
-#line 760 "rl78-decode.opc"
+#line 787 "rl78-decode.opc"
                 ID(mov); DM(HL, 0); DB(bit); SCY();
-              
+
               }
             break;
           case 0x82:
@@ -3810,7 +3834,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf2:
               {
                 /** 0111 0001 1bit 0010                set1    %e0                             */
-#line 1024 "rl78-decode.opc"
+#line 1051 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3820,9 +3844,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %e0");
-#line 1024 "rl78-decode.opc"
+#line 1051 "rl78-decode.opc"
                 ID(mov); DM(HL, 0); DB(bit); SC(1);
-              
+
               }
             break;
           case 0x83:
@@ -3835,7 +3859,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf3:
               {
                 /** 0111 0001 1bit 0011                clr1    %e0                             */
-#line 419 "rl78-decode.opc"
+#line 443 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3845,9 +3869,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %e0");
-#line 419 "rl78-decode.opc"
+#line 443 "rl78-decode.opc"
                 ID(mov); DM(HL, 0); DB(bit); SC(0);
-              
+
               }
             break;
           case 0x84:
@@ -3860,7 +3884,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf4:
               {
                 /** 0111 0001 1bit 0100                mov1    cy, %e1                         */
-#line 766 "rl78-decode.opc"
+#line 793 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3870,9 +3894,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   cy, %e1");
-#line 766 "rl78-decode.opc"
+#line 793 "rl78-decode.opc"
                 ID(mov); DCY(); SM(HL, 0); SB(bit);
-              
+
               }
             break;
           case 0x85:
@@ -3885,7 +3909,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf5:
               {
                 /** 0111 0001 1bit 0101                and1    cy, %e1                 */
-#line 295 "rl78-decode.opc"
+#line 319 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3895,9 +3919,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("and1   cy, %e1");
-#line 295 "rl78-decode.opc"
+#line 319 "rl78-decode.opc"
                 ID(and); DCY(); SM(HL, 0); SB(bit);
-              
+
               }
             break;
           case 0x86:
@@ -3910,7 +3934,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf6:
               {
                 /** 0111 0001 1bit 0110                or1     cy, %e1                         */
-#line 947 "rl78-decode.opc"
+#line 974 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3920,9 +3944,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("or1    cy, %e1");
-#line 947 "rl78-decode.opc"
+#line 974 "rl78-decode.opc"
                 ID(or); DCY(); SM(HL, 0); SB(bit);
-              
+
               }
             break;
           case 0x87:
@@ -3935,7 +3959,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf7:
               {
                 /** 0111 0001 1bit 0111                xor1    cy, %e1                         */
-#line 1251 "rl78-decode.opc"
+#line 1278 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3945,9 +3969,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("xor1   cy, %e1");
-#line 1251 "rl78-decode.opc"
+#line 1278 "rl78-decode.opc"
                 ID(xor); DCY(); SM(HL, 0); SB(bit);
-              
+
               }
             break;
           case 0x88:
@@ -3960,9 +3984,9 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("clr1   cy");
-#line 425 "rl78-decode.opc"
+#line 449 "rl78-decode.opc"
                 ID(mov); DCY(); SC(0);
-              
+
               }
             break;
           case 0x89:
@@ -3975,7 +3999,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xf9:
               {
                 /** 0111 0001 1bit 1001                mov1    %e0, cy                         */
-#line 763 "rl78-decode.opc"
+#line 790 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -3985,9 +4009,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   %e0, cy");
-#line 763 "rl78-decode.opc"
+#line 790 "rl78-decode.opc"
                 ID(mov); DR(A); DB(bit); SCY();
-              
+
               }
             break;
           case 0x8a:
@@ -4000,7 +4024,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfa:
               {
                 /** 0111 0001 1bit 1010                set1    %0                              */
-#line 1027 "rl78-decode.opc"
+#line 1054 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4010,9 +4034,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("set1   %0");
-#line 1027 "rl78-decode.opc"
+#line 1054 "rl78-decode.opc"
                 ID(mov); DR(A); DB(bit); SC(1);
-              
+
               }
             break;
           case 0x8b:
@@ -4025,7 +4049,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfb:
               {
                 /** 0111 0001 1bit 1011                clr1    %0                              */
-#line 422 "rl78-decode.opc"
+#line 446 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4035,9 +4059,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("clr1   %0");
-#line 422 "rl78-decode.opc"
+#line 446 "rl78-decode.opc"
                 ID(mov); DR(A); DB(bit); SC(0);
-              
+
               }
             break;
           case 0x8c:
@@ -4050,7 +4074,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfc:
               {
                 /** 0111 0001 1bit 1100                mov1    cy, %e1                         */
-#line 769 "rl78-decode.opc"
+#line 796 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4060,9 +4084,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("mov1   cy, %e1");
-#line 769 "rl78-decode.opc"
+#line 796 "rl78-decode.opc"
                 ID(mov); DCY(); SR(A); SB(bit);
-              
+
               }
             break;
           case 0x8d:
@@ -4075,7 +4099,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfd:
               {
                 /** 0111 0001 1bit 1101                and1    cy, %1                          */
-#line 298 "rl78-decode.opc"
+#line 322 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4085,9 +4109,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("and1   cy, %1");
-#line 298 "rl78-decode.opc"
+#line 322 "rl78-decode.opc"
                 ID(and); DCY(); SR(A); SB(bit);
-              
+
               }
             break;
           case 0x8e:
@@ -4100,7 +4124,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xfe:
               {
                 /** 0111 0001 1bit 1110                or1     cy, %1                          */
-#line 950 "rl78-decode.opc"
+#line 977 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4110,9 +4134,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("or1    cy, %1");
-#line 950 "rl78-decode.opc"
+#line 977 "rl78-decode.opc"
                 ID(or); DCY(); SR(A); SB(bit);
-              
+
               }
             break;
           case 0x8f:
@@ -4125,7 +4149,7 @@ rl78_decode_opcode (unsigned long pc AU,
           case 0xff:
               {
                 /** 0111 0001 1bit 1111                xor1    cy, %1                          */
-#line 1254 "rl78-decode.opc"
+#line 1281 "rl78-decode.opc"
                 int bit AU = (op[1] >> 4) & 0x07;
                 if (trace)
                   {
@@ -4135,9 +4159,9 @@ rl78_decode_opcode (unsigned long pc AU,
                     printf ("  bit = 0x%x\n", bit);
                   }
                 SYNTAX("xor1   cy, %1");
-#line 1254 "rl78-decode.opc"
+#line 1281 "rl78-decode.opc"
                 ID(xor); DCY(); SR(A); SB(bit);
-              
+
               }
             break;
           case 0xc0:
@@ -4150,11 +4174,11 @@ rl78_decode_opcode (unsigned long pc AU,
                            op[0], op[1]);
                   }
                 SYNTAX("not1   cy");
-#line 891 "rl78-decode.opc"
+#line 918 "rl78-decode.opc"
                 ID(xor); DCY(); SC(1);
-              
+
               /*----------------------------------------------------------------------*/
-              
+
               }
             break;
           default: UNSUPPORTED(); break;
@@ -4170,9 +4194,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %e0, %1");
-#line 852 "rl78-decode.opc"
+#line 879 "rl78-decode.opc"
           ID(mov); W(); DM(BC, IMMU(2)); SR(AX);
-        
+
         }
       break;
     case 0x79:
@@ -4185,9 +4209,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %e1");
-#line 843 "rl78-decode.opc"
+#line 870 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(BC, IMMU(2));
-        
+
         }
       break;
     case 0x7a:
@@ -4200,11 +4224,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, #%1");
-#line 1246 "rl78-decode.opc"
+#line 1273 "rl78-decode.opc"
           ID(xor); DM(None, SADDR); SC(IMMU(1)); Fz;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x7b:
@@ -4217,9 +4241,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, %1");
-#line 1243 "rl78-decode.opc"
+#line 1270 "rl78-decode.opc"
           ID(xor); DR(A); SM(None, SADDR); Fz;
-        
+
         }
       break;
     case 0x7c:
@@ -4232,9 +4256,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, #%1");
-#line 1234 "rl78-decode.opc"
+#line 1261 "rl78-decode.opc"
           ID(xor); DR(A); SC(IMMU(1)); Fz;
-        
+
         }
       break;
     case 0x7d:
@@ -4247,24 +4271,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, %e1");
-#line 1222 "rl78-decode.opc"
+#line 1249 "rl78-decode.opc"
           ID(xor); DR(A); SM(HL, 0); Fz;
-        
+
         }
       break;
     case 0x7e:
         {
-          /** 0111 1110                        xor     %0, %e                        */
+          /** 0111 1110                        xor     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 0111 1110                    xor     %0, %e                        */",
+                     "/** 0111 1110                    xor     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("xor  %0, %e1");
-#line 1228 "rl78-decode.opc"
+          SYNTAX("xor  %0, %ea1");
+#line 1255 "rl78-decode.opc"
           ID(xor); DR(A); SM(HL, IMMU(1)); Fz;
-        
+
         }
       break;
     case 0x7f:
@@ -4277,9 +4301,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("xor  %0, %e!1");
-#line 1219 "rl78-decode.opc"
+#line 1246 "rl78-decode.opc"
           ID(xor); DR(A); SM(None, IMMU(2)); Fz;
-        
+
         }
       break;
     case 0x80:
@@ -4292,7 +4316,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x87:
         {
           /** 1000 0reg                        inc     %0                              */
-#line 565 "rl78-decode.opc"
+#line 589 "rl78-decode.opc"
           int reg AU = op[0] & 0x07;
           if (trace)
             {
@@ -4302,24 +4326,24 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  reg = 0x%x\n", reg);
             }
           SYNTAX("inc  %0");
-#line 565 "rl78-decode.opc"
+#line 589 "rl78-decode.opc"
           ID(add); DRB(reg); SC(1); Fza;
-        
+
         }
       break;
     case 0x88:
         {
-          /** 1000 1000                        mov     %0, %e                        */
+          /** 1000 1000                        mov     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1000                    mov     %0, %e                        */",
+                     "/** 1000 1000                    mov     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1");
-#line 644 "rl78-decode.opc"
+          SYNTAX("mov  %0, %ea1");
+#line 668 "rl78-decode.opc"
           ID(mov); DR(A); SM(SP, IMMU(1));
-        
+
         }
       break;
     case 0x89:
@@ -4332,24 +4356,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e1");
-#line 626 "rl78-decode.opc"
+#line 650 "rl78-decode.opc"
           ID(mov); DR(A); SM(DE, 0);
-        
+
         }
       break;
     case 0x8a:
         {
-          /** 1000 1010                        mov     %0, %e                        */
+          /** 1000 1010                        mov     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1010                    mov     %0, %e                        */",
+                     "/** 1000 1010                    mov     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1");
-#line 629 "rl78-decode.opc"
+          SYNTAX("mov  %0, %ea1");
+#line 653 "rl78-decode.opc"
           ID(mov); DR(A); SM(DE, IMMU(1));
-        
+
         }
       break;
     case 0x8b:
@@ -4362,24 +4386,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e1");
-#line 632 "rl78-decode.opc"
+#line 656 "rl78-decode.opc"
           ID(mov); DR(A); SM(HL, 0);
-        
+
         }
       break;
     case 0x8c:
         {
-          /** 1000 1100                        mov     %0, %e                        */
+          /** 1000 1100                        mov     %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1000 1100                    mov     %0, %e                        */",
+                     "/** 1000 1100                    mov     %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %e1");
-#line 635 "rl78-decode.opc"
+          SYNTAX("mov  %0, %ea1");
+#line 659 "rl78-decode.opc"
           ID(mov); DR(A); SM(HL, IMMU(1));
-        
+
         }
       break;
     case 0x8d:
@@ -4392,9 +4416,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 668 "rl78-decode.opc"
+#line 692 "rl78-decode.opc"
           ID(mov); DR(A); SM(None, SADDR);
-        
+
         }
       break;
     case 0x8e:
@@ -4407,9 +4431,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %s1");
-#line 665 "rl78-decode.opc"
+#line 689 "rl78-decode.opc"
           ID(mov); DR(A); SM(None, SFR);
-        
+
         }
       break;
     case 0x8f:
@@ -4422,9 +4446,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e!1");
-#line 623 "rl78-decode.opc"
+#line 647 "rl78-decode.opc"
           ID(mov); DR(A); SM(None, IMMU(2));
-        
+
         }
       break;
     case 0x90:
@@ -4437,7 +4461,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0x97:
         {
           /** 1001 0reg                        dec     %0                              */
-#line 532 "rl78-decode.opc"
+#line 556 "rl78-decode.opc"
           int reg AU = op[0] & 0x07;
           if (trace)
             {
@@ -4447,84 +4471,84 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  reg = 0x%x\n", reg);
             }
           SYNTAX("dec  %0");
-#line 532 "rl78-decode.opc"
+#line 556 "rl78-decode.opc"
           ID(sub); DRB(reg); SC(1); Fza;
-        
+
         }
       break;
     case 0x98:
         {
-          /** 1001 1000                        mov     %0, %1                          */
+          /** 1001 1000                        mov     %a0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1000                    mov     %0, %1                          */",
+                     "/** 1001 1000                    mov     %a0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %1");
-#line 620 "rl78-decode.opc"
+          SYNTAX("mov  %a0, %1");
+#line 644 "rl78-decode.opc"
           ID(mov); DM(SP, IMMU(1)); SR(A);
-        
+
         }
       break;
     case 0x99:
         {
-          /** 1001 1001                        mov     %e0,%1                          */
+          /** 1001 1001                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1001                    mov     %e0,%1                          */",
+                     "/** 1001 1001                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0,%1");
-#line 593 "rl78-decode.opc"
+          SYNTAX("mov  %e0, %1");
+#line 617 "rl78-decode.opc"
           ID(mov); DM(DE, 0); SR(A);
-        
+
         }
       break;
     case 0x9a:
         {
-          /** 1001 1010                        mov     %e0, %1                         */
+          /** 1001 1010                        mov     %ea0, %1                                */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1010                    mov     %e0, %1                         */",
+                     "/** 1001 1010                    mov     %ea0, %1                                */",
                      op[0]);
             }
-          SYNTAX("mov  %e0, %1");
-#line 599 "rl78-decode.opc"
+          SYNTAX("mov  %ea0, %1");
+#line 623 "rl78-decode.opc"
           ID(mov); DM(DE, IMMU(1)); SR(A);
-        
+
         }
       break;
     case 0x9b:
         {
-          /** 1001 1011                        mov     %e0,%1                          */
+          /** 1001 1011                        mov     %e0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1011                    mov     %e0,%1                          */",
+                     "/** 1001 1011                    mov     %e0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %e0,%1");
-#line 602 "rl78-decode.opc"
+          SYNTAX("mov  %e0, %1");
+#line 626 "rl78-decode.opc"
           ID(mov); DM(HL, 0); SR(A);
-        
+
         }
       break;
     case 0x9c:
         {
-          /** 1001 1100                        mov     %e0, %1                         */
+          /** 1001 1100                        mov     %ea0, %1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1100                    mov     %e0, %1                         */",
+                     "/** 1001 1100                    mov     %ea0, %1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %e0, %1");
-#line 611 "rl78-decode.opc"
+          SYNTAX("mov  %ea0, %1");
+#line 635 "rl78-decode.opc"
           ID(mov); DM(HL, IMMU(1)); SR(A);
-        
+
         }
       break;
     case 0x9d:
@@ -4537,26 +4561,26 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 725 "rl78-decode.opc"
+#line 749 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SR(A);
-        
+
         }
       break;
     case 0x9e:
         {
-          /** 1001 1110                        mov     %0, %1                          */
+          /** 1001 1110                        mov     %s0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1001 1110                    mov     %0, %1                          */",
+                     "/** 1001 1110                    mov     %s0, %1                         */",
                      op[0]);
             }
-          SYNTAX("mov  %0, %1");
-#line 755 "rl78-decode.opc"
+          SYNTAX("mov  %s0, %1");
+#line 782 "rl78-decode.opc"
           ID(mov); DM(None, SFR); SR(A);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0x9f:
@@ -4569,9 +4593,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e!0, %1");
-#line 590 "rl78-decode.opc"
+#line 614 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SR(A);
-        
+
         }
       break;
     case 0xa0:
@@ -4584,9 +4608,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("inc  %e!0");
-#line 559 "rl78-decode.opc"
+#line 583 "rl78-decode.opc"
           ID(add); DM(None, IMMU(2)); SC(1); Fza;
-        
+
         }
       break;
     case 0xa1:
@@ -4595,7 +4619,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xa7:
         {
           /** 1010 0rg1                        incw    %0                              */
-#line 579 "rl78-decode.opc"
+#line 603 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -4605,9 +4629,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("incw %0");
-#line 579 "rl78-decode.opc"
+#line 603 "rl78-decode.opc"
           ID(add); W(); DRW(rg); SC(1);
-        
+
         }
       break;
     case 0xa2:
@@ -4620,9 +4644,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("incw %e!0");
-#line 573 "rl78-decode.opc"
+#line 597 "rl78-decode.opc"
           ID(add); W(); DM(None, IMMU(2)); SC(1);
-        
+
         }
       break;
     case 0xa4:
@@ -4635,11 +4659,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("inc  %0");
-#line 568 "rl78-decode.opc"
+#line 592 "rl78-decode.opc"
           ID(add); DM(None, SADDR); SC(1); Fza;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xa6:
@@ -4652,26 +4676,26 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("incw %0");
-#line 582 "rl78-decode.opc"
+#line 606 "rl78-decode.opc"
           ID(add); W(); DM(None, SADDR); SC(1);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xa8:
         {
-          /** 1010 1000                        movw    %0, %                         */
+          /** 1010 1000                        movw    %0, %a1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1000                    movw    %0, %                         */",
+                     "/** 1010 1000                    movw    %0, %a1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %1");
-#line 825 "rl78-decode.opc"
+          SYNTAX("movw %0, %a1");
+#line 852 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(SP, IMMU(1));
-        
+
         }
       break;
     case 0xa9:
@@ -4684,24 +4708,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %e1");
-#line 813 "rl78-decode.opc"
+#line 840 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(DE, 0);
-        
+
         }
       break;
     case 0xaa:
         {
-          /** 1010 1010                        movw    %0, %e1                         */
+          /** 1010 1010                        movw    %0, %ea1                                */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1010                    movw    %0, %e1                         */",
+                     "/** 1010 1010                    movw    %0, %ea1                                */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1");
-#line 816 "rl78-decode.opc"
+          SYNTAX("movw %0, %ea1");
+#line 843 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(DE, IMMU(1));
-        
+
         }
       break;
     case 0xab:
@@ -4714,24 +4738,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %e1");
-#line 819 "rl78-decode.opc"
+#line 846 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(HL, 0);
-        
+
         }
       break;
     case 0xac:
         {
-          /** 1010 1100                        movw    %0, %e                        */
+          /** 1010 1100                        movw    %0, %ea1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1010 1100                    movw    %0, %e                        */",
+                     "/** 1010 1100                    movw    %0, %ea1                        */",
                      op[0]);
             }
-          SYNTAX("movw %0, %e1");
-#line 822 "rl78-decode.opc"
+          SYNTAX("movw %0, %ea1");
+#line 849 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(HL, IMMU(1));
-        
+
         }
       break;
     case 0xad:
@@ -4744,9 +4768,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %1");
-#line 855 "rl78-decode.opc"
+#line 882 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(None, SADDR);
-        
+
         }
       break;
     case 0xae:
@@ -4759,9 +4783,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %s1");
-#line 858 "rl78-decode.opc"
+#line 885 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(None, SFR);
-        
+
         }
       break;
     case 0xaf:
@@ -4774,10 +4798,10 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %e!1");
-#line 809 "rl78-decode.opc"
+#line 836 "rl78-decode.opc"
           ID(mov); W(); DR(AX); SM(None, IMMU(2));
-        
-        
+
+
         }
       break;
     case 0xb0:
@@ -4790,9 +4814,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("dec  %e!0");
-#line 526 "rl78-decode.opc"
+#line 550 "rl78-decode.opc"
           ID(sub); DM(None, IMMU(2)); SC(1); Fza;
-        
+
         }
       break;
     case 0xb1:
@@ -4801,7 +4825,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xb7:
         {
           /** 1011 0rg1                        decw    %0                              */
-#line 546 "rl78-decode.opc"
+#line 570 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -4811,9 +4835,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("decw %0");
-#line 546 "rl78-decode.opc"
+#line 570 "rl78-decode.opc"
           ID(sub); W(); DRW(rg); SC(1);
-        
+
         }
       break;
     case 0xb2:
@@ -4826,9 +4850,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("decw %e!0");
-#line 540 "rl78-decode.opc"
+#line 564 "rl78-decode.opc"
           ID(sub); W(); DM(None, IMMU(2)); SC(1);
-        
+
         }
       break;
     case 0xb4:
@@ -4841,11 +4865,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("dec  %0");
-#line 535 "rl78-decode.opc"
+#line 559 "rl78-decode.opc"
           ID(sub); DM(None, SADDR); SC(1); Fza;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xb6:
@@ -4858,26 +4882,26 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("decw %0");
-#line 549 "rl78-decode.opc"
+#line 573 "rl78-decode.opc"
           ID(sub); W(); DM(None, SADDR); SC(1);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xb8:
         {
-          /** 1011 1000                        movw    %0, %1                          */
+          /** 1011 1000                        movw    %a0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1000                    movw    %0, %1                          */",
+                     "/** 1011 1000                    movw    %a0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %1");
-#line 806 "rl78-decode.opc"
+          SYNTAX("movw %a0, %1");
+#line 833 "rl78-decode.opc"
           ID(mov); W(); DM(SP, IMMU(1)); SR(AX);
-        
+
         }
       break;
     case 0xb9:
@@ -4890,24 +4914,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %e0, %1");
-#line 794 "rl78-decode.opc"
+#line 821 "rl78-decode.opc"
           ID(mov); W(); DM(DE, 0); SR(AX);
-        
+
         }
       break;
     case 0xba:
         {
-          /** 1011 1010                        movw    %e0, %1                         */
+          /** 1011 1010                        movw    %ea0, %1                                */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1010                    movw    %e0, %1                         */",
+                     "/** 1011 1010                    movw    %ea0, %1                                */",
                      op[0]);
             }
-          SYNTAX("movw %e0, %1");
-#line 797 "rl78-decode.opc"
+          SYNTAX("movw %ea0, %1");
+#line 824 "rl78-decode.opc"
           ID(mov); W(); DM(DE, IMMU(1)); SR(AX);
-        
+
         }
       break;
     case 0xbb:
@@ -4920,24 +4944,24 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %e0, %1");
-#line 800 "rl78-decode.opc"
+#line 827 "rl78-decode.opc"
           ID(mov); W(); DM(HL, 0); SR(AX);
-        
+
         }
       break;
     case 0xbc:
         {
-          /** 1011 1100                        movw    %e0, %1                         */
+          /** 1011 1100                        movw    %ea0, %1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1100                    movw    %e0, %1                         */",
+                     "/** 1011 1100                    movw    %ea0, %1                        */",
                      op[0]);
             }
-          SYNTAX("movw %e0, %1");
-#line 803 "rl78-decode.opc"
+          SYNTAX("movw %ea0, %1");
+#line 830 "rl78-decode.opc"
           ID(mov); W(); DM(HL, IMMU(1)); SR(AX);
-        
+
         }
       break;
     case 0xbd:
@@ -4950,26 +4974,26 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, %1");
-#line 870 "rl78-decode.opc"
+#line 897 "rl78-decode.opc"
           ID(mov); W(); DM(None, SADDR); SR(AX);
-        
+
         }
       break;
     case 0xbe:
         {
-          /** 1011 1110                        movw    %0, %1                          */
+          /** 1011 1110                        movw    %s0, %1                         */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1011 1110                    movw    %0, %1                          */",
+                     "/** 1011 1110                    movw    %s0, %1                         */",
                      op[0]);
             }
-          SYNTAX("movw %0, %1");
-#line 876 "rl78-decode.opc"
+          SYNTAX("movw %s0, %1");
+#line 903 "rl78-decode.opc"
           ID(mov); W(); DM(None, SFR); SR(AX);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xbf:
@@ -4982,9 +5006,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %e!0, %1");
-#line 791 "rl78-decode.opc"
+#line 818 "rl78-decode.opc"
           ID(mov); W(); DM(None, IMMU(2)); SR(AX);
-        
+
         }
       break;
     case 0xc0:
@@ -4993,7 +5017,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xc6:
         {
           /** 1100 0rg0                        pop     %0                              */
-#line 961 "rl78-decode.opc"
+#line 988 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -5003,9 +5027,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("pop  %0");
-#line 961 "rl78-decode.opc"
+#line 988 "rl78-decode.opc"
           ID(mov); W(); DRW(rg); SPOP();
-        
+
         }
       break;
     case 0xc1:
@@ -5014,7 +5038,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xc7:
         {
           /** 1100 0rg1                        push    %1                              */
-#line 969 "rl78-decode.opc"
+#line 996 "rl78-decode.opc"
           int rg AU = (op[0] >> 1) & 0x03;
           if (trace)
             {
@@ -5024,24 +5048,24 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("push %1");
-#line 969 "rl78-decode.opc"
+#line 996 "rl78-decode.opc"
           ID(mov); W(); DPUSH(); SRW(rg);
-        
+
         }
       break;
     case 0xc8:
         {
-          /** 1100 1000                        mov     %0, #%1                         */
+          /** 1100 1000                        mov     %a0, #%1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1100 1000                    mov     %0, #%1                         */",
+                     "/** 1100 1000                    mov     %a0, #%1                        */",
                      op[0]);
             }
-          SYNTAX("mov  %0, #%1");
-#line 617 "rl78-decode.opc"
+          SYNTAX("mov  %a0, #%1");
+#line 641 "rl78-decode.opc"
           ID(mov); DM(SP, IMMU(1)); SC(IMMU(1));
-        
+
         }
       break;
     case 0xc9:
@@ -5054,54 +5078,54 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("movw %0, #%1");
-#line 867 "rl78-decode.opc"
+#line 894 "rl78-decode.opc"
           ID(mov); W(); DM(None, SADDR); SC(IMMU(2));
-        
+
         }
       break;
     case 0xca:
         {
-          /** 1100 1010                        mov     %e0, #%1                        */
+          /** 1100 1010                        mov     %ea0, #%1                       */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1100 1010                    mov     %e0, #%1                        */",
+                     "/** 1100 1010                    mov     %ea0, #%1                       */",
                      op[0]);
             }
-          SYNTAX("mov  %e0, #%1");
-#line 596 "rl78-decode.opc"
+          SYNTAX("mov  %ea0, #%1");
+#line 620 "rl78-decode.opc"
           ID(mov); DM(DE, IMMU(1)); SC(IMMU(1));
-        
+
         }
       break;
     case 0xcb:
         {
-          /** 1100 1011                        movw    %0, #%1                         */
+          /** 1100 1011                        movw    %s0, #%1                        */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1100 1011                    movw    %0, #%1                         */",
+                     "/** 1100 1011                    movw    %s0, #%1                        */",
                      op[0]);
             }
-          SYNTAX("movw %0, #%1");
-#line 873 "rl78-decode.opc"
+          SYNTAX("movw %s0, #%1");
+#line 900 "rl78-decode.opc"
           ID(mov); W(); DM(None, SFR); SC(IMMU(2));
-        
+
         }
       break;
     case 0xcc:
         {
-          /** 1100 1100                        mov     %e0, #%1                        */
+          /** 1100 1100                        mov     %ea0, #%1                       */
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 1100 1100                    mov     %e0, #%1                        */",
+                     "/** 1100 1100                    mov     %ea0, #%1                       */",
                      op[0]);
             }
-          SYNTAX("mov  %e0, #%1");
-#line 608 "rl78-decode.opc"
+          SYNTAX("mov  %ea0, #%1");
+#line 632 "rl78-decode.opc"
           ID(mov); DM(HL, IMMU(1)); SC(IMMU(1));
-        
+
         }
       break;
     case 0xcd:
@@ -5114,9 +5138,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, #%1");
-#line 722 "rl78-decode.opc"
+#line 746 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SC(IMMU(1));
-        
+
         }
       break;
     case 0xce:
@@ -5129,11 +5153,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %s0, #%1");
-#line 728 "rl78-decode.opc"
+#line 752 "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 +5170,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,8 +5178,11 @@ 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:
@@ -5168,9 +5195,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %e!0, #%1");
-#line 587 "rl78-decode.opc"
+#line 611 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SC(IMMU(1));
-        
+
         }
       break;
     case 0xd0:
@@ -5179,7 +5206,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xd3:
         {
           /** 1101 00rg                        cmp0    %0                              */
-#line 496 "rl78-decode.opc"
+#line 520 "rl78-decode.opc"
           int rg AU = op[0] & 0x03;
           if (trace)
             {
@@ -5189,9 +5216,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("cmp0 %0");
-#line 496 "rl78-decode.opc"
+#line 520 "rl78-decode.opc"
           ID(cmp); DRB(rg); SC(0); Fzac;
-        
+
         }
       break;
     case 0xd4:
@@ -5204,11 +5231,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp0 %0");
-#line 499 "rl78-decode.opc"
+#line 523 "rl78-decode.opc"
           ID(cmp); DM(None, SADDR); SC(0); Fzac;
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xd5:
@@ -5221,9 +5248,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("cmp0 %e!0");
-#line 493 "rl78-decode.opc"
+#line 517 "rl78-decode.opc"
           ID(cmp); DM(None, IMMU(2)); SC(0); Fzac;
-        
+
         }
       break;
     case 0xd6:
@@ -5236,11 +5263,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mulu x");
-#line 881 "rl78-decode.opc"
+#line 908 "rl78-decode.opc"
           ID(mulu);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xd7:
@@ -5253,9 +5280,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("ret");
-#line 977 "rl78-decode.opc"
+#line 1004 "rl78-decode.opc"
           ID(ret);
-        
+
         }
       break;
     case 0xd8:
@@ -5268,9 +5295,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 689 "rl78-decode.opc"
+#line 713 "rl78-decode.opc"
           ID(mov); DR(X); SM(None, SADDR);
-        
+
         }
       break;
     case 0xd9:
@@ -5283,9 +5310,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e!1");
-#line 686 "rl78-decode.opc"
+#line 710 "rl78-decode.opc"
           ID(mov); DR(X); SM(None, IMMU(2));
-        
+
         }
       break;
     case 0xda:
@@ -5293,7 +5320,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xfa:
         {
           /** 11ra 1010                        movw    %0, %1                          */
-#line 864 "rl78-decode.opc"
+#line 891 "rl78-decode.opc"
           int ra AU = (op[0] >> 4) & 0x03;
           if (trace)
             {
@@ -5303,29 +5330,29 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  ra = 0x%x\n", ra);
             }
           SYNTAX("movw %0, %1");
-#line 864 "rl78-decode.opc"
+#line 891 "rl78-decode.opc"
           ID(mov); W(); DRW(ra); SM(None, SADDR);
-        
+
         }
       break;
     case 0xdb:
     case 0xeb:
     case 0xfb:
         {
-          /** 11ra 1011                        movw    %0, %e!1                        */
-#line 861 "rl78-decode.opc"
+          /** 11ra 1011                        movw    %0, %es!1                       */
+#line 888 "rl78-decode.opc"
           int ra AU = (op[0] >> 4) & 0x03;
           if (trace)
             {
               printf ("\033[33m%s\033[0m  %02x\n",
-                     "/** 11ra 1011                    movw    %0, %e!1                        */",
+                     "/** 11ra 1011                    movw    %0, %es!1                       */",
                      op[0]);
               printf ("  ra = 0x%x\n", ra);
             }
-          SYNTAX("movw %0, %e!1");
-#line 861 "rl78-decode.opc"
+          SYNTAX("movw %0, %es!1");
+#line 888 "rl78-decode.opc"
           ID(mov); W(); DRW(ra); SM(None, IMMU(2));
-        
+
         }
       break;
     case 0xdc:
@@ -5338,9 +5365,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bc   $%a0");
-#line 312 "rl78-decode.opc"
+#line 336 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(C);
-        
+
         }
       break;
     case 0xdd:
@@ -5353,9 +5380,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bz   $%a0");
-#line 324 "rl78-decode.opc"
+#line 348 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(Z);
-        
+
         }
       break;
     case 0xde:
@@ -5368,9 +5395,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bnc  $%a0");
-#line 315 "rl78-decode.opc"
+#line 339 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(NC);
-        
+
         }
       break;
     case 0xdf:
@@ -5383,11 +5410,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("bnz  $%a0");
-#line 327 "rl78-decode.opc"
+#line 351 "rl78-decode.opc"
           ID(branch_cond); DC(pc+IMMS(1)+2); SR(None); COND(NZ);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xe0:
@@ -5396,7 +5423,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xe3:
         {
           /** 1110 00rg                        oneb    %0                              */
-#line 899 "rl78-decode.opc"
+#line 926 "rl78-decode.opc"
           int rg AU = op[0] & 0x03;
           if (trace)
             {
@@ -5406,9 +5433,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("oneb %0");
-#line 899 "rl78-decode.opc"
+#line 926 "rl78-decode.opc"
           ID(mov); DRB(rg); SC(1);
-        
+
         }
       break;
     case 0xe4:
@@ -5421,11 +5448,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("oneb %0");
-#line 902 "rl78-decode.opc"
+#line 929 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SC(1);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xe5:
@@ -5438,9 +5465,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("oneb %e!0");
-#line 896 "rl78-decode.opc"
+#line 923 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SC(1);
-        
+
         }
       break;
     case 0xe6:
@@ -5453,9 +5480,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("onew %0");
-#line 907 "rl78-decode.opc"
+#line 934 "rl78-decode.opc"
           ID(mov); DR(AX); SC(1);
-        
+
         }
       break;
     case 0xe7:
@@ -5468,11 +5495,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("onew %0");
-#line 910 "rl78-decode.opc"
+#line 937 "rl78-decode.opc"
           ID(mov); DR(BC); SC(1);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xe8:
@@ -5485,9 +5512,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 677 "rl78-decode.opc"
+#line 701 "rl78-decode.opc"
           ID(mov); DR(B); SM(None, SADDR);
-        
+
         }
       break;
     case 0xe9:
@@ -5500,9 +5527,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e!1");
-#line 671 "rl78-decode.opc"
+#line 695 "rl78-decode.opc"
           ID(mov); DR(B); SM(None, IMMU(2));
-        
+
         }
       break;
     case 0xec:
@@ -5515,9 +5542,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   !%!a0");
-#line 346 "rl78-decode.opc"
+#line 370 "rl78-decode.opc"
           ID(branch); DC(IMMU(3));
-        
+
         }
       break;
     case 0xed:
@@ -5530,9 +5557,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   %!a0");
-#line 349 "rl78-decode.opc"
+#line 373 "rl78-decode.opc"
           ID(branch); DC(IMMU(2));
-        
+
         }
       break;
     case 0xee:
@@ -5545,9 +5572,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   $%!a0");
-#line 352 "rl78-decode.opc"
+#line 376 "rl78-decode.opc"
           ID(branch); DC(pc+IMMS(2)+3);
-        
+
         }
       break;
     case 0xef:
@@ -5560,9 +5587,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("br   $%a0");
-#line 355 "rl78-decode.opc"
+#line 379 "rl78-decode.opc"
           ID(branch); DC(pc+IMMS(1)+2);
-        
+
         }
       break;
     case 0xf0:
@@ -5571,7 +5598,7 @@ rl78_decode_opcode (unsigned long pc AU,
     case 0xf3:
         {
           /** 1111 00rg                        clrb    %0                              */
-#line 442 "rl78-decode.opc"
+#line 466 "rl78-decode.opc"
           int rg AU = op[0] & 0x03;
           if (trace)
             {
@@ -5581,9 +5608,9 @@ rl78_decode_opcode (unsigned long pc AU,
               printf ("  rg = 0x%x\n", rg);
             }
           SYNTAX("clrb %0");
-#line 442 "rl78-decode.opc"
+#line 466 "rl78-decode.opc"
           ID(mov); DRB(rg); SC(0);
-        
+
         }
       break;
     case 0xf4:
@@ -5596,11 +5623,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("clrb %0");
-#line 445 "rl78-decode.opc"
+#line 469 "rl78-decode.opc"
           ID(mov); DM(None, SADDR); SC(0);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xf5:
@@ -5613,9 +5640,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("clrb %e!0");
-#line 439 "rl78-decode.opc"
+#line 463 "rl78-decode.opc"
           ID(mov); DM(None, IMMU(2)); SC(0);
-        
+
         }
       break;
     case 0xf6:
@@ -5628,9 +5655,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("clrw %0");
-#line 450 "rl78-decode.opc"
+#line 474 "rl78-decode.opc"
           ID(mov); DR(AX); SC(0);
-        
+
         }
       break;
     case 0xf7:
@@ -5643,11 +5670,11 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("clrw %0");
-#line 453 "rl78-decode.opc"
+#line 477 "rl78-decode.opc"
           ID(mov); DR(BC); SC(0);
-        
+
         /*----------------------------------------------------------------------*/
-        
+
         }
       break;
     case 0xf8:
@@ -5660,9 +5687,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %1");
-#line 683 "rl78-decode.opc"
+#line 707 "rl78-decode.opc"
           ID(mov); DR(C); SM(None, SADDR);
-        
+
         }
       break;
     case 0xf9:
@@ -5675,9 +5702,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("mov  %0, %e!1");
-#line 680 "rl78-decode.opc"
+#line 704 "rl78-decode.opc"
           ID(mov); DR(C); SM(None, IMMU(2));
-        
+
         }
       break;
     case 0xfc:
@@ -5690,9 +5717,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("call !%!a0");
-#line 399 "rl78-decode.opc"
+#line 423 "rl78-decode.opc"
           ID(call); DC(IMMU(3));
-        
+
         }
       break;
     case 0xfd:
@@ -5705,9 +5732,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("call %!a0");
-#line 402 "rl78-decode.opc"
+#line 426 "rl78-decode.opc"
           ID(call); DC(IMMU(2));
-        
+
         }
       break;
     case 0xfe:
@@ -5720,9 +5747,9 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("call $%!a0");
-#line 405 "rl78-decode.opc"
+#line 429 "rl78-decode.opc"
           ID(call); DC(pc+IMMS(2)+3);
-        
+
         }
       break;
     case 0xff:
@@ -5735,13 +5762,13 @@ rl78_decode_opcode (unsigned long pc AU,
                      op[0]);
             }
           SYNTAX("brk1");
-#line 363 "rl78-decode.opc"
+#line 387 "rl78-decode.opc"
           ID(break);
-        
+
         }
       break;
   }
-#line 1265 "rl78-decode.opc"
+#line 1292 "rl78-decode.opc"
 
   return rl78->n_bytes;
 }
This page took 0.10527 seconds and 4 git commands to generate.