diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2009-04-08 22:21:27 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2009-04-08 22:21:27 -0700 |
commit | 7b5a96f06b530db35637aca6f9d0f7a2ddfa6e60 (patch) | |
tree | 4c212f665de2628eac6f84d389de7a79b6d0b933 /src/arch/mips/tlb.hh | |
parent | 08043c777f1f05f5e14581950013461f328965be (diff) | |
download | gem5-7b5a96f06b530db35637aca6f9d0f7a2ddfa6e60.tar.xz |
tlb: Don't separate the TLB classes into an instruction TLB and a data TLB
Diffstat (limited to 'src/arch/mips/tlb.hh')
-rw-r--r-- | src/arch/mips/tlb.hh | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh index dc0babf9a..fa2ed3f85 100644 --- a/src/arch/mips/tlb.hh +++ b/src/arch/mips/tlb.hh @@ -43,8 +43,7 @@ #include "arch/mips/pagetable.hh" #include "base/statistics.hh" #include "mem/request.hh" -#include "params/MipsDTB.hh" -#include "params/MipsITB.hh" +#include "params/MipsTLB.hh" #include "sim/faults.hh" #include "sim/tlb.hh" #include "sim/sim_object.hh" @@ -138,34 +137,15 @@ class TLB : public BaseTLB void unserialize(Checkpoint *cp, const std::string §ion); void regStats(); -}; - -class ITB : public TLB { - public: - typedef MipsTLBParams 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 MipsTLBParams Params; - DTB(const Params *p); Fault translateAtomic(RequestPtr req, ThreadContext *tc, - bool write = false); + bool write=false, bool execute=false); void translateTiming(RequestPtr req, ThreadContext *tc, - Translation *translation, bool write = false); -}; - -class UTB : public ITB, public DTB { - public: - typedef MipsTLBParams Params; - UTB(const Params *p); + Translation *translation, bool write=false, bool execute=false); + private: + Fault translateInst(RequestPtr req, ThreadContext *tc); + Fault translateData(RequestPtr req, ThreadContext *tc, bool write); }; } |