From: Min Kyu Jeong <minkyu.jeong@arm.com>
Date: Mon, 23 Aug 2010 16:18:39 +0000 (-0500)
Subject: ARM: Finish the timing translation when taking a fault.
X-Git-Tag: stable_2012_02_02~916
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d4e83a400189ef91a5b0f444c9c99d443cc1a251;p=gem5.git

ARM: Finish the timing translation when taking a fault.
---

diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 468c19f75..9e792845c 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -145,9 +145,15 @@ TableWalker::walk(RequestPtr _req, ThreadContext *_tc, uint8_t _cid, TLB::Mode _
     f = tlb->walkTrickBoxCheck(l1desc_addr, currState->vaddr, sizeof(uint32_t),
             currState->isFetch, currState->isWrite, 0, true);
     if (f) {
-       currState->tc = NULL;
-       currState->req = NULL;
-       return f;
+        if (currState->timing) {
+            currState->transState->finish(f, currState->req,
+                                          currState->tc, currState->mode);
+            currState = NULL;
+        } else {
+            currState->tc = NULL;
+            currState->req = NULL;
+        }
+        return f;
     }
 
     if (currState->timing) {