42c42
< #include "config/use_checker.hh"
---
> #include "cpu/checker/cpu.hh"
49,52d48
< #if USE_CHECKER
< #include "cpu/checker/cpu.hh"
< #endif
<
297,301c293,301
< #if USE_CHECKER
< tc->pcStateNoRecord(pc);
< #else
< tc->pcState(pc);
< #endif //USE_CHECKER
---
>
> // Follow slightly different semantics if a CheckerCPU object
> // is connected
> CheckerCPU *checker = tc->getCheckerCpuPtr();
> if (checker) {
> tc->pcStateNoRecord(pc);
> } else {
> tc->pcState(pc);
> }
404,406c404,406
< #if USE_CHECKER
< CheckerCPU *checker =
< dynamic_cast<CheckerCPU*>(oc->getCheckerCpuPtr());
---
>
> // If CheckerCPU is connected, need to notify it.
> CheckerCPU *checker = oc->getCheckerCpuPtr();
411d410
< #endif
429,431c428,430
< #if USE_CHECKER
< CheckerCPU *checker =
< dynamic_cast<CheckerCPU*>(oc->getCheckerCpuPtr());
---
>
> // If CheckerCPU is connected, need to notify it of a flush
> CheckerCPU *checker = oc->getCheckerCpuPtr();
436d434
< #endif
455,457c453,454
< #if USE_CHECKER
< CheckerCPU *checker =
< dynamic_cast<CheckerCPU*>(oc->getCheckerCpuPtr());
---
>
> CheckerCPU *checker = oc->getCheckerCpuPtr();
464d460
< #endif
475,477c471
< #if USE_CHECKER
< CheckerCPU *checker =
< dynamic_cast<CheckerCPU*>(oc->getCheckerCpuPtr());
---
> CheckerCPU *checker = oc->getCheckerCpuPtr();
482d475
< #endif
493,495c486,487
< #if USE_CHECKER
< CheckerCPU *checker =
< dynamic_cast<CheckerCPU*>(oc->getCheckerCpuPtr());
---
>
> CheckerCPU *checker = oc->getCheckerCpuPtr();
500d491
< #endif