From: Gabe Black <gabeblack@google.com>
Date: Wed, 17 Jun 2020 01:42:48 +0000 (-0700)
Subject: mem: fixupAddr should not panic if it fails.
X-Git-Tag: v20.1.0.0~581
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b18ec642eabf49b09c2535c77a9766230428613;p=gem5.git

mem: fixupAddr should not panic if it fails.

This function should just return false in that case, and its callers
should figure out what to do. Otherwise, when calling tryReadBlob in SE
mode, a failure to read the blob makes gem5 panic instead of just
returning false.

Change-Id: I74b9cb98f595c52300d683842ece68c6031d9b85
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30376
Reviewed-by: Sandipan Das <sandipan@linux.ibm.com>
Reviewed-by: Matthew Poremba <matthew.poremba@amd.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/mem/se_translating_port_proxy.cc b/src/mem/se_translating_port_proxy.cc
index bc1153ef1..a8a42d04d 100644
--- a/src/mem/se_translating_port_proxy.cc
+++ b/src/mem/se_translating_port_proxy.cc
@@ -62,6 +62,5 @@ SETranslatingPortProxy::fixupAddr(Addr addr, BaseTLB::Mode mode) const
             return true;
         }
     }
-    panic("Page table fault when accessing virtual address %#x "
-          "during functional write.", addr);
+    return false;
 }