diff options
| author | Geoffrey Blake <geoffrey.blake@arm.com> | 2012-03-09 09:59:27 -0500 |
|---|---|---|
| committer | Geoffrey Blake <geoffrey.blake@arm.com> | 2012-03-09 09:59:27 -0500 |
| commit | 043709fdfab3b6c46f6ef95d1f642cd3c06ee20a (patch) | |
| tree | ef8bab03f4260b67b57b00844d0245ca1e849ea0 /src/cpu/o3/commit_impl.hh | |
| parent | df05ffab1289b26aab2a0eb71ee55dcb7f42e5e9 (diff) | |
| download | gem5-043709fdfab3b6c46f6ef95d1f642cd3c06ee20a.tar.xz | |
CheckerCPU: Make CheckerCPU runtime selectable instead of compile selectable
Enables the CheckerCPU to be selected at runtime with the --checker option
from the configs/example/fs.py and configs/example/se.py configuration
files. Also merges with the SE/FS changes.
Diffstat (limited to 'src/cpu/o3/commit_impl.hh')
| -rw-r--r-- | src/cpu/o3/commit_impl.hh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index bb82c37a8..ce023e665 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -48,7 +48,7 @@ #include "base/loader/symtab.hh" #include "base/cp_annotate.hh" #include "config/the_isa.hh" -#include "config/use_checker.hh" +#include "cpu/checker/cpu.hh" #include "cpu/o3/commit.hh" #include "cpu/o3/thread_state.hh" #include "cpu/base.hh" @@ -63,10 +63,6 @@ #include "sim/faults.hh" #include "sim/full_system.hh" -#if USE_CHECKER -#include "cpu/checker/cpu.hh" -#endif - using namespace std; template <class Impl> @@ -737,11 +733,9 @@ DefaultCommit<Impl>::handleInterrupt() assert(!thread[0]->inSyscall); thread[0]->inSyscall = true; -#if USE_CHECKER if (cpu->checker) { cpu->checker->handlePendingInt(); } -#endif // CPU will handle interrupt. cpu->processInterrupts(interrupt); @@ -1143,13 +1137,11 @@ DefaultCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num) head_inst->setCompleted(); } -#if USE_CHECKER // Use checker prior to updating anything due to traps or PC // based events. if (cpu->checker) { cpu->checker->verify(head_inst); } -#endif if (inst_fault != NoFault) { DPRINTF(Commit, "Inst [sn:%lli] PC %s has a fault\n", @@ -1162,12 +1154,10 @@ DefaultCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num) head_inst->setCompleted(); -#if USE_CHECKER if (cpu->checker) { // Need to check the instruction before its fault is processed cpu->checker->verify(head_inst); } -#endif assert(!thread[tid]->inSyscall); |