summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-06-22 23:43:45 -0400
committerKevin Lim <ktlim@umich.edu>2006-06-22 23:43:45 -0400
commit63bdaeedfae71aa9eab4716a884fad9d7c4ece54 (patch)
tree6856a06705784c6b43372f65b0f8aaad5ededfc0
parentfa9c774421952f5f4b6aee240da693e5f94ba1ac (diff)
downloadgem5-63bdaeedfae71aa9eab4716a884fad9d7c4ece54.tar.xz
Checker related updates.
src/cpu/o3/cpu.cc: Updates to make sure the checker is compiled in if enabled and also to include it only when it's used. --HG-- extra : convert_revision : c48ead5b2665dc858acd87c2ee99d39d80594a69
-rw-r--r--src/cpu/o3/cpu.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index a411fe42e..553399048 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -39,7 +39,6 @@
#endif
#include "cpu/activity.hh"
-#include "cpu/checker/cpu.hh"
#include "cpu/simple_thread.hh"
#include "cpu/thread_context.hh"
#include "cpu/o3/alpha_dyn_inst.hh"
@@ -49,6 +48,10 @@
#include "sim/root.hh"
#include "sim/stat_control.hh"
+#if USE_CHECKER
+#include "cpu/checker/cpu.hh"
+#endif
+
using namespace std;
using namespace TheISA;
@@ -135,16 +138,18 @@ FullO3CPU<Impl>::FullO3CPU(Params *params)
checker = NULL;
-#if USE_CHECKER
if (params->checker) {
+#if USE_CHECKER
BaseCPU *temp_checker = params->checker;
checker = dynamic_cast<Checker<DynInstPtr> *>(temp_checker);
checker->setMemory(mem);
#if FULL_SYSTEM
checker->setSystem(params->system);
#endif
+#else
+ panic("Checker enabled but not compiled in!");
+#endif // USE_CHECKER
}
-#endif
#if !FULL_SYSTEM
thread.resize(number_of_threads);
@@ -688,8 +693,10 @@ FullO3CPU<Impl>::signalSwitched()
removeList.pop();
}
+#if USE_CHECKER
if (checker)
checker->switchOut(sampler);
+#endif
if (tickEvent.scheduled())
tickEvent.squash();