Fix of typecast malloc

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

diff --git a/sim/ucsim/cmd.src/set.cc b/sim/ucsim/cmd.src/set.cc
index 2e58773796317efa60a0aa2572f2038b6bbdda25..2c1387eb6036736d1e5da260dacc647f0a679ee2 100644 (file)
--- a/sim/ucsim/cmd.src/set.cc
+++ b/sim/ucsim/cmd.src/set.cc
@@ -62,20 +62,21 @@ COMMAND_DO_WORK_UC(cl_set_mem_cmd)
     int len= params[2]->value.data_list.len;
     
     if (len == 0)
-      con->printf("Error: no data\n");
+      con->dd_printf("Error: no data\n");
     else
       {
        int i;
        t_addr addr;
        for (i= 0, addr= start;
-            i < len && addr < mem->size;
+            i < len && addr <= mem->size;
             i++, addr++)
-         mem->write(addr, &(array[i]));
+         mem->set(addr, array[i]);
+       uc->check_errors();
        mem->dump(start, start+len-1, 8, con);
       }
   }
   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");
   
   return(DD_FALSE);;
 }
@@ -110,45 +111,50 @@ COMMAND_DO_WORK_UC(cl_set_bit_cmd)
     mem->dump(mem_addr, mem_addr, 1, con);
   }
   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");
 
   return(DD_FALSE);;
 }
 
 
 /*
- * Command: set port
+ * Command: set hw
  *----------------------------------------------------------------------------
  */
 
-//int
-//cl_set_port_cmd::do_work(class cl_sim *sim,
-//                      class cl_cmdline *cmdline, class cl_console *con)
-COMMAND_DO_WORK_UC(cl_set_port_cmd)
+COMMAND_DO_WORK_UC(cl_set_hw_cmd)
 {
-  class cl_hw *hw;
-  long l= 0, pn= -1;
-  class cl_cmd_arg *params[4]= { cmdline->param(0),
+  class cl_hw *hw= 0;
+  class cl_cmd_arg *params[1]= { cmdline->param(0)/*,
                                 cmdline->param(1),
                                 cmdline->param(2),
-                                cmdline->param(3) };
+                                cmdline->param(3)*/ };
   
-  if (cmdline->syntax_match(uc, HW NUMBER)) {
+  if (/*cmdline->syntax_match(uc, HW)*/params[0]->as_hw(uc)) {
     hw= params[0]->value.hw;
-    pn= hw->id;
-    l= params[1]->value.number;
+    //pn= hw->id;
+    //l= params[1]->value.number;
   }
-  else if (cmdline->syntax_match(uc, NUMBER NUMBER)) {
+  /*else if (cmdline->syntax_match(uc, NUMBER NUMBER)) {
     pn= params[0]->value.number;
     l= params[1]->value.number;
-  }
+    hw= uc->get_hw(HW_PORT, pn, 0);
+    }*/
   else
-    con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
-  if (pn < 0 ||
+    con->dd_printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
+  /*if (pn < 0 ||
       pn > 3)
-    con->printf("Error: wrong port\n");
-  else
-    uc->port_pins[pn]= l;
+    con->dd_printf("Error: wrong port\n");
+    else*/
+    {
+      if (hw)
+       {
+         cmdline->shift();
+         hw->set_cmd(cmdline, con);
+       }
+      else
+       con->dd_printf("Error: no hw\n");
+    }
   return(DD_FALSE);;
 }
 
@@ -161,37 +167,63 @@ COMMAND_DO_WORK_UC(cl_set_port_cmd)
 //int
 //cl_set_option_cmd::do_work(class cl_sim *sim,
 //                        class cl_cmdline *cmdline, class cl_console *con)
-COMMAND_DO_WORK_UC(cl_set_option_cmd)
+COMMAND_DO_WORK_APP(cl_set_option_cmd)
 {
   char *id= 0, *s= 0;
+  int idx;
   class cl_cmd_arg *params[4]= { cmdline->param(0),
                                 cmdline->param(1),
                                 cmdline->param(2),
                                 cmdline->param(3) };
-  
-  if (cmdline->syntax_match(uc, STRING STRING)) {
+  class cl_option *option= 0;
+
+  if (cmdline->syntax_match(0, STRING STRING STRING)) {
     id= params[0]->value.string.string;
+    char *cr= params[1]->value.string.string;
+    s= params[2]->value.string.string;
+    int n= app->options->nuof_options(id, cr);
+    if (n > 1)
+      {
+       con->dd_printf("Ambiguous option name, use number instead\n");
+       return(DD_FALSE);
+      }
+    else if (n == 0)
+      ;//con->dd_printf("Named option does not exist\n");
+    else
+      {
+       if ((option= app->options->get_option(id, cr)) == 0)
+         option= app->options->get_option(cr, id);
+      }
+  }
+  else if (cmdline->syntax_match(0/*app->get_uc()*/, NUMBER STRING)) {
+    idx= params[0]->value.number;
     s= params[1]->value.string.string;
+    option= app->options->get_option(idx);
+  }
+  else if (cmdline->syntax_match(0/*app->get_uc()*/, STRING STRING)) {
+    id= params[0]->value.string.string;
+    s= params[1]->value.string.string;
+    int n= app->options->nuof_options(id);
+    if (n > 1)
+      {
+       con->dd_printf("Ambiguous option name, use number instead\n");
+       return(DD_FALSE);
+      }
+    else if (n == 0)
+      ;//con->dd_printf("Named option does not exist\n");
+    else
+      option= app->options->get_option(id);
   }
   else
-    con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
-  if (!id ||
-      !s)
+    con->dd_printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
+  if (!option)
     {
-      con->printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
+      con->dd_printf("Option does not exist\n");
       return(DD_FALSE);
     }
 
-  int i;
-  for (i= 0; i < uc->options->count; i++)
-    {
-      class cl_option *o= (class cl_option *)(uc->options->at(i));
-      if (!strcmp(id, o->id))
-       {
-         o->set_value(s);
-         break;
-       }
-    }
+  option->set_value(s);
+
   return(DD_FALSE);;
 }