diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-19 15:26:48 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-19 15:26:48 -0400 |
| commit | 0cedb23d3c9122c061c5c1837dfaf01f570e0733 (patch) | |
| tree | 311e8c3fc45dd647ffa4ae0d5cc8feb70b40a489 /src/cpu/o3 | |
| parent | 1fdf14dd5a6e58f71150d30257b2b6792200c811 (diff) | |
| download | gem5-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
Diffstat (limited to 'src/cpu/o3')
| -rw-r--r-- | src/cpu/o3/iew.hh | 9 |
1 files changed, 5 insertions, 4 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() |