X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fcmd.src%2Fcmdsetcl.h;h=4757eff93d7c791657836f950a548c9d903c39d8;hb=90f4aedaef8a2310573eef905f95c671f84e5cde;hp=fd2434323c26ef78feb0709a9a6e7fe8c5e09872;hpb=0ad8c78844ada3a7591fc0b355c19c06c4a069b0;p=fw%2Fsdcc

diff --git a/sim/ucsim/cmd.src/cmdsetcl.h b/sim/ucsim/cmd.src/cmdsetcl.h
index fd243432..4757eff9 100644
--- a/sim/ucsim/cmd.src/cmdsetcl.h
+++ b/sim/ucsim/cmd.src/cmdsetcl.h
@@ -28,311 +28,31 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef CMD_CMDSETCL_HEADER
 #define CMD_CMDSETCL_HEADER
 
+// local, cmd
+#include "commandcl.h"
 #include "newcmdcl.h"
 
 
-// CONF
-class cl_conf_cmd: public cl_cmd
-{
-public:
-  cl_conf_cmd(class cl_sim *asim,
-	      char *aname,
-	      int  can_rep,
-	      char *short_hlp,
-	      char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
 // STATE
-class cl_state_cmd: public cl_cmd
-{
-public:
-  cl_state_cmd(class cl_sim *asim,
-	       char *aname,
-	       int  can_rep,
-	       char *short_hlp,
-	       char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// FILE
-class cl_file_cmd: public cl_cmd
-{
-public:
-  cl_file_cmd(class cl_sim *asim,
-	      char *aname,
-	      int  can_rep,
-	      char *short_hlp,
-	      char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// DOWNLOAD
-class cl_dl_cmd: public cl_cmd
-{
-public:
-  cl_dl_cmd(class cl_sim *asim,
-	    char *aname,
-	    int  can_rep,
-	    char *short_hlp,
-	    char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// GET
-class cl_get_cmd: public cl_cmd
-{
-public:
-  cl_get_cmd(class cl_sim *asim,
-	     char *aname,
-	     int  can_rep,
-	     char *short_hlp,
-	     char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-  virtual int timer(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// SET
-class cl_set_cmd: public cl_cmd
-{
-public:
-  cl_set_cmd(class cl_sim *asim,
-	     char *aname,
-	     int  can_rep,
-	     char *short_hlp,
-	     char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-  virtual int timer(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// TIMER
-class cl_timer_cmd: public cl_cmd
-{
-public:
-  class cl_ticker *ticker;
-  int what;
-  char *name;
-
-  cl_timer_cmd(class cl_sim *asim,
-	       char *aname,
-	       int  can_rep,
-	       char *short_hlp,
-	       char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-  void set_ticker(class cl_cmd_arg *param);
-  virtual int add(class cl_cmdline *cmdline, class cl_console *con);
-  virtual int del(class cl_cmdline *cmdline, class cl_console *con);
-  virtual int get(class cl_cmdline *cmdline, class cl_console *con);
-  virtual int run(class cl_cmdline *cmdline, class cl_console *con);
-  virtual int stop(class cl_cmdline *cmdline, class cl_console *con);
-  virtual int val(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// RUN
-class cl_run_cmd: public cl_cmd
-{
-public:
-  cl_run_cmd(class cl_sim *asim,
-	     char *aname,
-	     int  can_rep,
-	     char *short_hlp,
-	     char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// STEP
-class cl_step_cmd: public cl_cmd
-{
-public:
-  cl_step_cmd(class cl_sim *asim,
-	      char *aname,
-	      int  can_rep,
-	      char *short_hlp,
-	      char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// RESET
-class cl_reset_cmd: public cl_cmd
-{
-public:
-  cl_reset_cmd(class cl_sim *asim,
-	       char *aname,
-	       int  can_rep,
-	       char *short_hlp,
-	       char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// DUMP
-class cl_dump_cmd: public cl_cmd
-{
-public:
-  cl_dump_cmd(class cl_sim *asim,
-	      char *aname,
-	      int  can_rep,
-	      char *short_hlp,
-	      char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  //cl_dump_cmd(class cl_sim *asim): cl_cmd(asim) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// DI
-class cl_di_cmd: public cl_dump_cmd
-{
-public:
-  cl_di_cmd(class cl_sim *asim,
-	    char *aname,
-	    int  can_rep,
-	    char *short_hlp,
-	    char *long_hlp):
-    cl_dump_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// DX
-class cl_dx_cmd: public cl_dump_cmd
-{
-public:
-  cl_dx_cmd(class cl_sim *asim,
-	    char *aname,
-	    int  can_rep,
-	    char *short_hlp,
-	    char *long_hlp):
-    cl_dump_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// DCH
-class cl_dch_cmd: public cl_dump_cmd
-{
-public:
-  cl_dch_cmd(class cl_sim *asim,
-	     char *aname,
-	     int  can_rep,
-	     char *short_hlp,
-	     char *long_hlp):
-    cl_dump_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// DS
-class cl_ds_cmd: public cl_dump_cmd
-{
-public:
-  cl_ds_cmd(class cl_sim *asim,
-	    char *aname,
-	    int  can_rep,
-	    char *short_hlp,
-	    char *long_hlp):
-    cl_dump_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// DC
-class cl_dc_cmd: public cl_cmd
-{
-public:
-  int last;
-public:
-  cl_dc_cmd(class cl_sim *asim,
-	    char *aname,
-	    int  can_rep,
-	    char *short_hlp,
-	    char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {last=0;}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// BREAK
-class cl_break_cmd: public cl_cmd
-{
-public:
-  enum brk_perm perm;
-public:
-  cl_break_cmd(class cl_sim *asim,
-	       char *aname,
-	       int  can_rep,
-	       char *short_hlp,
-	       char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) { perm= brkFIX; }
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// TBREAK
-class cl_tbreak_cmd: public cl_break_cmd
-{
-public:
-  cl_tbreak_cmd(class cl_sim *asim,
-		char *aname,
-		int  can_rep,
-		char *short_hlp,
-		char *long_hlp):
-    cl_break_cmd(asim, aname, can_rep, short_hlp, long_hlp) {perm=brkDYNAMIC;}
-};
-
-// CLEAR
-class cl_clear_cmd: public cl_cmd
-{
-public:
-  cl_clear_cmd(class cl_sim *asim,
-	       char *aname,
-	       int  can_rep,
-	       char *short_hlp,
-	       char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// HELP
-class cl_help_cmd: public cl_cmd
-{
-public:
-  cl_help_cmd(class cl_sim *asim,
-	      char *aname,
-	      int  can_rep,
-	      char *short_hlp,
-	      char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// QUIT
-class cl_quit_cmd: public cl_cmd
-{
-public:
-  cl_quit_cmd(class cl_sim *asim,
-	      char *aname,
-	      int  can_rep,
-	      char *short_hlp,
-	      char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
-
-// KILL
-class cl_kill_cmd: public cl_cmd
-{
-public:
-  cl_kill_cmd(class cl_sim *asim,
-	      char *aname,
-	      int  can_rep,
-	      char *short_hlp,
-	      char *long_hlp):
-    cl_cmd(asim, aname, can_rep, short_hlp, long_hlp) {}
-  virtual int do_work(class cl_cmdline *cmdline, class cl_console *con);
-};
+COMMAND_ON(sim,cl_run_cmd);
+COMMAND_ON(sim,cl_stop_cmd);
+COMMAND_ON(uc,cl_step_cmd);
+COMMAND_ON(sim,cl_next_cmd);
+
+//COMMAND_ON(app,cl_help_cmd);
+COMMAND_HEAD(cl_help_cmd)
+COMMAND_METHODS_ON(app,cl_help_cmd)
+  private:
+int matches;
+class cl_cmd *cmd_found;
+bool do_set(class cl_cmdline *cmdline, int pari, class cl_cmdset *cmdset,
+            class cl_console_base *con);
+COMMAND_TAIL;
+
+COMMAND(cl_quit_cmd);
+COMMAND_ON(app,cl_kill_cmd);
+COMMAND_ON(app,cl_exec_cmd);
+COMMAND_ON(app,cl_expression_cmd);
 
 
 #endif