summaryrefslogtreecommitdiff
path: root/src/arch/mips/tlb.cc
diff options
context:
space:
mode:
authorDeyuan Guo <guodeyuan@tsinghua.org.cn>2012-01-12 09:59:00 -0500
committerDeyuan Guo <guodeyuan@tsinghua.org.cn>2012-01-12 09:59:00 -0500
commit31b6941a52f859cf11c3f35ec4c0ac2f2f11eb14 (patch)
treee22fe455ea5ef3751ed7bfcd09fd7ec3808170ff /src/arch/mips/tlb.cc
parenta40ec5671fa023ad09de902028bd9e9ca1f1d7da (diff)
downloadgem5-31b6941a52f859cf11c3f35ec4c0ac2f2f11eb14.tar.xz
mips: Fix bugs in faults.cc/hh and tlb.cc for MIPS_FS
Diffstat (limited to 'src/arch/mips/tlb.cc')
-rw-r--r--src/arch/mips/tlb.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index 57d8849e1..b3ed09621 100644
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -29,6 +29,8 @@
* Authors: Nathan Binkert
* Steve Reinhardt
* Jaidev Patwardhan
+ * Zhengxing Li
+ * Deyuan Guo
*/
#include <string>
@@ -350,7 +352,7 @@ TLB::translateInst(RequestPtr req, ThreadContext *tc)
}
if (Valid == false) {
- return new InvalidFault(Asid, vaddr, vpn, false);
+ return new TlbInvalidFault(Asid, vaddr, VPN, false);
} else {
// Ok, this is really a match, set paddr
Addr PAddr;
@@ -366,7 +368,7 @@ TLB::translateInst(RequestPtr req, ThreadContext *tc)
}
} else {
// Didn't find any match, return a TLB Refill Exception
- return new RefillFault(Asid, vaddr, vpn, false);
+ return new TlbRefillFault(Asid, vaddr, VPN, false);
}
}
return checkCacheability(req);
@@ -445,10 +447,10 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write)
}
if (Valid == false) {
- return new InvalidFault(Asid, vaddr, VPN, true);
+ return new TlbInvalidFault(Asid, vaddr, VPN, write);
} else {
// Ok, this is really a match, set paddr
- if (!Dirty) {
+ if (!Dirty && write) {
return new TlbModifiedFault(Asid, vaddr, VPN);
}
Addr PAddr;
@@ -464,7 +466,7 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write)
}
} else {
// Didn't find any match, return a TLB Refill Exception
- return new RefillFault(Asid, vaddr, VPN, true);
+ return new TlbRefillFault(Asid, vaddr, VPN, write);
}
}
return checkCacheability(req);