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

diff --git a/src/cpu/o3/iew.hh b/src/cpu/o3/iew.hh
index fb9afde54aa59daa47ccbf50946300d0f1bb6d4a..6c6be4787d11b545e8fe1c71d6f86688513bbc36 100644 (file)
--- 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 6be188a967d60be4e0bd6e25a0c48fdc94bd0985..c396f503382f8c7105dd7a479b7da4fee41b28a7 100644 (file)
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -178,19 +178,14 @@ 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);
     }
 }
 
-void
-AtomicSimpleCPU::resume()
-{
-    assert(system->getMemoryMode() == System::Atomic);
-    changeState(SimObject::Running);
-}
-
 void
 AtomicSimpleCPU::switchOut()
 {

diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index 895eb5bde3ea4829221fd578509096c8afba3093..b602af55871a0d39a9e6c3872d2842102c1a3598 100644 (file)
--- 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);