version 0.2.39: fix of arith insts and start of re-structure

[fw/sdcc] / sim / ucsim / s51.src / go.cc

diff --git a/sim/ucsim/s51.src/go.cc b/sim/ucsim/s51.src/go.cc
index cbc52ba77a0ad717af557008595f3577a211aafc..704aa7dcc84239f41093df021da135f8b96ca067 100644 (file)
--- a/sim/ucsim/s51.src/go.cc
+++ b/sim/ucsim/s51.src/go.cc
@@ -50,12 +50,11 @@ cmd_go(char *cmd, class t_uc51 *uc, class cl_sim *sim)
   t_addr start= uc->PC;
   long stop= -1;
   class cl_brk *b;
-  bool brk_at_stop= FALSE;
+  bool brk_at_stop= DD_FALSE;
 
   if (sim->state & SIM_GO)
     {
-      fprintf(sim->cmd_out(),
-             "Execution is already running.\n");
+      sim->cmd->printf("Execution is already running.\n");
       return(0);
     }
   if ((start_str= strtok(NULL, delimiters)) != NULL)
@@ -68,20 +67,19 @@ cmd_go(char *cmd, class t_uc51 *uc, class cl_sim *sim)
     {
       if (!uc->inst_at(start) &&
          uc->debug)
-       fprintf(sim->cmd_out(),
-               "Warning: maybe not instruction at 0x%06lx\n", start);
+       sim->cmd->printf("Warning: maybe not instruction at 0x%06lx\n", start);
       uc->PC= start;
     }
   if (stop >= 0)
     {
       if (start == (t_addr)stop)
        {
-         fprintf(sim->cmd_out(), "Addresses must be different.\n");
-         return(FALSE);
+         sim->cmd->printf("Addresses must be different.\n");
+         return(DD_FALSE);
        }
       if ((b= uc->fbrk_at(stop)))
        {
-         brk_at_stop= TRUE;
+         brk_at_stop= DD_TRUE;
          b->cnt= 1;
        }
       else
@@ -101,7 +99,7 @@ cmd_go(char *cmd, class t_uc51 *uc, class cl_sim *sim)
       uc->fbrk->del_bp(stop);*/
   /*fprintf(sim->cmd_out(), "%d\n", uc->result);
     uc->print_disass(uc->PC);*/
-  return(FALSE);
+  return(DD_FALSE);
 }
 
 
@@ -110,7 +108,7 @@ cmd_stop(char *cmd, class t_uc51 *uc, class cl_sim *sim)
 {
   sim->stop(resUSER);
   uc->print_disass(uc->PC, sim->cmd->actual_console);
-  return(FALSE);
+  return(DD_FALSE);
 }
 
 
@@ -139,7 +137,7 @@ cmd_step(char *cmd, class t_uc51 *uc, class cl_sim *sim)
       uc->do_inst(1);
       dump_step(uc, sim);
     }
-  return(FALSE);
+  return(DD_FALSE);
 }
 
 
@@ -177,7 +175,7 @@ cmd_next(char *cmd, class t_uc51 *uc, class cl_sim *sim)
        uc->do_inst(1);
       dump_step(uc, sim);
     }
-  return(FALSE);
+  return(DD_FALSE);
 }
 
 
@@ -194,25 +192,24 @@ cmd_pc(char *cmd, class t_uc51 *uc, class cl_sim *sim)
   if ((s= strtok(NULL, delimiters)) == NULL)
     {
       uc->print_disass(uc->PC, sim->cmd->actual_console);
-      return(FALSE);
+      return(DD_FALSE);
     }
   pc= strtol(s, &p, 0);
   if (p &&
       ((p == s) ||
        *p))
-    fprintf(sim->cmd_out(), "Wrong parameter, PC unchanged.\n");
+    sim->cmd->printf("Wrong parameter, PC unchanged.\n");
   else
     {
       if (pc >= EROM_SIZE)
        pc= 0;
       if (!uc->inst_at(pc) &&
          uc->debug)
-       fprintf(sim->cmd_out(),
-               "Warning: maybe not instruction at %06lx\n", pc);
+       sim->cmd->printf("Warning: maybe not instruction at %06lx\n", pc);
       uc->PC= pc;
       uc->print_disass(uc->PC, sim->cmd->actual_console);
     }
-  return(FALSE);
+  return(DD_FALSE);
 }