version 0.5.2

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

diff --git a/sim/ucsim/cmd.src/cmdstat.cc b/sim/ucsim/cmd.src/cmdstat.cc
index f430437c4d64ec82aa322635e1dd384eb6e6e117..fbf5dd92144d457cefd092de642e44412df147bd 100644 (file)
--- a/sim/ucsim/cmd.src/cmdstat.cc
+++ b/sim/ucsim/cmd.src/cmdstat.cc
@@ -49,7 +49,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 COMMAND_DO_WORK_UC(cl_statistic_cmd)
 {
   class cl_hw *hw;
-  class cl_mem *mem;
+  class cl_address_space *mem;
   t_addr start= 0, end= 0;
   bool addresses= DD_FALSE;
   class cl_cmd_arg *params[4]= { cmdline->param(0),
@@ -63,18 +63,18 @@ COMMAND_DO_WORK_UC(cl_statistic_cmd)
   else {
     mem= 0;
     if (cmdline->syntax_match(uc, MEMORY ADDRESS ADDRESS)) {
-      mem= params[0]->value.memory;
+      mem= params[0]->value.memory.address_space;
       start= params[1]->value.address;
       end= params[2]->value.address;
       addresses= DD_TRUE;
     }
     else if (cmdline->syntax_match(uc, MEMORY ADDRESS)) {
-      mem= params[0]->value.memory;
+      mem= params[0]->value.memory.address_space;
       start= end= params[1]->value.address;
       addresses= DD_TRUE;
     }
     else if (cmdline->syntax_match(uc, MEMORY)) {
-      mem= params[0]->value.memory;
+      mem= params[0]->value.memory.address_space;
       addresses= DD_FALSE;
     }
     else
@@ -83,15 +83,15 @@ COMMAND_DO_WORK_UC(cl_statistic_cmd)
          "%s\n", short_help?short_help:"no help");*/
        int i;
        unsigned long wr, ww;
-       for (i= 0; i < uc->mems->count; i++)
+       for (i= 0; i < uc->address_spaces->count; i++)
          {
-           mem= (class cl_mem *)(uc->mems->at(i));
+           mem= (class cl_address_space *)(uc->address_spaces->at(i));
            wr= mem->get_nuof_reads();
            ww= mem->get_nuof_writes();
            con->dd_printf("%s writes= %10lu "
                           "reads= %10lu "
-                          "(%10lu operations)\n", mem->id_string(), ww, wr,
-                          ww+wr);
+                          "(%10lu operations)\n",
+                          mem->get_name("mem"), ww, wr, ww+wr);
          }
       }
     if (mem)
@@ -102,17 +102,17 @@ COMMAND_DO_WORK_UC(cl_statistic_cmd)
        ww= mem->get_nuof_writes();
        if (!addresses)
          con->dd_printf("%s writes= %10lu "
-                        "reads= %10lu\n", mem->id_string(), ww, wr);
+                        "reads= %10lu\n", mem->get_name("mem"), ww, wr);
        else
          for (i= start; i <= end; i++)
            {
-             class cl_cell *c= (class cl_cell *)(mem->get_cell(i));
+             class cl_memory_cell *c= mem->get_cell(i);
              unsigned long w= c->nuof_writes, r= c->nuof_reads;
              double dr= wr?((double(r)*100.0)/double(wr)):0.0;
              double dw= ww?((double(w)*100.0)/double(ww)):0.0;
              con->dd_printf("%s[0x%06x] writes= %10lu (%6.2lf%%) "
-                            "reads= %10lu (%6.2lf%%)\n", mem->id_string(), i,
-                            w, dw, r, dr);
+                            "reads= %10lu (%6.2lf%%)\n",
+                            mem->get_name("mem"), i, w, dw, r, dr);
            }
       }
   }