X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=sim%2Fucsim%2Fcmd.src%2Fcmdset.cc;h=f0226ceb298ef520a210d953e4a616eeff28d8a1;hb=f27da39dbcab5678aca6d8462f1cc37a643f37e9;hp=59d6b2f41a6ee7869213ae054f81afd6132c1b49;hpb=6ba6105dc5975c3b0cc0d1ce53f47a1ddf4be9cf;p=fw%2Fsdcc

diff --git a/sim/ucsim/cmd.src/cmdset.cc b/sim/ucsim/cmd.src/cmdset.cc
index 59d6b2f4..f0226ceb 100644
--- a/sim/ucsim/cmd.src/cmdset.cc
+++ b/sim/ucsim/cmd.src/cmdset.cc
@@ -27,6 +27,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "ddconfig.h"
 
+#include "cmdlexcl.h"
+#include "cmdpars.h"
+
 // prj
 #include "i_string.h"
 #include "utils.h"
@@ -60,25 +63,25 @@ COMMAND_DO_WORK_SIM(cl_run_cmd)
   if (params[0])
     if (!(params[0]->get_address(sim->uc, &start)))
       {
-	con->printf("Error: wrong start address\n");
+	con->dd_printf("Error: wrong start address\n");
 	return(DD_FALSE);
       }
   if (params[1])
     if (!(params[1]->get_address(sim->uc, &end)))
       {
-	con->printf("Error: wromg end address\n");
+	con->dd_printf("Error: wromg end address\n");
 	return(DD_FALSE);
       }
   if (params[0])
     {
       if (!sim->uc->inst_at(start))
-	con->printf("Warning: maybe not instruction at 0x%06lx\n", start);
+	con->dd_printf("Warning: maybe not instruction at 0x%06lx\n", start);
       sim->uc->PC= start;
       if (params[1])
 	{
 	  if (start == end)
 	    {
-	      con->printf("Addresses must be different.\n");
+	      con->dd_printf("Addresses must be different.\n");
 	      return(DD_FALSE);
 	    }
 	  if ((b= sim->uc->fbrk_at(end)))
@@ -86,15 +89,17 @@ COMMAND_DO_WORK_SIM(cl_run_cmd)
 	    }
 	  else
 	    {
-	      b= new cl_fetch_brk(sim->uc->make_new_brknr(), end,
+	      b= new cl_fetch_brk(sim->uc->address_space(MEM_ROM_ID),
+				  sim->uc->make_new_brknr(), end,
 				  brkDYNAMIC, 1);
 	      sim->uc->fbrk->add_bp(b);
 	    }
 	}
     }
-  con->printf("Simulation started, PC=0x%06x\n", sim->uc->PC);
-  if (sim->uc->fbrk_at(start))
+  con->dd_printf("Simulation started, PC=0x%06x\n", sim->uc->PC);
+  if (sim->uc->fbrk_at(sim->uc->PC))
     sim->uc->do_inst(1);
+
   sim->start(con);
   return(DD_FALSE);
 }
@@ -126,7 +131,9 @@ COMMAND_DO_WORK_SIM(cl_stop_cmd)
 //		     class cl_cmdline *cmdline, class cl_console *con)
 COMMAND_DO_WORK_UC(cl_step_cmd)
 {
+  //printf("step %x\n",uc->PC);
   uc->do_inst(1);
+  //printf("step done %x\n",uc->PC);
   uc->print_regs(con);
   return(0);
 }
@@ -144,8 +151,11 @@ COMMAND_DO_WORK_SIM(cl_next_cmd)
 {
   class cl_brk *b;
   t_addr next;
-  struct dis_entry *de;
+  int branch;
+  int inst_len;
 
+#if 0
+  struct dis_entry *de;
   t_mem code= sim->uc->get_mem(MEM_ROM, sim->uc->PC);
   int i= 0;
   de= &(sim->uc->dis_tbl()[i]);
@@ -155,22 +165,35 @@ COMMAND_DO_WORK_SIM(cl_next_cmd)
       i++;
       de= &(sim->uc->dis_tbl()[i]);
     }
-  if ((de->branch == 'a') ||
-      (de->branch == 'l'))
+#endif
+
+  branch = sim->uc->inst_branch(sim->uc->PC);
+  inst_len = sim->uc->inst_length(sim->uc->PC);
+
+  if ((branch == 'a') || (branch == 'l'))
     {
-      next= sim->uc->PC + de->length;
+      next= sim->uc->PC + inst_len;
       if (!sim->uc->fbrk_at(next))
 	{
-	  b= new cl_fetch_brk(sim->uc->make_new_brknr(),
+	  b= new cl_fetch_brk(sim->uc->address_space(MEM_ROM_ID),
+			      sim->uc->make_new_brknr(),
 			      next, brkDYNAMIC, 1);
+
+	  b->init();
+//	  sim->uc->fbrk->add_bp(b);
+
 	  sim->uc->fbrk->add(b);
+	  b->activate();
 	}
+      if (sim->uc->fbrk_at(sim->uc->PC))
+	sim->uc->do_inst(1);
       sim->start(con);
       //sim->uc->do_inst(-1);
     }
-  else
+  else {
     sim->uc->do_inst(1);
-  sim->uc->print_regs(con);
+    sim->uc->print_regs(con);
+  }
   return(DD_FALSE);
 }
 
