arch-arm, dev-arm: Move inSecureState helper to ISA class

The helper function should be really part of the Arm ISA class

Change-Id: Ida0393a12426c8973a9b8171ec2922c2dcec9f5a
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/53268
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Giacomo Travaglini
2021-11-25 20:40:20 +00:00
parent bebed8544a
commit adaab745a3
5 changed files with 33 additions and 35 deletions

View File

@@ -2333,13 +2333,7 @@ Gicv3CPUInterface::groupEnabled(Gicv3::GroupId group) const
bool
Gicv3CPUInterface::inSecureState() const
{
if (!gic->getSystem()->has(ArmExtension::SECURITY)) {
return false;
}
CPSR cpsr = isa->readMiscRegNoEffect(MISCREG_CPSR);
SCR scr = isa->readMiscRegNoEffect(MISCREG_SCR);
return gem5::inSecureState(scr, cpsr);
return isa->inSecureState();
}
int