*** empty log message ***

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

diff --git a/sim/ucsim/xa.src/inst.cc b/sim/ucsim/xa.src/inst.cc
index aafde7eda8cd96bfb62043b0ea64444b3a668ae2..ec737aa83bd2d38e10cd059eed8574e881502c4f 100644 (file)
--- a/sim/ucsim/xa.src/inst.cc
+++ b/sim/ucsim/xa.src/inst.cc
@@ -35,42 +35,86 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "xacl.h"
 #include "regsxa.h"
 
+
+void cl_xa::store1(t_addr addr, unsigned char val)
+{
+  if (addr < 0x2000) {
+    set_idata1(addr, val);
+  } else {
+    set_xdata1(addr, val);
+  }
+}
+
+void cl_xa::store2(t_addr addr, unsigned char val)
+{
+  if (addr < 0x2000) {
+    set_idata2(addr, val);
+  } else {
+    set_xdata2(addr, val);
+  }
+}
+
+unsigned char cl_xa::get1(t_addr addr)
+{
+  if (addr < 0x2000) {
+    return get_idata1(addr);
+  } else {
+    return get_xdata1(addr);
+  }
+}
+
+unsigned short cl_xa::get2(t_addr addr)
+{
+  if (addr < 0x2000) {
+    return get_idata2(addr);
+  } else {
+    return get_xdata2(addr);
+  }
+}
+
 int cl_xa::get_reg(int word_flag, unsigned int index)
 {
-  //if (index < 3) { /* banked */
-  //  if (word_flag)
-  //    return get_word_direct(0x400+index);
-  //  else
-  //    return mem_direct[0x400+index];
-  //} else { /* non-banked */
-    if (word_flag)
-      return get_word_direct(index);
-    else
-      return mem_direct[index];
-  //}
+  int result;
+
+  if (word_flag) {
+    result = get_word_direct(index);
+  }
+  else {
+    result = get_byte_direct(index);
+  }
+  return result;
 }
 
 bool cl_xa::get_bit(int bit) {
   short offset=0;
+  unsigned char result;
+
   if (bit>=0x200) {
     // in sfr space
     bit-=0x200;
     offset=0x400;
   }
-  return mem_direct[offset + (bit/8)] & (1 << (bit%8));
+  result = get_byte_direct(offset + (bit/8)) & (1 << (bit%8));
+  return result;
+  //return mem_direct[offset + (bit/8)] & (1 << (bit%8));
 }
 
 void cl_xa::set_bit(int bit, int value) {
+  int i;
   short offset=0;
   if (bit>=0x200) {
     // in sfr space
     bit-=0x200;
     offset=0x400;
   }
+
+  i = get_byte_direct(offset + (bit/8));
   if (value) {
-    mem_direct[offset + (bit/8)] |= (1 << (bit%8));
+    set_byte_direct(offset + (bit/8), i | (1 << (bit%8)) );
+    //mem_direct[offset + (bit/8)] |= (1 << (bit%8));
   } else {
-    mem_direct[offset + (bit/8)] &= ~(1 << (bit%8));
+    set_byte_direct(offset + (bit/8), i & ~(1 << (bit%8)) );
+    //mem_direct[offset + (bit/8)] &= ~(1 << (bit%8));
   }
 }
 
@@ -202,7 +246,7 @@ int cl_xa::inst_BPL(uint code, int operands)
 int cl_xa::inst_BR(uint code, int operands)
 {
   short jmpAddr = fetch1()*2;
-  PC=(PC+jmpAddr)&0xfffffffe;
+  PC=(PC+jmpAddr)&0xfffffe;
   return(resGO);
 }
 
@@ -346,12 +390,12 @@ int cl_xa::inst_DJNZ(uint code, int operands)
          unsigned short tmp = mov2(0, reg2(RI_F0)-1);
          set_reg2(RI_F0, tmp);
          if (tmp != 0)
-           PC = (PC + addr) & 0xfffffffe;
+           PC = (PC + addr) & 0xfffffe;
        } else {
          unsigned char tmp = mov1(0, reg1(RI_F0)-1);
          set_reg1(RI_F0, tmp);
          if (tmp != 0)
-           PC = (PC + addr) & 0xfffffffe;
+           PC = (PC + addr) & 0xfffffe;
        }
     }
     break;
@@ -420,7 +464,7 @@ int cl_xa::inst_JMP(uint code, int operands)
     case REL16:
     {
       jmpAddr = (signed short)fetch2()*2;
-      PC = (PC + jmpAddr) & 0xfffffffe;
+      PC = (PC + jmpAddr) & 0xfffffe;
     }
     break;
     case IREG:
@@ -490,7 +534,36 @@ int cl_xa::inst_MOVC(uint code, int operands)
       }
     }
     break;
-    // fixme, 2 more
+    case A_APLUSDPTR:
+    {  /* R4l=ACC, R6=DPTR */
+      unsigned int addr = (PC & 0xff0000) | (reg1(4) + reg2(6));
+      unsigned short result;
+      unsigned char flags;
+      flags = get_psw();
+
+      flags &= ~(BIT_Z | BIT_N); /* clear these bits */
+      result = getcode1(addr);
+      set_reg1( 4, result);
+      if (result == 0) flags |= BIT_Z;
+      if (result & 0x80) flags |= BIT_N;
+      set_psw(flags);
+    }
+    break;
+    case A_APLUSPC:
+    {  /* R4l=ACC, R6=DPTR */
+      unsigned int addr = (PC + reg1(4));
+      unsigned short result;
+      unsigned char flags;
+      flags = get_psw();
+
+      flags &= ~(BIT_Z | BIT_N); /* clear these bits */
+      result = getcode1(addr);
+      set_reg1( 4, result);
+      if (result == 0) flags |= BIT_Z;
+      if (result & 0x80) flags |= BIT_N;
+      set_psw(flags);
+    }
+    break;
   }
   return(resGO);
 }