X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fsim.src%2Fargcl.h;h=4b7d1363456501dc352488a2c1a431ee10a43efd;hb=34d14506fd0c12ee5434fec0f9dec27753e1aab5;hp=ff65fa12ac982989e7813dd2673f4cc06d93a8a0;hpb=0ac34444ce2ccdcaa5fe722e2420f96c46224039;p=fw%2Fsdcc

diff --git a/sim/ucsim/sim.src/argcl.h b/sim/ucsim/sim.src/argcl.h
index ff65fa12..4b7d1363 100644
--- a/sim/ucsim/sim.src/argcl.h
+++ b/sim/ucsim/sim.src/argcl.h
@@ -1,5 +1,5 @@
 /*
- * Simulator of microcontrollers (argcl.h)
+ * Simulator of microcontrollers (sim.src/argcl.h)
  *
  * Copyright (C) 1999,99 Drotos Daniel, Talker Bt.
  * 
@@ -25,10 +25,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA. */
 /*@1@*/
 
-#ifndef ARGCL_HEADER
-#define ARGCL_HEADER
+#ifndef SIM_ARGCL_HEADER
+#define SIM_ARGCL_HEADER
 
+// prj
 #include "pobjcl.h"
+#include "stypes.h"
 
 
 /*
@@ -39,23 +41,27 @@ class cl_arg: public cl_base
 {
 public:
   union {
-    long long i_value;
+    long i_value;
     double f_value;
     void *p_value;
   };
   char *s_value;
 
 public:  
-  cl_arg(long long lv);
-  cl_arg(char *lv);
+  cl_arg(long lv);
+  cl_arg(const char *lv);
   cl_arg(double fv);
   cl_arg(void *pv);
-  ~cl_arg(void);
+  virtual ~cl_arg(void);
 
-  virtual long long get_ivalue(void);
+  virtual bool get_ivalue(long *value);
   virtual char *get_svalue(void);
   virtual double get_fvalue(void);
   virtual void *get_pvalue(void);
+  virtual bool get_bit_address(class cl_uc *uc, // input
+			       class cl_address_space **mem, // outputs
+			       t_addr *mem_addr,
+			       t_mem *bit_mask) { return(DD_FALSE); }
 };
 
 
@@ -66,35 +72,87 @@ public:
 class cl_cmd_arg: public cl_arg
 {
 public:
-  cl_cmd_arg(long long i): cl_arg(i) {}
-  cl_cmd_arg(char *s): cl_arg(s) {}
+  //class cl_uc *uc;
+  bool interpreted_as_string;
+  union {
+    long number;
+    t_addr address;
+    t_mem data;
+    struct {
+      class cl_memory *memory;
+      class cl_address_space *address_space;
+      class cl_memory_chip *memchip;
+    } memory;
+    class cl_hw *hw;
+    struct {
+      int len;
+      char *string;
+    } string;
+    struct {
+      t_mem *array;
+      int len;
+    } data_list;
+    struct {
+      class cl_address_space *mem;
+      t_addr mem_address;
+      t_mem mask;
+    } bit;
+  } value;
 
-  virtual int is_string(void) { return(0); }
-  virtual long get_address(void) { return(-1); }
+public:
+  cl_cmd_arg(/*class cl_uc *iuc,*/ long i): cl_arg(i)
+  { /*uc= iuc;*/ interpreted_as_string= DD_FALSE; }
+  cl_cmd_arg(/*class cl_uc *iuc,*/ const char *s): cl_arg(s)
+  { /*uc= iuc;*/ interpreted_as_string= DD_FALSE; }
+  virtual ~cl_cmd_arg(void);
+
+  virtual int is_string(void) { return(DD_FALSE); }
+  virtual bool get_address(class cl_uc *uc, t_addr *addr) { return(DD_FALSE); }
+  virtual bool as_address(class cl_uc *uc);
+  virtual bool as_number(void);
+  virtual bool as_data(void);
+  virtual bool as_string(void);
+  virtual bool as_memory(class cl_uc *uc);
+  virtual bool as_hw(class cl_uc *uc);
+  virtual bool as_bit(class cl_uc *uc);
 };
 
 class cl_cmd_int_arg: public cl_cmd_arg
 {
 public:
-  cl_cmd_int_arg(long long addr);
-
-  virtual long get_address(void) { return(get_ivalue()); }
+  cl_cmd_int_arg(/*class cl_uc *iuc,*/ long addr);
+
+  virtual bool get_address(class cl_uc *uc, t_addr *addr);
+  virtual bool get_bit_address(class cl_uc *uc, // input
+			       class cl_address_space **mem, // outputs
+			       t_addr *mem_addr,
+			       t_mem *bit_mask);
+  virtual bool as_string(void);
 };
 
 class cl_cmd_sym_arg: public cl_cmd_arg
 {
 public:
-  cl_cmd_sym_arg(char *sym);
-
-  virtual long get_address(void);
+  cl_cmd_sym_arg(/*class cl_uc *iuc,*/ const char *sym);
+
+  virtual bool get_address(class cl_uc *uc, t_addr *addr);
+  virtual bool get_bit_address(class cl_uc *uc, // input
+			       class cl_address_space **mem, // outputs
+			       t_addr *mem_addr,
+			       t_mem *bit_mask);
+  virtual bool as_address(class cl_uc *uc);
+  virtual bool as_number(void) { return(DD_FALSE); }
+  virtual bool as_string(void);
+  virtual bool as_hw(class cl_uc *uc);
 };
 
 class cl_cmd_str_arg: public cl_cmd_arg
 {
 public:
-  cl_cmd_str_arg(char *str);
+  cl_cmd_str_arg(/*class cl_uc *iuc,*/ const char *str);
 
   virtual int is_string(void) { return(1); }
+  virtual bool as_number(void) { return(DD_FALSE); }
 };
 
 class cl_cmd_bit_arg: public cl_cmd_arg
