diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-04-14 16:06:34 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-04-14 16:06:34 -0400 |
| commit | 26d6d97f5d46bfe2cc5734eb632bec0bc67aed19 (patch) | |
| tree | ed8a33f234ee4d85bc79f6179ea8907976ee3e70 /cpu/base_cpu.cc | |
| parent | dcedd7866e35adc1e0fbc081188b259ffc7bbdf5 (diff) | |
| parent | 5e67b78af7f74d7223ced5b54978ca9fa29606c5 (diff) | |
| download | gem5-26d6d97f5d46bfe2cc5734eb632bec0bc67aed19.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : 0baadd8d68bfa6f8e96307eb2d4426b0d9e0b8b4
Diffstat (limited to 'cpu/base_cpu.cc')
| -rw-r--r-- | cpu/base_cpu.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/base_cpu.cc b/cpu/base_cpu.cc index 01040015c..643a2b652 100644 --- a/cpu/base_cpu.cc +++ b/cpu/base_cpu.cc @@ -54,11 +54,12 @@ 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); |