49a50
> #include "arch/arm/table_walker.hh"
60a62
> #include "sim/full_system.hh"
65d66
< #include "arch/arm/table_walker.hh"
72,76c73,74
< : BaseTLB(p), size(p->size)
< #if FULL_SYSTEM
< , tableWalker(p->walker)
< #endif
< , rangeMRU(1), bootUncacheability(false), miscRegValid(false)
---
> : BaseTLB(p), size(p->size) , tableWalker(p->walker),
> rangeMRU(1), bootUncacheability(false), miscRegValid(false)
81d78
< #if FULL_SYSTEM
83d79
< #endif
407d402
< #if !FULL_SYSTEM
428a424
> #if !FULL_SYSTEM
434a431
> #endif
439,440d435
< #else // FULL_SYSTEM
<
456c451
< Translation *translation, bool &delay, bool timing, bool functional)
---
> Translation *translation, bool &delay, bool timing)
458,460d452
< // No such thing as a functional timing access
< assert(!(timing && functional));
<
547c539
< timing, functional);
---
> timing);
584c576
<
---
> #if FULL_SYSTEM
587a580
> #endif
690,691d682
< #endif
<
697,701c688,691
< #if FULL_SYSTEM
< fault = translateFs(req, tc, mode, NULL, delay, false);
< #else
< fault = translateSe(req, tc, mode, NULL, delay, false);
< #endif
---
> if (FullSystem)
> fault = translateFs(req, tc, mode, NULL, delay, false);
> else
> fault = translateSe(req, tc, mode, NULL, delay, false);
707,720d696
< TLB::translateFunctional(RequestPtr req, ThreadContext *tc, Mode mode)
< {
< bool delay = false;
< Fault fault;
< #if FULL_SYSTEM
< fault = translateFs(req, tc, mode, NULL, delay, false, true);
< #else
< fault = translateSe(req, tc, mode, NULL, delay, false);
< #endif
< assert(!delay);
< return fault;
< }
<
< Fault
727,731c703,706
< #if FULL_SYSTEM
< fault = translateFs(req, tc, mode, translation, delay, true);
< #else
< fault = translateSe(req, tc, mode, translation, delay, true);
< #endif
---
> if (FullSystem)
> fault = translateFs(req, tc, mode, translation, delay, true);
> else
> fault = translateSe(req, tc, mode, translation, delay, true);
744d718
< #if FULL_SYSTEM
746,748d719
< #else
< return NULL;
< #endif