From: Anouk Van Laer <anouk.vanlaer@arm.com>
Date: Mon, 3 Sep 2018 10:18:31 +0000 (+0100)
Subject: arch-arm: Correction to address size in EL2/EL3
X-Git-Tag: v19.0.0.0~1801
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67f5af9a4da49cd58b35d0f521266051715d9738;p=gem5.git

arch-arm: Correction to address size in EL2/EL3

This commit corrects how the address size is
determined in EL2/EL3.  Previously, TCR_ELx.ips
was used but this should be TCR_ELx.ps.

Change-Id: I7e5a2f376335532a1d1c8c74d12a416617474ae2
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/12551
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
---

diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 0668d802a..66714fff8 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -819,7 +819,7 @@ TableWalker::processWalkAArch64()
               // invalid addr if top two bytes are not all 0s
               fault = true;
         }
-        ps = currState->tcr.ips;
+        ps = currState->tcr.ps;
         break;
       case EL3:
         switch(bits(currState->vaddr, 63,48)) {
@@ -833,7 +833,7 @@ TableWalker::processWalkAArch64()
                 // invalid addr if top two bytes are not all 0s
                 fault = true;
         }
-        ps = currState->tcr.ips;
+        ps = currState->tcr.ps;
         break;
     }