version 0.2.39: fix of arith insts and start of re-structure

[fw/sdcc] / sim / ucsim / sim.src / simcl.h

diff --git a/sim/ucsim/sim.src/simcl.h b/sim/ucsim/sim.src/simcl.h
index 21a83a3db62194ae775aea367070722e2834de31..f4fbec207d44121c535c0adb6ca953f060933ed0 100644 (file)
--- a/sim/ucsim/sim.src/simcl.h
+++ b/sim/ucsim/sim.src/simcl.h
@@ -1,5 +1,5 @@
 /*
- * Simulator of microcontrollers (simcl.h)
+ * Simulator of microcontrollers (sim.src/simcl.h)
  *
  * Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
  * 
@@ -25,8 +25,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA. */
 /*@1@*/
 
-#ifndef SIMCL_HEADER
-#define SIMCL_HEADER
+#ifndef SIM_SIMCL_HEADER
+#define SIM_SIMCL_HEADER
 
 #include <stdio.h>
 
@@ -36,6 +36,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 // cmd
 #include "newcmdcl.h"
 
+// gui
+#include "guicl.h"
+
 // local
 #include "uccl.h"
 #include "argcl.h"
@@ -49,8 +52,7 @@ public:
 
   class cl_commander *cmd;
   class cl_uc *uc;
-  class cl_cmdset *cmdset;
-  //class cl_console *frozen_console;
+  class cl_gui *gui;
 
   char *accept_args;
   class cl_ustrings *in_files;
@@ -58,22 +60,21 @@ public:
   
 public:
   cl_sim(char *more_args, int iargc, char *iargv[]);
-  //cl_sim(class cl_uc *auc);
   ~cl_sim(void);
   virtual int init(void);
   
   virtual int proc_arguments(int argc, char *argv[]);
   virtual int proc_arg(char arg, char *optarg);
 
-  virtual class cl_commander *mk_commander(void);
   virtual class cl_uc *mk_controller(void);
-  virtual class cl_cmdset *mk_cmdset(void);
-  virtual void build_cmd_set(void);
+  virtual void build_cmd_set(class cl_cmdset *cmdset);
   virtual class cl_cmd_arg *mk_cmd_int_arg(long long i);
   virtual class cl_cmd_arg *mk_cmd_sym_arg(char *s);
   virtual class cl_cmd_arg *mk_cmd_str_arg(char *s);
   virtual class cl_cmd_arg *mk_cmd_bit_arg(class cl_cmd_arg *sfr,
                                           class cl_cmd_arg *bit);
+  virtual class cl_cmd_arg *mk_cmd_array_arg(class cl_cmd_arg *aname,
+                                            class cl_cmd_arg *aindex);
 
   int arg_avail(char name);
   int arg_avail(char *name);
@@ -83,14 +84,8 @@ public:
   virtual void *get_parg(char sname, char *lname);
 
   virtual int main(void);
-  virtual int do_cmd(char *cmd, class cl_console *console);
   virtual void start(class cl_console *con);
   virtual void stop(int reason);
-
-  // Obsolete, for old commander
-  //public:
-  //FILE *cmd_out(void);
-  //FILE *cmd_in(void);
 };