summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-19 15:26:48 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-19 15:26:48 -0400
commit0cedb23d3c9122c061c5c1837dfaf01f570e0733 (patch)
tree311e8c3fc45dd647ffa4ae0d5cc8feb70b40a489
parent1fdf14dd5a6e58f71150d30257b2b6792200c811 (diff)
downloadgem5-0cedb23d3c9122c061c5c1837dfaf01f570e0733.tar.xz
Some minor compiling fixes.
src/cpu/o3/iew.hh: Non-debug compile fixes. src/cpu/simple/atomic.cc: src/cpu/simple/atomic.hh: Merge fix. --HG-- extra : convert_revision : 38081925d2b74d8f64acdb65dba94b2bf465b16a
-rw-r--r--src/cpu/o3/iew.hh9
-rw-r--r--src/cpu/simple/atomic.cc9
-rw-r--r--src/cpu/simple/atomic.hh1
3 files changed, 7 insertions, 12 deletions
diff --git a/src/cpu/o3/iew.hh b/src/cpu/o3/iew.hh
index fb9afde54..6c6be4787 100644
--- a/src/cpu/o3/iew.hh
+++ b/src/cpu/o3/iew.hh
@@ -31,11 +31,12 @@
#ifndef __CPU_O3_IEW_HH__
#define __CPU_O3_IEW_HH__
+#include "config/full_system.hh"
+
#include <queue>
#include "base/statistics.hh"
#include "base/timebuf.hh"
-#include "config/full_system.hh"
#include "cpu/o3/comm.hh"
#include "cpu/o3/scoreboard.hh"
#include "cpu/o3/lsq.hh"
@@ -215,7 +216,7 @@ class DefaultIEW
if (++wbOutstanding == wbMax)
ableToIssue = false;
DPRINTF(IEW, "wbOutstanding: %i\n", wbOutstanding);
-#if DEBUG
+#ifdef DEBUG
wbList.insert(sn);
#endif
}
@@ -225,13 +226,13 @@ class DefaultIEW
if (wbOutstanding-- == wbMax)
ableToIssue = true;
DPRINTF(IEW, "wbOutstanding: %i\n", wbOutstanding);
-#if DEBUG
+#ifdef DEBUG
assert(wbList.find(sn) != wbList.end());
wbList.erase(sn);
#endif
}
-#if DEBUG
+#ifdef DEBUG
std::set<InstSeqNum> wbList;
void dumpWb()
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 6be188a96..c396f5033 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -178,6 +178,8 @@ AtomicSimpleCPU::unserialize(Checkpoint *cp, const string &section)
void
AtomicSimpleCPU::resume()
{
+ assert(system->getMemoryMode() == System::Atomic);
+ changeState(SimObject::Running);
if (thread->status() == ThreadContext::Active) {
if (!tickEvent.scheduled())
tickEvent.schedule(curTick);
@@ -185,13 +187,6 @@ AtomicSimpleCPU::resume()
}
void
-AtomicSimpleCPU::resume()
-{
- assert(system->getMemoryMode() == System::Atomic);
- changeState(SimObject::Running);
-}
-
-void
AtomicSimpleCPU::switchOut()
{
assert(status() == Running || status() == Idle);
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index 895eb5bde..b602af558 100644
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -128,7 +128,6 @@ class AtomicSimpleCPU : public BaseSimpleCPU
virtual void unserialize(Checkpoint *cp, const std::string &section);
virtual void resume();
- virtual void resume();
void switchOut();
void takeOverFrom(BaseCPU *oldCPU);