@@ -103,10 +161,27 @@ public:
   class cl_cmd_arg *sfr, *bit;
 
 public:
-  cl_cmd_bit_arg(class cl_cmd_arg *asfr, class cl_cmd_arg *abit);
-  ~cl_cmd_bit_arg(void);
+  cl_cmd_bit_arg(/*class cl_uc *iuc,*/
+		 class cl_cmd_arg *asfr, class cl_cmd_arg *abit);
+  virtual ~cl_cmd_bit_arg(void);
+
+  virtual bool get_address(class cl_uc *uc, t_addr *addr);
+  virtual bool get_bit_address(class cl_uc *uc, // input
+			       class cl_address_space **mem, // outputs
+			       t_addr *mem_addr,
+			       t_mem *bit_mask);
+};
 
-  virtual long get_address(void);
+class cl_cmd_array_arg: public cl_cmd_arg
+{
+public:
+  class cl_cmd_arg *name_arg, *index;
+
+public:
+  cl_cmd_array_arg(/*class cl_uc *iuc,*/
+		   class cl_cmd_arg *aname, class cl_cmd_arg *aindex);
+  virtual ~cl_cmd_array_arg(void);
+  virtual bool as_hw(class cl_uc *uc);
 };
 
 
@@ -114,19 +189,37 @@ public:
  * Program arguments
  */
 
-class cl_prg_arg: public cl_arg
+/*class cl_prg_arg: public cl_arg
 {
 public:
   char short_name;
   char *long_name;
 
 public:
-  cl_prg_arg(char sn, char *ln, long long lv);
+  cl_prg_arg(char sn, char *ln, long lv);
   cl_prg_arg(char sn, char *ln, char *lv);
   cl_prg_arg(char sn, char *ln, double fv);
   cl_prg_arg(char sn, char *ln, void *pv);
-  ~cl_prg_arg(void);
-};
+  virtual ~cl_prg_arg(void);
+};*/
+
+
+/*
+ * List of arguments
+ */
+
+/*class cl_arguments: public cl_list
+{
+public:
+  cl_arguments(void): cl_list(5, 5) {}
+
+  int arg_avail(char nam);
+  int arg_avail(char *nam);
+  virtual long get_iarg(char sname, char *lname);
+  virtual char *get_sarg(char sname, char *lname);
+  virtual double get_farg(char sname, char *lname);
+  virtual void *get_parg(char sname, char *lname);
+};*/
 
 
 #endif