Merge zizzer:/z/m5/Bitkeeper/m5

into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : db688679bfd9c670ef44611de71640c3bf564fc0

1 files changed, 17 insertions, 14 deletions

diff --git a/cpu/base_cpu.hh b/cpu/base_cpu.hh
index 802da340b..f346f4ec5 100644
--- a/cpu/base_cpu.hh
+++ b/cpu/base_cpu.hh
@@ -91,28 +91,31 @@ class BaseCPU : public SimObject
     virtual void haltContext(int thread_num) {}
 
   public:
-
+    struct Params
+    {
+        std::string name;
+        int numberOfThreads;
+        bool deferRegistration;
+        Counter max_insts_any_thread;
+        Counter max_insts_all_threads;
+        Counter max_loads_any_thread;
+        Counter max_loads_all_threads;
+        Tick freq;
+        bool functionTrace;
+        Tick functionTraceStart;
 #ifdef FULL_SYSTEM
-    BaseCPU(const std::string &_name, int _number_of_threads, bool _def_reg,
-            Counter max_insts_any_thread, Counter max_insts_all_threads,
-            Counter max_loads_any_thread, Counter max_loads_all_threads,
-            System *_system, Tick freq,
-            bool _function_trace = false, Tick _function_trace_start = 0);
-#else
-    BaseCPU(const std::string &_name, int _number_of_threads, bool _def_reg,
-            Counter max_insts_any_thread = 0,
-            Counter max_insts_all_threads = 0,
-            Counter max_loads_any_thread = 0,
-            Counter max_loads_all_threads = 0,
-            bool _function_trace = false, Tick _function_trace_start = 0);
+        System *system;
 #endif
+    };
+
+    const Params *params;
 
+    BaseCPU(Params *params);
     virtual ~BaseCPU();
 
     virtual void init();
     virtual void regStats();
 
-    bool deferRegistration;
     void registerExecContexts();
 
     /// Prepare for another CPU to take over execution.  When it is