Anouk Van Laer has submitted this change and it was merged. ( https://gem5-review.googlesource.com/c/public/gem5/+/12551 )

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

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 <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/12551
Maintainer: Giacomo Travaglini <[email protected]>
---
M src/arch/arm/table_walker.cc
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved



diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 0668d80..66714ff 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -819,7 +819,7 @@
               // 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 @@
                 // invalid addr if top two bytes are not all 0s
                 fault = true;
         }
-        ps = currState->tcr.ips;
+        ps = currState->tcr.ps;
         break;
     }


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

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I7e5a2f376335532a1d1c8c74d12a416617474ae2
Gerrit-Change-Number: 12551
Gerrit-PatchSet: 2
Gerrit-Owner: Anouk Van Laer <[email protected]>
Gerrit-Reviewer: Anouk Van Laer <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to