From 50f1570352a036aed49a078b17fa1af54d0a1787 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Tue, 21 Apr 2009 15:40:25 -0700 Subject: arm: Unify the ARM tlb. We forgot about this when we did the rest. This code compiles, but there are no tests still --- src/arch/arm/tlb.hh | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) (limited to 'src/arch/arm/tlb.hh') diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh index fea317ef3..d2c035b31 100644 --- a/src/arch/arm/tlb.hh +++ b/src/arch/arm/tlb.hh @@ -43,8 +43,7 @@ #include "arch/arm/pagetable.hh" #include "base/statistics.hh" #include "mem/request.hh" -#include "params/ArmDTB.hh" -#include "params/ArmITB.hh" +#include "params/ArmTLB.hh" #include "sim/faults.hh" #include "sim/tlb.hh" @@ -135,6 +134,10 @@ class TLB : public BaseTLB static Fault checkCacheability(RequestPtr &req); + Fault translateAtomic(RequestPtr req, ThreadContext *tc, Mode mode); + void translateTiming(RequestPtr req, ThreadContext *tc, + Translation *translation, Mode mode); + // Checkpointing void serialize(std::ostream &os); void unserialize(Checkpoint *cp, const std::string §ion); @@ -142,36 +145,6 @@ class TLB : public BaseTLB void regStats(); }; -class ITB : public TLB -{ - public: - typedef ArmTLBParams Params; - ITB(const Params *p); - - Fault translateAtomic(RequestPtr req, ThreadContext *tc); - void translateTiming(RequestPtr req, ThreadContext *tc, - Translation *translation); -}; - -class DTB : public TLB -{ - public: - typedef ArmTLBParams Params; - DTB(const Params *p); - - Fault translateAtomic(RequestPtr req, ThreadContext *tc, bool write); - void translateTiming(RequestPtr req, ThreadContext *tc, - Translation *translation, bool write); -}; - -class UTB : public ITB, public DTB -{ - public: - typedef ArmTLBParams Params; - UTB(const Params *p); - -}; - -} +/* namespace ArmISA */ } #endif // __ARCH_ARM_TLB_HH__ -- cgit v1.2.3