derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-arm: Remove checkSveTrap method

Browse Source 
This is not part of the arm arm pseudocode and prevents a proper
fix of the checkSveEnabled

Change-Id: I075749095316e59e395d5b84a23db4309bdd7a92
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28767
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Giacomo Travaglini
2020-05-01 13:55:51 +01:00
parent e2a5063e5f
commit 5aff442c76
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/arch/arm/insts/static_inst.cc
View File

@@ -983,26 +983,6 @@ ArmStaticInst::sveAccessTrap(ExceptionLevel el) const
}
}
Fault
ArmStaticInst::checkSveTrap(ThreadContext *tc, CPSR cpsr) const
{
const ExceptionLevel el = (ExceptionLevel) (uint8_t) cpsr.el;
if (ArmSystem::haveVirtualization(tc) && el <= EL2) {
CPTR cptrEnCheck = tc->readMiscReg(MISCREG_CPTR_EL2);
if (cptrEnCheck.tz)
return sveAccessTrap(EL2);
}
if (ArmSystem::haveSecurity(tc)) {
CPTR cptrEnCheck = tc->readMiscReg(MISCREG_CPTR_EL3);
if (!cptrEnCheck.ez)
return sveAccessTrap(EL3);
}
return NoFault;
}
Fault
ArmStaticInst::checkSveEnabled(ThreadContext *tc, CPSR cpsr, CPACR cpacr) const
{
@@ -1011,9 +991,20 @@ ArmStaticInst::checkSveEnabled(ThreadContext *tc, CPSR cpsr, CPACR cpacr) const
(el == EL1 && !(cpacr.zen & 0x1)))
return sveAccessTrap(EL1);
return checkSveTrap(tc, cpsr);
}
if (ArmSystem::haveVirtualization(tc) && el <= EL2) {
CPTR cptr_en_check = tc->readMiscReg(MISCREG_CPTR_EL2);
if (cptr_en_check.tz)
return sveAccessTrap(EL2);
}
if (ArmSystem::haveSecurity(tc)) {
CPTR cptr_en_check = tc->readMiscReg(MISCREG_CPTR_EL3);
if (!cptr_en_check.ez)
return sveAccessTrap(EL3);
}
return NoFault;
}
static uint8_t
getRestoredITBits(ThreadContext *tc, CPSR spsr)

5
src/arch/arm/insts/static_inst.hh
View File

@@ -475,11 +475,6 @@ class ArmStaticInst : public StaticInst
*/
Fault sveAccessTrap(ExceptionLevel el) const;
/**
* Check an SVE access against CPTR_EL2 and CPTR_EL3.
*/
Fault checkSveTrap(ThreadContext *tc, CPSR cpsr) const;
/**
* Check an SVE access against CPACR_EL1, CPTR_EL2, and CPTR_EL3.
*/