summaryrefslogtreecommitdiff
path: root/src/arch/arm/tlb.hh
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:58:16 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:58:16 -0500
commitc1e1de8d69624b1cf18a13a46e624ad5827954b7 (patch)
tree60f11a14eafcc03715c283270edb336e0a44bccc /src/arch/arm/tlb.hh
parent7de7ea3b22e16a6d489a71dc5c54ddba5a5b5a0e (diff)
downloadgem5-c1e1de8d69624b1cf18a13a46e624ad5827954b7.tar.xz
ARM: Some TLB bug fixes.
Diffstat (limited to 'src/arch/arm/tlb.hh')
-rw-r--r--src/arch/arm/tlb.hh7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh
index 7193ac0e8..c2894e5cd 100644
--- a/src/arch/arm/tlb.hh
+++ b/src/arch/arm/tlb.hh
@@ -87,7 +87,10 @@ class TLB : public BaseTLB
TlbEntry *table; // the Page Table
int size; // TLB Size
int nlu; // not last used entry (for replacement)
+
+#if FULL_SYSTEM
TableWalker *tableWalker;
+#endif
void nextnlu() { if (++nlu >= size) nlu = 0; }
TlbEntry *lookup(Addr vpn, uint8_t asn);
@@ -136,8 +139,8 @@ class TLB : public BaseTLB
void flushMva(Addr mva);
Fault trickBoxCheck(RequestPtr req, Mode mode, uint8_t domain, bool sNp);
- Fault walkTrickBoxCheck(Addr pa, Addr va, Addr sz, bool is_exec, uint8_t
- domain, bool sNp);
+ Fault walkTrickBoxCheck(Addr pa, Addr va, Addr sz, bool is_exec,
+ bool is_write, uint8_t domain, bool sNp);
void printTlb();