X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fs51.src%2Fuc390cl.h;h=009487f0e089f5bed5a1dcdbeefa9d2198f4c1cc;hb=34d14506fd0c12ee5434fec0f9dec27753e1aab5;hp=d1bdf70d4a0b07d06224d18e10e50f92cd9484d0;hpb=8c8f34ff4281a55d2f535335c02999246e9e12f2;p=fw%2Fsdcc

diff --git a/sim/ucsim/s51.src/uc390cl.h b/sim/ucsim/s51.src/uc390cl.h
index d1bdf70d..009487f0 100644
--- a/sim/ucsim/s51.src/uc390cl.h
+++ b/sim/ucsim/s51.src/uc390cl.h
@@ -33,36 +33,37 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "uc52cl.h"
 
-class t_uc390: public t_uc52
+class cl_uc390: public cl_uc52
 {
 public:
-  t_uc390(int Itype, int Itech, class cl_sim *asim);
+  cl_uc390(int Itype, int Itech, class cl_sim *asim);
   virtual void mk_hw_elements (void);
+  virtual void make_memories(void);
 
   virtual void clear_sfr (void);
 
   // making objects
-  virtual t_addr get_mem_size (enum mem_class type);
+  //virtual t_addr get_mem_size (enum mem_class type);
 
   // manipulating memories
-  virtual t_mem read_mem (enum mem_class type, t_addr addr);
-  virtual t_mem get_mem (enum mem_class type, t_addr addr);
-  virtual void  write_mem (enum mem_class type, t_addr addr, t_mem val);
-  virtual void  set_mem (enum mem_class type, t_addr addr, t_mem val);
+  virtual t_mem read_mem (const char *id/*enum mem_class type*/, t_addr addr);
+  virtual t_mem get_mem (const char *id/*enum mem_class type*/, t_addr addr);
+  virtual void  write_mem (const char *id/*enum mem_class type*/, t_addr addr, t_mem val);
+  virtual void  set_mem (const char *id/*enum mem_class type*/, t_addr addr, t_mem val);
 
   /* mods for dual-dptr */
   virtual int inst_inc_dptr(uchar code);
-  virtual int inst_jmp_$a_dptr(uchar code);
-  virtual int inst_mov_dptr_$data(uchar code);
-  virtual int inst_movc_a_$a_dptr(uchar code);
-  virtual int inst_movx_a_$dptr(uchar code);
-  virtual int inst_movx_$dptr_a(uchar code);
+  virtual int inst_jmp_Sa_dptr(uchar code);
+  virtual int inst_mov_dptr_Sdata(uchar code);
+  virtual int inst_movc_a_Sa_dptr(uchar code);
+  virtual int inst_movx_a_Sdptr(uchar code);
+  virtual int inst_movx_Sdptr_a(uchar code);
 
   /* mods for flat24 */
   virtual int inst_ajmp_addr(uchar code);
   virtual int inst_ljmp(uchar code);
   virtual int inst_acall_addr(uchar code);
-  virtual int inst_lcall(uchar code, uint addr);
+  virtual int inst_lcall(uchar code, uint addr, bool intr);/* 12 */
   virtual int inst_ret(uchar code);
   virtual int inst_reti(uchar code);
 
@@ -73,7 +74,7 @@ public:
   /* mods for disassembly of flat24 */
   virtual struct dis_entry *dis_tbl(void);
   virtual char * disass(t_addr addr, char *sep);
-  virtual void   print_regs(class cl_console *con);
+  virtual void   print_regs(class cl_console_base *con);
 
 protected:
   int flat24_flag; /* true if processor == ds390f */