arch-arm: Correction to address size in EL2/EL3
authorAnouk Van Laer <anouk.vanlaer@arm.com>
Mon, 3 Sep 2018 10:18:31 +0000 (11:18 +0100)
committerAnouk Van Laer <anouk.vanlaer@arm.com>
Thu, 13 Sep 2018 09:05:55 +0000 (09:05 +0000)
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>

src/arch/arm/table_walker.cc

index 0668d802af96df72a569a7d045d3a03c017c08cf..66714fff8f504382241d2ee624f157cb4c3904f1 100644 (file)
@@ -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;
     }