From: Kevin Lim <ktlim@umich.edu>
Date: Thu, 14 Apr 2005 20:06:34 +0000 (-0400)
Subject: Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
X-Git-Tag: m5_1.0_tutorial~64
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26d6d97f5d46bfe2cc5734eb632bec0bc67aed19;p=gem5.git

Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : 0baadd8d68bfa6f8e96307eb2d4426b0d9e0b8b4
---

26d6d97f5d46bfe2cc5734eb632bec0bc67aed19
diff --cc cpu/base_cpu.cc
index 01040015c,9d94c575c..643a2b652
--- a/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);