@@ -186,29 +209,87 @@ COMMAND_DO_WORK_SIM(cl_next_cmd)
 COMMAND_DO_WORK_APP(cl_help_cmd)
 {
   class cl_sim *sim;
-  class cl_commander *cmd;
+  class cl_commander *commander;
   class cl_cmdset *cmdset= 0;
-  class cl_cmd *c;
   int i;
   class cl_cmd_arg *parm= cmdline->param(0);
 
   sim= app->get_sim();
-  if ((cmd= app->get_commander()) != 0)
-    cmdset= cmd->cmdset;
+  if ((commander= app->get_commander()) != 0)
+    cmdset= commander->cmdset;
   if (!cmdset)
     return(DD_FALSE);
   if (!parm) {
     for (i= 0; i < cmdset->count; i++)
       {
-	c= (class cl_cmd *)(cmdset->at(i));
+	class cl_cmd *c= (class cl_cmd *)(cmdset->at(i));
 	if (c->short_help)
-	  con->printf("%s\n", c->short_help);
+	  con->dd_printf("%s\n", c->short_help);
 	else
-	  con->printf("%s\n", (char*)(c->names->at(0)));
+	  con->dd_printf("%s\n", (char*)(c->names->at(0)));
       }
   }
-  else if (cmdline->syntax_match(/*sim*/0, STRING)) {
-    int matches= 0;
+  else
+    {
+      matches= 0;
+      do_set(cmdline, 0, cmdset, con);
+      if (matches == 1 &&
+	  cmd_found)
+	{
+	  int names;
+	  con->dd_printf("Names of command:");
+	  for (names= 0; names < cmd_found->names->count; names++)
+	    con->dd_printf(" %s", (char*)(cmd_found->names->at(names)));
+	  con->dd_printf("\n");
+	  class cl_cmdset *subset= cmd_found->get_subcommands();
+	  if (subset)
+	    {
+	      con->dd_printf("\"%s\" must be followed by the name of a "
+			     "subcommand\nList of subcommands:\n",
+			     (char*)(cmd_found->names->at(0)));
+	      for (i= 0; i < subset->count; i++)
+		{
+		  class cl_cmd *c=
+		    dynamic_cast<class cl_cmd *>(subset->object_at(i));
+		  con->dd_printf("%s\n", c->short_help);
+		}
+	    }
+	  if (cmd_found->long_help)
+	    con->dd_printf("%s\n", cmd_found->long_help);
+	}
+      if (!matches ||
+	  !cmd_found)
+	con->dd_printf("No such command.\n");
+      //return(DD_FALSE);
+      /*
+      int pari;
+      for (pari= 0; pari < cmdline->nuof_params(); pari++)
+	{
+	  class cl_cmd_arg *act_param;
+	  act_param= (class cl_cmd_arg *)(cmdline->param(pari));
+	  for (i= 0; i < cmdset->count; i++)
+	    {
+	      class cl_cmd *c= (class cl_cmd *)(cmdset->at(i));
+	      if (!c->name_match(act_param->s_value, DD_FALSE))
+		continue;
+	      if (c->short_help)
+		con->dd_printf("%s\n", c->short_help);
+	      else
+		con->dd_printf("%s\n", (char*)(c->names->at(0)));
+	      if (pari < cmdline->nuof_params()-1)
+		continue;
+	      cmdset= c->get_subcommands();
+	      if (!cmdset)
+		return(DD_FALSE);
+	    }
+	}
+      return(DD_FALSE);
+      */
+    }
+  return(DD_FALSE);
+  /*
+  if (cmdline->syntax_match(0, STRING)) {
+    matches= 0;
     for (i= 0; i < cmdset->count; i++)
       {
 	c= (class cl_cmd *)(cmdset->at(i));
@@ -216,7 +297,7 @@ COMMAND_DO_WORK_APP(cl_help_cmd)
 	  matches++;
       }
     if (!matches)
-      con->printf("No such command\n");
+      con->dd_printf("No such command\n");
     else if (matches > 1)
       for (i= 0; i < cmdset->count; i++)
 	{
@@ -224,9 +305,9 @@ COMMAND_DO_WORK_APP(cl_help_cmd)
 	  if (!c->name_match(parm->value.string.string, DD_FALSE))
 	    continue;
 	  if (c->short_help)
-	    con->printf("%s\n", c->short_help);
+	    con->dd_printf("%s\n", c->short_help);
 	  else
-	    con->printf("%s\n", (char*)(c->names->at(0)));
+	    con->dd_printf("%s\n", (char*)(c->names->at(0)));
 	}
     else
       for (i= 0; i < cmdset->count; i++)
@@ -235,24 +316,62 @@ COMMAND_DO_WORK_APP(cl_help_cmd)
 	  if (!c->name_match(parm->value.string.string, DD_FALSE))
 	    continue;
 	  if (c->short_help)
-	    con->printf("%s\n", c->short_help);
+	    con->dd_printf("%s\n", c->short_help);
 	  else
-	    con->printf("%s\n", (char*)(c->names->at(0)));
+	    con->dd_printf("%s\n", (char*)(c->names->at(0)));
 	  int names;
-	  con->printf("Names of command:");
+	  con->dd_printf("Names of command:");
 	  for (names= 0; names < c->names->count; names++)
-	    con->printf(" %s", (char*)(c->names->at(names)));
-	  con->printf("\n");
+	    con->dd_printf(" %s", (char*)(c->names->at(names)));
+	  con->dd_printf("\n");
 	  if (c->long_help)
-	    con->printf("%s\n", c->long_help);
+	    con->dd_printf("%s\n", c->long_help);
 	  else
-	    con->printf("%s\n", (char*)(c->names->at(0)));
+	    con->dd_printf("%s\n", (char*)(c->names->at(0)));
 	}
   }
   else
-    con->printf("%s\n", short_help?short_help:"Error: wrong syntax");
+    con->dd_printf("%s\n", short_help?short_help:"Error: wrong syntax");
 
   return(0);
+  */
+}
+
+bool
+cl_help_cmd::do_set(class cl_cmdline *cmdline, int pari,
+		    class cl_cmdset *cmdset,
+		    class cl_console *con)
+{
+  int i;
+  for (i= 0; i < cmdset->count; i++)
+    {
+      class cl_cmd *cmd= dynamic_cast<class cl_cmd *>(cmdset->object_at(i));
+      if (!cmd)
+	continue;
+      if (pari >= cmdline->nuof_params())
+	return(DD_FALSE);
+      class cl_cmd_arg *param= cmdline->param(pari);
+      if (!param)
+	return(DD_FALSE);
+      class cl_cmdset *next_set= cmd->get_subcommands();
+      if (cmd->name_match(param->s_value, DD_FALSE))
+	{
+	  if (pari+1 >= cmdline->nuof_params())
+	    {
+	      matches++;
+	      cmd_found= cmd;
+	      if (cmd->short_help)
+		con->dd_printf("%s\n", cmd->short_help);
+	      else
+		con->dd_printf("%s\n", (char*)(cmd->names->at(0)));
+	      //continue;
+	    }
+	  else
+	    if (next_set)
+	      do_set(cmdline, pari+1, next_set, con);
+	}
+    }
+  return(DD_TRUE);
 }
 
 
@@ -287,4 +406,58 @@ COMMAND_DO_WORK_APP(cl_kill_cmd)
 }
 
 
