* sim/ucsim/cmd.src/newcmdposix.cc, sim/ucsim/cmd.src/newcmdposixcl.h,

[fw/sdcc] / sim / ucsim / cmd.src / cmdsetcl.h

diff --git a/sim/ucsim/cmd.src/cmdsetcl.h b/sim/ucsim/cmd.src/cmdsetcl.h
index 36beba0d625f25d90bfecfb21183d93a66f7ce29..4757eff93d7c791657836f950a548c9d903c39d8 100644 (file)
--- a/sim/ucsim/cmd.src/cmdsetcl.h
+++ b/sim/ucsim/cmd.src/cmdsetcl.h
@@ -28,59 +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"
 
+
 // STATE
-COMMAND(cl_state_cmd);
-COMMAND(cl_file_cmd);
-COMMAND(cl_dl_cmd);
-COMMAND(cl_run_cmd);
-COMMAND(cl_stop_cmd);
-COMMAND(cl_step_cmd);
-COMMAND(cl_next_cmd);
-COMMAND(cl_pc_cmd);
-COMMAND(cl_reset_cmd);
-COMMAND(cl_dump_cmd);
-COMMAND_ANCESTOR(cl_di_cmd,cl_dump_cmd);
-COMMAND_ANCESTOR(cl_dx_cmd,cl_dump_cmd);
-COMMAND_ANCESTOR(cl_dch_cmd,cl_dump_cmd);
-COMMAND_ANCESTOR(cl_ds_cmd,cl_dump_cmd);
-COMMAND_DATA(cl_dc_cmd, t_addr last);
-COMMAND_DATA(cl_disassemble_cmd,int last);
-COMMAND_DATA(cl_fill_cmd,int last);
-COMMAND_HEAD(cl_where_cmd)
-  public: int last;
-COMMAND_METHODS(cl_where_cmd)
-  virtual int do_real_work(class cl_sim *sim,
-                          class cl_cmdline *cmdline, class cl_console *con,
-                          bool case_sensitive);
+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_DATA_ANCESTOR(cl_Where_cmd,cl_where_cmd,int last);
-COMMAND(cl_help_cmd);
-COMMAND(cl_quit_cmd);
-COMMAND(cl_kill_cmd);
 
-COMMAND_HEAD(cl_timer_cmd)
-public:
-  class cl_ticker *ticker;
-  long what;
-  char *name;
-COMMAND_METHODS(cl_timer_cmd)
-  void set_ticker(class cl_sim *sim,
-                 class cl_cmd_arg *param);
-  virtual int add(class cl_sim *sim,
-                 class cl_cmdline *cmdline, class cl_console *con);
-  virtual int del(class cl_sim *sim,
-                 class cl_cmdline *cmdline, class cl_console *con);
-  virtual int get(class cl_sim *sim,
-                 class cl_cmdline *cmdline, class cl_console *con);
-  virtual int run(class cl_sim *sim,
-                 class cl_cmdline *cmdline, class cl_console *con);
-  virtual int stop(class cl_sim *sim,
-                  class cl_cmdline *cmdline, class cl_console *con);
-  virtual int val(class cl_sim *sim,
-                 class cl_cmdline *cmdline, class cl_console *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