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

diff --git a/sim/ucsim/cmd.src/info.cc b/sim/ucsim/cmd.src/info.cc
index 3c493589..ff6881c5 100644
--- a/sim/ucsim/cmd.src/info.cc
+++ b/sim/ucsim/cmd.src/info.cc
@@ -47,31 +47,31 @@ COMMAND_DO_WORK_UC(cl_info_bp_cmd)
   int i;
   char *s;
 
-  con->printf("Num Type       Disp Hit   Cnt   Address  What\n");
+  con->dd_printf("Num Type       Disp Hit   Cnt   Address  What\n");
   for (i= 0; i < uc->fbrk->count; i++)
     {
       class cl_brk *fb= (class cl_brk *)(uc->fbrk->at(i));
       s= uc->disass(fb->addr, NULL);
-      con->printf("%-3d %-10s %s %-5d %-5d 0x%06x %s\n", fb->nr,
-		  "fetch", (fb->perm==brkFIX)?"keep":"del ",
-		  fb->hit, fb->cnt,
-		  fb->addr, s);
+      con->dd_printf("%-3d %-10s %s %-5d %-5d 0x%06x %s\n", fb->nr,
+		     "fetch", (fb->perm==brkFIX)?"keep":"del ",
+		     fb->hit, fb->cnt,
+		     fb->addr, s);
       free(s);
     }
   for (i= 0; i < uc->ebrk->count; i++)
     {
       class cl_ev_brk *eb= (class cl_ev_brk *)(uc->ebrk->at(i));
-      con->printf("%-3d %-10s %s %-5d %-5d 0x%06x %s\n", eb->nr,
-		  "event", (eb->perm==brkFIX)?"keep":"del ",
-		  eb->hit, eb->cnt,
-		  eb->addr, eb->id);
+      con->dd_printf("%-3d %-10s %s %-5d %-5d 0x%06x %s\n", eb->nr,
+		     "event", (eb->perm==brkFIX)?"keep":"del ",
+		     eb->hit, eb->cnt,
+		     eb->addr, eb->id);
     }
   /*t_addr a;
   class cl_rom *r= (class cl_rom *)(sim->uc->mem(MEM_ROM));
   for (a= 0; a < sim->uc->get_mem_size(MEM_ROM); a++)
     {
       if (r->bp_map->get(a))
-	con->printf("0x%06x\n", a);
+	con->dd_printf("0x%06x\n", a);
 	}*/
   return(0);
 }
@@ -111,10 +111,100 @@ COMMAND_DO_WORK_UC(cl_info_hw_cmd)
     hw->print_info(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);
 }
 
 
+/*
+ * INFO STACK command
+ */
+
+//int
+//cl_info_stack_cmd::do_work(class cl_sim *sim,
+//                          class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_UC(cl_info_stack_cmd)
+{
+  int i;
+
+  cl_stack_op::info_head(con);
+  for (i= uc->stack_ops->count-1; i >= 0; i--)
+    {
+      class cl_stack_op *so= (class cl_stack_op *)(uc->stack_ops->at(i));
+      so->info(con, uc);
+    }
+  return(DD_FALSE);
+}
+
+
+/*
+ * INFO MMEORY command
+ *----------------------------------------------------------------------------
+ */
+
+COMMAND_DO_WORK_UC(cl_info_memory_cmd)
+{
+  int i;
+
+  con->dd_printf("Memory chips:\n");
+  for (i= 0; i < uc->memchips->count; i++)
+    {
+      class cl_memory_chip *m= (class cl_memory_chip *)(uc->memchips->at(i));
+      if (m)
+	con->dd_printf("  0x%06x-0x%06x %8d %s (%d,%s,%s)\n",
+		       m->get_start_address(),
+		       m->highest_valid_address(),
+		       m->get_size(),
+		       m->get_name(),
+		       m->width, m->data_format, m->addr_format);
+    }
+  con->dd_printf("Address spaces:\n");
+  for (i= 0; i < uc->address_spaces->count; i++)
+    {
+      class cl_address_space *m=
+	(class cl_address_space *)(uc->address_spaces->at(i));
+      if (m)
+	con->dd_printf("  0x%06x-0x%06x %8d %s (%d,%s,%s)\n",
+		       m->get_start_address(),
+		       m->highest_valid_address(),
+		       m->get_size(),
+		       m->get_name(),
+		       m->width, m->data_format, m->addr_format);
+    }
+  con->dd_printf("Address decoders:\n");
+  for (i= 0; i < uc->address_spaces->count; i++)
+    {
+      class cl_address_space *m=
+	(class cl_address_space *)(uc->address_spaces->at(i));
+      int j;
+      for (j= 0; j < m->decoders->count; j++)
+	{
+	  class cl_address_decoder *d=
+	    (class cl_address_decoder *)(m->decoders->at(j));
+	  con->dd_printf("%2d ", j);
+	  if (d->address_space)
+	    {
+	      con->dd_printf("%s ", d->address_space->get_name("unknown"));
+	      con->dd_printf(d->address_space->addr_format, d->as_begin);
+	      con->dd_printf(" ");
+	      con->dd_printf(d->address_space->addr_format, d->as_end);
+	    }
+	  else
+	    con->dd_printf("x");
+	  con->dd_printf(" -> ");
+	  if (d->memchip)
+	    {
+	      con->dd_printf("%s ", d->memchip->get_name("unknown"));
+	      con->dd_printf(d->memchip->addr_format, d->chip_begin);
+	    }
+	  else
+	    con->dd_printf("x");
+	  con->dd_printf(" %s\n", (d->activated)?"activated":"inactive");
+	}
+    }
+  return(0);
+}
+
+
 /* End of cmd.src/info.cc */