+/*
+ * EXEC file
+ */
+
+COMMAND_DO_WORK_APP(cl_exec_cmd)
+{
+  class cl_cmd_arg *parm= cmdline->param(0);
+  char *fn= 0;
+
+  if (cmdline->syntax_match(0, STRING)) {
+    fn= parm->value.string.string; 
+  }
+  else
+    con->dd_printf("%s\n", short_help?short_help:"Error: wrong syntax\n");
+
+  class cl_commander *c= app->get_commander();
+  class cl_console *cons= con->clone_for_exec(fn);
+  if (cons)
+    {
+      cons->flags|= CONS_NOWELCOME;
+      c->add_console(cons);
+    }
+
+  return(DD_FALSE);
+}
+
+
+/*
+ * expression expression
+ */
+
+COMMAND_DO_WORK_APP(cl_expression_cmd)
+{
+  //con->dd_printf("\"%s\"\n", cmdline->cmd);
+  char *s= cmdline->cmd;
+  if (!s ||
+      !*s)
+    return(DD_FALSE);
+  int i= strspn(s, " \t\v\n");
+  s+= i;
+  //con->dd_printf("\"%s\"\n", s);
+  i= strspn(s, "abcdefghijklmnopqrstuvwxyz");
+  s+= i;
+  //con->dd_printf("\"%s\"\n", s);
+  class YY_cl_ucsim_parser_CLASS *pars;
+  class cl_ucsim_lexer *lexer;
+  lexer= new cl_ucsim_lexer(s);
+  pars= new YY_cl_ucsim_parser_CLASS(lexer);
+  pars->yyparse();
+  delete pars;
+  return(DD_FALSE);
+}
+
+
 /* End of cmd.src/cmdset.cc */