29,30c29,30
< #ifndef __CPU_CHECKER_EXEC_CONTEXT_HH__
< #define __CPU_CHECKER_EXEC_CONTEXT_HH__
---
> #ifndef __CPU_CHECKER_THREAD_CONTEXT_HH__
> #define __CPU_CHECKER_THREAD_CONTEXT_HH__
33c33
< #include "cpu/cpu_exec_context.hh"
---
> #include "cpu/simple_thread.hh"
44,46c44,47
< * verified. This CheckerThreadContext is then used by the main CPU in
< * place of its usual ThreadContext class. It handles updating the
< * checker's state any time state is updated through the ThreadContext.
---
> * verified. This CheckerThreadContext is then used by the main CPU
> * in place of its usual ThreadContext class. It handles updating the
> * checker's state any time state is updated externally through the
> * ThreadContext.
53,54c54,55
< CheckerCPU *checker_cpu)
< : actualTC(actual_tc), checkerTC(checker_cpu->cpuXC),
---
> CheckerCPU *checker_cpu)
> : actualTC(actual_tc), checkerTC(checker_cpu->thread),
58a60,61
> /** The main CPU's ThreadContext, or class that implements the
> * ThreadContext interface. */
60c63,67
< CPUExecContext *checkerTC;
---
> /** The checker's own SimpleThread. Will be updated any time
> * anything uses this ThreadContext to externally update a
> * thread's state. */
> SimpleThread *checkerTC;
> /** Pointer to the checker CPU. */