summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorAnouk Van Laer <anouk.vanlaer@arm.com>2018-09-03 11:18:31 +0100
committerAnouk Van Laer <anouk.vanlaer@arm.com>2018-09-13 09:05:55 +0000
commit67f5af9a4da49cd58b35d0f521266051715d9738 (patch)
tree89c7643a2398e9758843fd046ad3b41d3897eb50 /src/arch
parentd695a3c4c4478f08673bff255250444857d48094 (diff)
downloadgem5-67f5af9a4da49cd58b35d0f521266051715d9738.tar.xz
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>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/table_walker.cc4
1 files changed, 2 insertions, 2 deletions
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;
}