target/arm: Enforce M-profile VMRS/VMSR register restrictions

For M-profile before v8.1M, the only valid register for VMSR/VMRS is
the FPSCR. We have a comment that states this, but the actual logic
to forbid accesses for any other register value is missing, so we
would end up with A-profile style behaviour. Add the missing check.

Backports ede97c9d71110821738a48f88ff9f10d6bec017f
This commit is contained in:
Peter Maydell 2021-03-03 18:06:19 -05:00 committed by Lioncash
parent 2e3bd010a8
commit 4eafe42d67

View File

@ -632,7 +632,10 @@ static bool trans_VMSR_VMRS(DisasContext *s, arg_VMSR_VMRS *a)
* Accesses to R15 are UNPREDICTABLE; we choose to undef.
* (FPSCR -> r15 is a special case which writes to the PSR flags.)
*/
if (a->rt == 15 && (!a->l || a->reg != ARM_VFP_FPSCR)) {
if (a->reg != ARM_VFP_FPSCR) {
return false;
}
if (a->rt == 15 && !a->l) {
return false;
}
}