fix printf is a macro in gcc 3

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

diff --git a/sim/ucsim/cmd.src/cmdconf.cc b/sim/ucsim/cmd.src/cmdconf.cc
index 6afd4cab6829f3797218df1f13f2f6c6c8e6859b..92aae0c2d65d48fbe4810775e31e7f1b8706d0d6 100644 (file)
--- a/sim/ucsim/cmd.src/cmdconf.cc
+++ b/sim/ucsim/cmd.src/cmdconf.cc
@@ -41,29 +41,29 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  *----------------------------------------------------------------------------
  */
 
-int
-cl_conf_cmd::do_work(class cl_sim *sim,
-                    class cl_cmdline *cmdline, class cl_console *con)
+//int
+//cl_conf_cmd::do_work(class cl_sim *sim,
+//                  class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_UC(cl_conf_cmd)
 {
   int i;
 
-  con->printf("ucsim version %s\n", VERSIONSTR);
-  con->printf("Type of microcontroller: %s\n", sim->uc->id_string());
-  con->printf("Controller has %d hardware element(s).\n",
-             sim->uc->hws->count);
-  for (i= 0; i < sim->uc->hws->count; i++)
+  con->dd_printf("ucsim version %s\n", VERSIONSTR);
+  con->dd_printf("Type of microcontroller: %s\n", uc->id_string());
+  con->dd_printf("Controller has %d hardware element(s).\n", uc->hws->count);
+  for (i= 0; i < uc->hws->count; i++)
     {
-      class cl_hw *hw= (class cl_hw *)(sim->uc->hws->at(i));
-      con->printf("  %s[%d]\n", hw->id_string, hw->id);
+      class cl_hw *hw= (class cl_hw *)(uc->hws->at(i));
+      con->dd_printf("  %s[%d]\n", hw->id_string, hw->id);
     }
-  con->printf("Memories:\n");
+  con->dd_printf("Memories:\n");
   for (i= MEM_ROM; i < MEM_TYPES; i++)
     {
-      class cl_mem *mem= (class cl_mem *)(sim->uc->mems->at(i));
+      class cl_mem *mem= (class cl_mem *)(uc->mems->at(i));
       if (mem)
-       con->printf("  %s size= 0x%06x %6d width= %2d class= \"%s\"\n",
-                   mem->id_string(), mem->size, mem->size, mem->width,
-                   (mem->class_name)?(mem->class_name):"unknown");
+       con->dd_printf("  %s size= 0x%06x %6d width= %2d class= \"%s\"\n",
+                      mem->id_string(), mem->size, mem->size, mem->width,
+                      (mem->class_name)?(mem->class_name):"unknown");
     }
   return(0);
 }
@@ -73,9 +73,10 @@ cl_conf_cmd::do_work(class cl_sim *sim,
  *----------------------------------------------------------------------------
  */
 
-int
-cl_conf_addmem_cmd::do_work(class cl_sim *sim,
-                           class cl_cmdline *cmdline, class cl_console *con)
+//int
+//cl_conf_addmem_cmd::do_work(class cl_sim *sim,
+//                         class cl_cmdline *cmdline, class cl_console *con)
+COMMAND_DO_WORK_UC(cl_conf_addmem_cmd)
 {
   class cl_mem *mem= 0;
   class cl_cmd_arg *params[4]= { cmdline->param(0),
@@ -84,20 +85,20 @@ cl_conf_addmem_cmd::do_work(class cl_sim *sim,
                                 cmdline->param(3) };
   char *mem_class;
 
-  if (cmdline->syntax_match(sim, STRING)) {
+  if (cmdline->syntax_match(uc, STRING)) {
     mem_class= params[0]->value.string.string;
     enum mem_class type;
     type= (enum mem_class)get_string_id(mem_classes, mem_class, -1);
-    mem= sim->uc->mk_mem(type, mem_class);
+    mem= uc->mk_mem(type, mem_class);
     if (mem)
       {
-       class cl_mem *m= sim->uc->mem(type);
+       class cl_mem *m= uc->mem(type);
        if (m)
          delete m;
-       sim->uc->mems->put_at(type, mem);
+       uc->mems->put_at(type, mem);
       }
     else
-      con->printf("Can not make memory \"%s\"\n", mem_class);
+      con->dd_printf("Can not make memory \"%s\"\n", mem_class);
   }
   return(DD_FALSE);
 }