Fixed bug #2488074

[fw/sdcc] / sim / ucsim / xa.src / inst_gen.cc

diff --git a/sim/ucsim/xa.src/inst_gen.cc b/sim/ucsim/xa.src/inst_gen.cc
index d37890dd76522aa579e96d325f725dc73a2d1468..76e39871b7e746a860ac1d73810b69c16eefa431 100644 (file)
--- a/sim/ucsim/xa.src/inst_gen.cc
+++ b/sim/ucsim/xa.src/inst_gen.cc
@@ -4,11 +4,12 @@
    of inst.cc with FUNC1 and FUNC2 defined as
    various operations to implement ADD, ADDC, ...
  *
- * Written by Karl Bongers karl@turbobit.com
- *
- * Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
+ * Copyright (C) 1999,2002 Drotos Daniel, Talker Bt.
  * 
  * To contact author send email to drdani@mazsola.iit.uni-miskolc.hu
+ * Other contributors include:
+ *   Karl Bongers karl@turbobit.com,
+ *   Johan Knol 
  *
  */
 
@@ -45,7 +46,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     case REG_IREGINC :
     case REG_IREG:
     {
-      short srcreg = reg2(RI_0F);
+      short srcreg = reg2(RI_07);
       if (code & 0x0800) {  /* word op */
         set_reg2( RI_F0,
                   FUNC2( reg2(RI_F0),
@@ -60,7 +61,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
                 );
       }
       if (operands == REG_IREGINC) {
-        set_reg2(RI_0F,  srcreg+1);
+        set_reg2(RI_07,  srcreg+1);
       }
     }
     break;
@@ -79,7 +80,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
         store1(addr, total);
       }
       if (operands == IREGINC_REG) {
-        set_reg2(RI_0F, addr+1);
+        set_reg2(RI_07, addr+1);
       }
     }
     break;
@@ -88,19 +89,18 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     case IREGOFF16_REG :
     {
       int offset;
-      if (operands == REG_IREGOFF8) {
+      if (operands == IREGOFF8_REG) {
         offset = (int)((char) fetch());
       } else {
         offset = (int)((short)fetch2());
       }
       if (code & 0x0800) {  /* word op */
         t_mem addr = reg2(RI_07) + offset;
-        unsigned short wtmp, wtotal;
-        wtmp = get2(addr);
-        wtotal = FUNC2( wtmp, reg2(RI_F0) );
+        unsigned short wtotal;
+        wtotal = FUNC2( get2(addr), reg2(RI_F0) );
         store2(addr, wtotal);
       } else {
-        t_mem addr = reg2(RI_07) + ((short) fetch2());
+        t_mem addr = reg2(RI_07) + offset;
         unsigned char total;
         total = FUNC1( get1(addr), reg1(RI_F0) );
         store1(addr, total);
@@ -125,7 +125,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
                       )
                 );
       } else {
-        int offset = (int)((short)fetch2());
         set_reg1( RI_F0,
                   FUNC1( reg1(RI_F0),
                         get1(reg2(RI_07)+offset)
@@ -137,7 +136,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
     case DIRECT_REG :
     {
-      int addr = ((code & 0x3) << 8) | fetch();
+      int addr = ((code & 0x7) << 8) | fetch();
       if (code & 0x0800) {  /* word op */
         unsigned short wtmp = get_word_direct(addr);
         set_word_direct( addr,
@@ -154,7 +153,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
     case REG_DIRECT :
     {
-      int addr = ((code & 0x3) << 8) | fetch();
+      int addr = ((code & 0x7) << 8) | fetch();
       if (code & 0x0800) {  /* word op */
         set_reg2( RI_F0,
                   FUNC2( reg2(RI_F0),
@@ -172,11 +171,23 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     break;
 
     case REG_DATA8 :
+#if 0
+      {
+        unsigned char dat = fetch();
+        unsigned char res;
+        res = FUNC1( reg1(RI_F0), dat);
+        set_reg1( RI_F0, res );
+   printf("reg_data8 code=%x dat=%x, res=%x r=%x\n", code, dat, res, reg1( RI_F0) );
+      }
+#endif
       set_reg1( RI_F0, FUNC1( reg1(RI_F0), fetch()) );
     break;
 
     case REG_DATA16 :
-      set_reg2( RI_F0, FUNC2( reg2(RI_F0), fetch()) );
+      {
+        unsigned short dat = fetch2();
+        set_reg2( RI_F0, FUNC2( reg2(RI_F0), dat) );
+      }
     break;
 
     case IREGINC_DATA8 :
@@ -184,12 +195,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     {
       unsigned char total;
       unsigned char tmp;
-      t_mem addr = reg2(RI_07);
+      t_mem addr = reg2(RI_70);
       tmp = get1(addr);
       total = FUNC1(tmp, fetch() );
       store1(addr, total);
       if (operands == IREGINC_DATA8) {
-        set_reg2(RI_07, addr+1);
+        set_reg2(RI_70, addr+1);
       }
     }
     break;
@@ -204,7 +215,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
       total = FUNC2(tmp, fetch2() );
       store2(addr, total);
       if (operands == IREGINC_DATA16) {
-        set_reg2(RI_07, addr+1);
+        set_reg2(RI_70, addr+1);
       }
     }
     break;
@@ -221,9 +232,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
         offset = (int)((short)fetch2());
       }
       tmp = fetch();
-      addr = reg2(RI_07);
+      addr = reg2(RI_70);
 
-      store1( addr, 
+      store1( addr+offset,
                   FUNC1( tmp,
                         get1(addr+offset)
                       )
@@ -243,9 +254,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
         offset = (int)((short)fetch2());
       }
       tmp = fetch2();
-      addr = reg2(RI_07);
+      addr = reg2(RI_70);
 
-      store2( addr, 
+      store2( addr+offset,
                   FUNC2( tmp,
                         get2(addr+offset)
                       )
@@ -255,7 +266,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
     case DIRECT_DATA8 :
     {
-      int addr = ((code & 0x3) << 8) | fetch();
+      int addr = ((code & 0x70) << 4) | fetch();
       unsigned char bdir = get_byte_direct(addr);
       unsigned char bdat = fetch();
       set_byte_direct( addr,  FUNC1( bdir, bdat) );
@@ -264,7 +275,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
     case DIRECT_DATA16 :
     {
-      int addr = ((code & 0x3) << 8) | fetch();
+      int addr = ((code & 0x70) << 4) | fetch();
       unsigned short wdir = get_word_direct(addr);
       unsigned short wdat = fetch2();
       set_word_direct( addr,  FUNC2( wdir, wdat) );