diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-13 01:37:19 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-13 01:37:19 -0700 |
| commit | 4b2e5ebeada762e88ad97397b8db3ebf4658b70f (patch) | |
| tree | 683e78c912c2cc8c88815660a93e2e3506f537b1 /src/arch | |
| parent | 6b5ede5e3918bb8f8039007d49f1ecc1f415e9f0 (diff) | |
| download | gem5-4b2e5ebeada762e88ad97397b8db3ebf4658b70f.tar.xz | |
SPARC: Remove the last checks of FULL_SYSTEM.
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/sparc/tlb.cc | 29 | ||||
| -rw-r--r-- | src/arch/sparc/tlb.hh | 1 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc index 6e390143b..a6179e0f8 100644 --- a/src/arch/sparc/tlb.cc +++ b/src/arch/sparc/tlb.cc @@ -42,6 +42,7 @@ #include "debug/TLB.hh" #include "mem/packet_access.hh" #include "mem/request.hh" +#include "sim/full_system.hh" #include "sim/system.hh" /* @todo remove some of the magic constants. -- ali @@ -497,14 +498,14 @@ TLB::translateInst(RequestPtr req, ThreadContext *tc) if (e == NULL || !e->valid) { writeTagAccess(vaddr, context); - if (real) + if (real) { return new InstructionRealTranslationMiss; - else -#if FULL_SYSTEM - return new FastInstructionAccessMMUMiss; -#else - return new FastInstructionAccessMMUMiss(req->getVaddr()); -#endif + } else { + if (FullSystem) + return new FastInstructionAccessMMUMiss; + else + return new FastInstructionAccessMMUMiss(req->getVaddr()); + } } // were not priviledged accesing priv page @@ -709,14 +710,14 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write) if (e == NULL || !e->valid) { writeTagAccess(vaddr, context); DPRINTF(TLB, "TLB: DTB Failed to find matching TLB entry\n"); - if (real) + if (real) { return new DataRealTranslationMiss; - else -#if FULL_SYSTEM - return new FastDataAccessMMUMiss; -#else - return new FastDataAccessMMUMiss(req->getVaddr()); -#endif + } else { + if (FullSystem) + return new FastDataAccessMMUMiss; + else + return new FastDataAccessMMUMiss(req->getVaddr()); + } } diff --git a/src/arch/sparc/tlb.hh b/src/arch/sparc/tlb.hh index fe6111759..cefa38175 100644 --- a/src/arch/sparc/tlb.hh +++ b/src/arch/sparc/tlb.hh @@ -34,7 +34,6 @@ #include "arch/sparc/asi.hh" #include "arch/sparc/tlb_map.hh" #include "base/misc.hh" -#include "config/full_system.hh" #include "mem/request.hh" #include "params/SparcTLB.hh" #include "sim/fault_fwd.hh" |