38a39
> #include "arch/arm/faults.hh"
41d41
< #include "arch/arm/faults.hh"
47d46
< #include "sim/process.hh"
49,50d47
< #include "params/ArmDTB.hh"
< #include "params/ArmITB.hh"
52c49
< #include "params/ArmUTB.hh"
---
> #include "sim/process.hh"
282c279
< ITB::translateAtomic(RequestPtr req, ThreadContext *tc)
---
> TLB::translateAtomic(RequestPtr req, ThreadContext *tc, Mode mode)
293c290
< fatal("ITB translate not yet implemented\n");
---
> fatal("translate atomic not yet implemented\n");
298,299c295,296
< ITB::translateTiming(RequestPtr req, ThreadContext *tc,
< Translation *translation)
---
> TLB::translateTiming(RequestPtr req, ThreadContext *tc,
> Translation *translation, Mode mode)
302c299
< translation->finish(translateAtomic(req, tc), req, tc, false);
---
> translation->finish(translateAtomic(req, tc, mode), req, tc, mode);
305,354d301
<
< Fault
< DTB::translateAtomic(RequestPtr req, ThreadContext *tc, bool write)
< {
< #if !FULL_SYSTEM
< Process * p = tc->getProcessPtr();
<
< Fault fault = p->pTable->translate(req);
< if(fault != NoFault)
< return fault;
<
< return NoFault;
< #else
< fatal("DTB translate not yet implemented\n");
< #endif
< }
<
< void
< DTB::translateTiming(RequestPtr req, ThreadContext *tc,
< Translation *translation, bool write)
< {
< assert(translation);
< translation->finish(translateAtomic(req, tc, write), req, tc, write);
< }
<
< ///////////////////////////////////////////////////////////////////////
< //
< // Arm ITB
< //
< ITB::ITB(const Params *p)
< : TLB(p)
< {}
<
<
< ///////////////////////////////////////////////////////////////////////
< //
< // Arm DTB
< //
< DTB::DTB(const Params *p)
< : TLB(p)
< {}
<
< ///////////////////////////////////////////////////////////////////////
< //
< // Arm UTB
< //
< UTB::UTB(const Params *p)
< : ITB(p), DTB(p)
< {}
<
366,367c313,314
< ArmISA::ITB *
< ArmITBParams::create()
---
> ArmISA::TLB *
> ArmTLBParams::create()
369c316
< return new ArmISA::ITB(this);
---
> return new ArmISA::TLB(this);
371,382d317
<
< ArmISA::DTB *
< ArmDTBParams::create()
< {
< return new ArmISA::DTB(this);
< }
<
< ArmISA::UTB *
< ArmUTBParams::create()
< {
< return new ArmISA::UTB(this);
< }