Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/25364 )
Change subject: arch-arm: Add used attribute to pauth_helpers asserts
......................................................................
arch-arm: Add used attribute to pauth_helpers asserts
Adding M5_VAR_USED attribute to variables in pauth_helpers so that
gem5.fast builds.
Change-Id: I45dd70ea2e921f7ce68ea52147abdd40da99f37e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/25364
Reviewed-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/arm/pauth_helpers.cc
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/pauth_helpers.cc b/src/arch/arm/pauth_helpers.cc
index 892a414..1c83d77 100644
--- a/src/arch/arm/pauth_helpers.cc
+++ b/src/arch/arm/pauth_helpers.cc
@@ -113,9 +113,8 @@
Fault
ArmISA::trapPACUse(ThreadContext *tc, ExceptionLevel target_el)
{
- ExceptionLevel curr_el = currEL(tc);
assert(ArmSystem::haveEL(tc, target_el) &&
- target_el != EL0 && (target_el >= curr_el));
+ target_el != EL0 && (target_el >= currEL(tc)));
switch (target_el) {
case EL2:
@@ -149,7 +148,7 @@
if (upperAndLowerRange(tc, el)) {
ExceptionLevel s1_el = s1TranslationRegime(tc, el);
assert (s1_el == EL1 || s1_el == EL2);
- if (s1TranslationRegime(tc, el) == EL1) {
+ if (s1_el == EL1) {
// EL1 translation regime registers
TCR tcr = tc->readMiscReg(MISCREG_TCR_EL1);
if (data) {
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/25364
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I45dd70ea2e921f7ce68ea52147abdd40da99f37e
Gerrit-Change-Number: 25364
Gerrit-PatchSet: 4
Gerrit-Owner: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
