* sim/ucsim/error.cc, sim/ucsim/errorcl.h,

[fw/sdcc] / sim / ucsim / cmd.src / get.cc

diff --git a/sim/ucsim/cmd.src/get.cc b/sim/ucsim/cmd.src/get.cc
index b3183da81b85a161a0a8713a4498beef5a1b432e..d16f892d75cd2e043bbe17528d5db55f1896966b 100644 (file)
--- a/sim/ucsim/cmd.src/get.cc
+++ b/sim/ucsim/cmd.src/get.cc
@@ -30,6 +30,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <ctype.h>
 #include "i_string.h"
 
+// prj
+#include "utils.h"
+
 // sim
 #include "simcl.h"
 #include "optioncl.h"
@@ -50,22 +53,23 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 //                     class cl_cmdline *cmdline, class cl_console *con)
 COMMAND_DO_WORK_UC(cl_get_sfr_cmd)
 {
-  class cl_mem *mem= uc->mem(MEM_SFR);
+  class cl_address_space *mem= uc->address_space(MEM_SFR_ID);
   class cl_cmd_arg *parm;
   int i;
 
   if (!mem)
     {
-      con->printf("Error: No SFR\n");
+      con->dd_printf("Error: No SFR\n");
       return(DD_FALSE);
     }
   for (i= 0, parm= cmdline->param(i);
        parm;
        i++, parm= cmdline->param(i))
     {
-      if (!parm->as_address(uc))
-       con->printf("Warning: Invalid address %s\n",
-                   (char*)cmdline->tokens->at(i+1));
+      if (!parm->as_address(uc) ||
+         !mem->valid_address(parm->value.address))
+       con->dd_printf("Warning: Invalid address %s\n",
+                      (char*)cmdline->tokens->at(i+1));
       else
        mem->dump(parm->value.address, parm->value.address, 1, con);
     }
@@ -82,29 +86,40 @@ COMMAND_DO_WORK_UC(cl_get_sfr_cmd)
 //int
 //cl_get_option_cmd::do_work(class cl_sim *sim,
 //                        class cl_cmdline *cmdline, class cl_console *con)
-COMMAND_DO_WORK_UC(cl_get_option_cmd)
+COMMAND_DO_WORK_APP(cl_get_option_cmd)
 {
   class cl_cmd_arg *parm= cmdline->param(0);
   char *s= 0;
 
   if (!parm)
     ;
-  else if (cmdline->syntax_match(uc, STRING)) {
+  else if (cmdline->syntax_match(0/*app->get_uc()*/, STRING)) {
     s= parm->value.string.string;
   }
   else
-    con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
+    con->dd_printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
 
   int i;
-  for (i= 0; i < uc->options->count; i++)
+  for (i= 0; i < app->options->count; i++)
     {
-      class cl_option *o= (class cl_option *)(uc->options->at(i));
-      if (!s ||
-         !strcmp(s, o->id))
+      class cl_option *o= (class cl_option *)(/*uc*/app->options->at(i));
+      if ((!s ||
+          !strcmp(s, o->get_name())))
        {
-         con->printf("%s ", o->id);
-         o->print(con);
-         con->printf(" %s\n", o->help);
+         if (!o->hidden)
+           {
+             con->dd_printf("%2d. %s(by %s): ", i, object_name(o),
+                            object_name(o->get_creator()));
+             o->print(con);
+             con->dd_printf(" - %s\n", o->help);
+           }
+         else
+           {
+             /*
+             con->dd_printf("%2d. %s(by %s) is hidden!\n", i, object_name(o),
+                          object_name(o->get_creator()));
+             */
+           }
        }
     }