2c2
< * Copyright (c) 2010-2011 ARM Limited
---
> * Copyright (c) 2010 ARM Limited
43a44,46
> #include "arch/kernel_stats.hh"
> #include "arch/stacktrace.hh"
> #include "arch/tlb.hh"
44a48
> #include "arch/vtophys.hh"
55d58
< #include "config/use_checker.hh"
66a70
> #include "mem/mem_object.hh"
77,90d80
< #if FULL_SYSTEM
< #include "arch/kernel_stats.hh"
< #include "arch/stacktrace.hh"
< #include "arch/tlb.hh"
< #include "arch/vtophys.hh"
< #else // !FULL_SYSTEM
< #include "mem/mem_object.hh"
< #endif // FULL_SYSTEM
<
< #if USE_CHECKER
< #include "cpu/checker/cpu.hh"
< #include "cpu/checker/thread_context.hh"
< #endif
<
108,122d97
< #if USE_CHECKER
< if (p->checker) {
< BaseCPU *temp_checker = p->checker;
< checker = dynamic_cast<CheckerCPU *>(temp_checker);
< #if FULL_SYSTEM
< checker->setSystem(p->system);
< #endif
< // Manipulate thread context
< ThreadContext *cpu_tc = tc;
< tc = new CheckerThreadContext<ThreadContext>(cpu_tc, this->checker);
< } else {
< checker = NULL;
< }
< #endif
<
142c117
< BaseSimpleCPU::deallocateContext(ThreadID thread_num)
---
> BaseSimpleCPU::deallocateContext(int thread_num)
150c125
< BaseSimpleCPU::haltContext(ThreadID thread_num)
---
> BaseSimpleCPU::haltContext(int thread_num)
314d288
< #if FULL_SYSTEM
320d293
< #endif // FULL_SYSTEM
322d294
< #if FULL_SYSTEM
332d303
< #endif // FULL_SYSTEM
337d307
< #if FULL_SYSTEM
348d317
< #endif
446d414
< #if FULL_SYSTEM
454d421
< #endif