* sim/ucsim/*.*, sim/ucsim/configure, sim/ucsim/configure.in:

[fw/sdcc] / sim / ucsim / avr.src / avrcl.h

diff --git a/sim/ucsim/avr.src/avrcl.h b/sim/ucsim/avr.src/avrcl.h
index 73e7f43f72a3cf0fc0bcf359332100d5784099e5..0e82e4925bf70c1e4076c38e8773a59f4bca3c47 100644 (file)
--- a/sim/ucsim/avr.src/avrcl.h
+++ b/sim/ucsim/avr.src/avrcl.h
@@ -28,7 +28,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef AVRCL_HEADER
 #define AVRCL_HEADER
 
+// sim.src
 #include "uccl.h"
+#include "memcl.h"
 
 
 /*
@@ -38,24 +40,24 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 class cl_avr: public cl_uc
 {
 public:
-  cl_mem *ram;
-  cl_mem *rom;
+  class cl_address_space *ram;
+  class cl_address_space *rom;
   int sleep_executed;
 public:
   cl_avr(class cl_sim *asim);
   virtual int init(void);
-  virtual char *id_string(void);
+  virtual const char *id_string(void);
 
-  virtual t_addr get_mem_size(enum mem_class type);
-  virtual int get_mem_width(enum mem_class type);
+  //virtual t_addr get_mem_size(enum mem_class type);
+  //virtual int get_mem_width(enum mem_class type);
   virtual void mk_hw_elements(void);
+  virtual void make_memories(void);
 
   virtual struct dis_entry *dis_tbl(void);
   virtual struct name_entry *sfr_tbl(void);
   virtual struct name_entry *bit_tbl(void);
-  virtual char *disass(uint addr, char *sep);
-  virtual void print_disass(uint addr, class cl_console *con);
-  virtual void print_regs(class cl_console *con);
+  virtual char *disass(t_addr addr, char *sep);
+  virtual void print_regs(class cl_console_base *con);
 
   virtual int exec_inst(void);