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

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

--HG--
extra : convert_revision : 0baadd8d68bfa6f8e96307eb2d4426b0d9e0b8b4

diff --cc cpu/base_cpu.cc
index 01040015c424ac1def906038c6cfd6764133eb09,9d94c575c9700a153c3338868e0f0e6133272b4f..643a2b652ffbef63b837b5ec7cbb1610942a6d00
--- 1/cpu/base_cpu.cc
--- 2/cpu/base_cpu.cc
+++ b/cpu/base_cpu.cc
@@@ -51,20 -49,16 +51,21 @@@ vector<BaseCPU *> BaseCPU::cpuList
  // been initialized
  int maxThreadsPerCPU = 1;
  
 +extern void debug_break();
  #ifdef FULL_SYSTEM
  BaseCPU::BaseCPU(Params *p)
-     : SimObject(p->name), frequency(p->freq), checkInterrupts(true),
+     : SimObject(p->name), cycleTime(p->cycleTime), checkInterrupts(true),
        params(p), number_of_threads(p->numberOfThreads), system(p->system)
  #else
  BaseCPU::BaseCPU(Params *p)
-     : SimObject(p->name), params(p), number_of_threads(p->numberOfThreads)
+     : SimObject(p->name), cycleTime(p->cycleTime), 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);
  

diff --cc cpu/simple_cpu/simple_cpu.cc
Simple merge