From 67f5af9a4da49cd58b35d0f521266051715d9738 Mon Sep 17 00:00:00 2001 From: Anouk Van Laer Date: Mon, 3 Sep 2018 11:18:31 +0100 Subject: [PATCH] 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 Reviewed-on: https://gem5-review.googlesource.com/12551 Maintainer: Giacomo Travaglini --- src/arch/arm/table_walker.cc | 4 ++-- 1 file 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; } -- 2.30.2