Merge ktlim@zizzer.eecs.umich.edu:/bk/m5

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : 8a558785c64b7c33e64523d3d887ea6e760c3d2b

diff --cc cpu/base_cpu.cc
index d653baa29d0c953532e68f53a03eda9289c47952,a17edd371957259f762858d06e515aee0f88c282..d1b445287bd08caa97ad4629013a8873815727ba
--- 1/cpu/base_cpu.cc
--- 2/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@@ -50,33 -48,15 +50,20 @@@ vector<BaseCPU *> BaseCPU::cpuList
  // been initialized
  int maxThreadsPerCPU = 1;
  
 +extern void debug_break();
  #ifdef FULL_SYSTEM
- BaseCPU::BaseCPU(const 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, Tick _function_trace_start)
-     : SimObject(_name), frequency(freq), checkInterrupts(true),
-       deferRegistration(_def_reg), number_of_threads(_number_of_threads),
-       system(_system)
+ BaseCPU::BaseCPU(Params *p)
+     : SimObject(p->name), frequency(p->freq), checkInterrupts(true),
+       params(p), number_of_threads(p->numberOfThreads), system(p->system)
  #else
- BaseCPU::BaseCPU(const 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,
-                  bool _function_trace, Tick _function_trace_start)
-     : SimObject(_name), deferRegistration(_def_reg),
-       number_of_threads(_number_of_threads)
+ BaseCPU::BaseCPU(Params *p)
+     : SimObject(p->name), params(p), number_of_threads(p->numberOfThreads)
  #endif
  {
 +    DPRINTF(FullCPU, "BaseCPU: Creating object, mem address %#x.\n", this);
 +
 +    debug_break();
 +
      // add self to global list of CPUs
      cpuList.push_back(this);