rename the simple cpu's multiplier parameter. call it width.

it makes more sense and is less confusing.

cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
    width is a better name than multiplier

--HG--
extra : convert_revision : ea2fa4faa160f5657aece41df469bbc9f7244b21

diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
index f292b25a5af469d1398501914a0deedcabbefdc2..9079aba8268d0571e5a737c89004e29cde1dff90 100644 (file)
--- a/cpu/simple_cpu/simple_cpu.cc
+++ b/cpu/simple_cpu/simple_cpu.cc
@@ -75,15 +75,15 @@
 using namespace std;
 
 
-SimpleCPU::TickEvent::TickEvent(SimpleCPU *c)
-    : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c), multiplier(1)
+SimpleCPU::TickEvent::TickEvent(SimpleCPU *c, int w)
+    : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c), width(w)
 {
 }
 
 void
 SimpleCPU::TickEvent::process()
 {
-    int count = multiplier;
+    int count = width;
     do {
         cpu->tick();
     } while (--count > 0 && cpu->status() == Running);
@@ -97,8 +97,7 @@ SimpleCPU::TickEvent::description()
 
 
 SimpleCPU::CacheCompletionEvent::CacheCompletionEvent(SimpleCPU *_cpu)
-    : Event(&mainEventQueue),
-      cpu(_cpu)
+    : Event(&mainEventQueue), cpu(_cpu)
 {
 }
 
@@ -125,7 +124,8 @@ SimpleCPU::SimpleCPU(const string &_name,
                      MemInterface *icache_interface,
                      MemInterface *dcache_interface,
                      bool _def_reg, Tick freq,
-                     bool _function_trace, Tick _function_trace_start)
+                     bool _function_trace, Tick _function_trace_start,
+                     int width)
     : BaseCPU(_name, /* number_of_threads */ 1, _def_reg,
               max_insts_any_thread, max_insts_all_threads,
               max_loads_any_thread, max_loads_all_threads,
@@ -139,13 +139,14 @@ SimpleCPU::SimpleCPU(const string &_name, Process *_process,
                      MemInterface *icache_interface,
                      MemInterface *dcache_interface,
                      bool _def_reg,
-                     bool _function_trace, Tick _function_trace_start)
+                     bool _function_trace, Tick _function_trace_start,
+                     int width)
     : BaseCPU(_name, /* number_of_threads */ 1, _def_reg,
               max_insts_any_thread, max_insts_all_threads,
               max_loads_any_thread, max_loads_all_threads,
               _function_trace, _function_trace_start),
 #endif
-      tickEvent(this), xc(NULL), cacheCompletionEvent(this)
+      tickEvent(this, width), xc(NULL), cacheCompletionEvent(this)
 {
     _status = Idle;
 #ifdef FULL_SYSTEM
@@ -841,7 +842,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(SimpleCPU)
     SimObjectParam<BaseMem *> dcache;
 
     Param<bool> defer_registration;
-    Param<int> multiplier;
+    Param<int> width;
     Param<bool> function_trace;
     Param<Tick> function_trace_start;
 
@@ -877,7 +878,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(SimpleCPU)
     INIT_PARAM_DFLT(defer_registration, "defer registration with system "
                     "(for sampling)", false),
 
-    INIT_PARAM_DFLT(multiplier, "clock multiplier", 1),
+    INIT_PARAM_DFLT(width, "cpu width", 1),
     INIT_PARAM_DFLT(function_trace, "Enable function trace", false),
     INIT_PARAM_DFLT(function_trace_start, "Cycle to start function trace", 0)
 
@@ -899,7 +900,8 @@ CREATE_SIM_OBJECT(SimpleCPU)
                         (dcache) ? dcache->getInterface() : NULL,
                         defer_registration,
                         ticksPerSecond * mult,
-                        function_trace, function_trace_start);
+                        function_trace, function_trace_start,
+                        width);
 #else
 
     cpu = new SimpleCPU(getInstanceName(), workload,
@@ -908,12 +910,11 @@ CREATE_SIM_OBJECT(SimpleCPU)
                         (icache) ? icache->getInterface() : NULL,
                         (dcache) ? dcache->getInterface() : NULL,
                         defer_registration,
-                        function_trace, function_trace_start);
+                        function_trace, function_trace_start,
+                        width);
 
 #endif // FULL_SYSTEM
 
-    cpu->setTickMultiplier(multiplier);
-
     return cpu;
 }
 

diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
index a81d6365bc7dacd17f0a03da4c8851c667749c6d..731b3ddbc13bd6c93bfa76c844733b52358f9376 100644 (file)
--- a/cpu/simple_cpu/simple_cpu.hh
+++ b/cpu/simple_cpu/simple_cpu.hh
@@ -69,9 +69,9 @@ class SimpleCPU : public BaseCPU
     struct TickEvent : public Event
     {
         SimpleCPU *cpu;
-        int multiplier;
+        int width;
 
-        TickEvent(SimpleCPU *c);
+        TickEvent(SimpleCPU *c, int w);
         void process();
         const char *description();
     };
@@ -94,12 +94,6 @@ class SimpleCPU : public BaseCPU
             tickEvent.squash();
     }
 
-  public:
-    void setTickMultiplier(int multiplier)
-    {
-        tickEvent.multiplier = multiplier;
-    }
-
   private:
     Trace::InstRecord *traceData;
 
@@ -137,7 +131,7 @@ class SimpleCPU : public BaseCPU
               AlphaITB *itb, AlphaDTB *dtb, FunctionalMemory *mem,
               MemInterface *icache_interface, MemInterface *dcache_interface,
               bool _def_reg, Tick freq,
-              bool _function_trace, Tick _function_trace_start);
+              bool _function_trace, Tick _function_trace_start, int width);
 
 #else
 
@@ -148,7 +142,7 @@ class SimpleCPU : public BaseCPU
               Counter max_loads_all_threads,
               MemInterface *icache_interface, MemInterface *dcache_interface,
               bool _def_reg,
-              bool _function_trace, Tick _function_trace_start);
+              bool _function_trace, Tick _function_trace_start, int width);
 
 #endif