Giacomo Travaglini merged this change by Chuan Zhu. ( https://gem5-review.googlesource.com/7983 )

Change subject: arch-arm: Fix syntax error in TLB::getResultTe
......................................................................

arch-arm: Fix syntax error in TLB::getResultTe

The patch fixes one syntax error in TLB::getResultTe

Change-Id: I31a72a52d5c03f43929a69ca1be61d9c20e76f5b
Reviewed-by: Nikos Nikoleris <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/7983
Maintainer: Andreas Sandberg <[email protected]>
---
M src/arch/arm/tlb.cc
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
  Nikos Nikoleris: Looks good to me, approved



diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index aeaf60b..5f104e9 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013, 2016-2017 ARM Limited
+ * Copyright (c) 2010-2013, 2016-2018 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -1473,8 +1473,8 @@
fault = getTE(&s2Te, req, tc, mode, translation, timing, functional,
                       isSecure, curTranType);
         // Check permissions of stage 2
-        if ((s2Te != NULL) && (fault = NoFault)) {
-            if(aarch64)
+        if ((s2Te != NULL) && (fault == NoFault)) {
+            if (aarch64)
                 fault = checkPermissions64(s2Te, req, mode, tc);
             else
                 fault = checkPermissions(s2Te, req, mode);

--
To view, visit https://gem5-review.googlesource.com/7983
To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I31a72a52d5c03f43929a69ca1be61d9c20e76f5b
Gerrit-Change-Number: 7983
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to