diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-09-19 06:17:20 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-09-19 06:17:20 -0700 |
| commit | 59d7fc6b26f2cbbed09476499f04a25f886da984 (patch) | |
| tree | ca704376c8fd55a3631f91ef704059b87b8b01f9 /src/arch/mips/tlb.cc | |
| parent | 717d4ae930a64226d909e97fc672dccfa6a19ca2 (diff) | |
| download | gem5-59d7fc6b26f2cbbed09476499f04a25f886da984.tar.xz | |
MIPS: Consolidate the two AddressErrorFault variants.
Diffstat (limited to 'src/arch/mips/tlb.cc')
| -rw-r--r-- | src/arch/mips/tlb.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc index f379b9919..1336ee7d0 100644 --- a/src/arch/mips/tlb.cc +++ b/src/arch/mips/tlb.cc @@ -313,7 +313,7 @@ TLB::translateInst(RequestPtr req, ThreadContext *tc) req->setPaddr(KSeg02Phys(vaddr)); if (getOperatingMode(tc->readMiscReg(MISCREG_STATUS)) != mode_kernel || misaligned) { - return new AddressErrorFault(vaddr); + return new AddressErrorFault(vaddr, false); } } else if(IsKSeg1(vaddr)) { // Address will not be translated through TLB, set response, and go! @@ -333,7 +333,7 @@ TLB::translateInst(RequestPtr req, ThreadContext *tc) uint8_t Asid = req->getAsid(); if (misaligned) { // Unaligned address! - return new AddressErrorFault(vaddr); + return new AddressErrorFault(vaddr, false); } PTE *pte = lookup(VPN,Asid); if (pte != NULL) { @@ -387,10 +387,7 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write) if (req->getVaddr() & (req->getSize() - 1)) { DPRINTF(TLB, "Alignment Fault on %#x, size = %d", req->getVaddr(), req->getSize()); - if (write) - return new StoreAddressErrorFault(req->getVaddr()); - else - return new AddressErrorFault(req->getVaddr()); + return new AddressErrorFault(req->getVaddr(), write); } @@ -411,7 +408,7 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write) req->setPaddr(KSeg02Phys(vaddr)); if (getOperatingMode(tc->readMiscReg(MISCREG_STATUS)) != mode_kernel || misaligned) { - return new StoreAddressErrorFault(vaddr); + return new AddressErrorFault(vaddr, true); } } else if(IsKSeg1(vaddr)) { // Address will not be translated through TLB, set response, and go! @@ -429,7 +426,7 @@ TLB::translateData(RequestPtr req, ThreadContext *tc, bool write) uint8_t Asid = req->getAsid(); PTE *pte = lookup(VPN, Asid); if (misaligned) { - return new StoreAddressErrorFault(vaddr); + return new AddressErrorFault(vaddr, true); } if (pte != NULL) { // Ok, found something |