target/arm: Convert Unallocated memory hint

Backports commit 610f4e1764aa2049fa1711893ff62faf777813f3 from qemu
This commit is contained in:
Richard Henderson 2019-11-20 11:46:47 -05:00 committed by Lioncash
parent 4593c67444
commit e6b4480ca9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 8 additions and 8 deletions

View file

@ -64,3 +64,11 @@ PLI 1111 0100 -101 ---- 1111 ---- ---- ---- # (imm, lit) 7
PLD 1111 0111 -101 ---- 1111 ----- -- 0 ---- # (register) 5te
PLDW 1111 0111 -001 ---- 1111 ----- -- 0 ---- # (register) 7mp
PLI 1111 0110 -101 ---- 1111 ----- -- 0 ---- # (register) 7
# Unallocated memory hints
#
# Since these are v7MP nops, and PLDW is v7MP and implemented as nop,
# (ab)use the PLDW helper.
PLDW 1111 0100 -001 ---- ---- ---- ---- ----
PLDW 1111 0110 -001 ---- ---- ---- ---0 ----

View file

@ -10681,14 +10681,6 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
}
return;
}
if (((insn & 0x0f700000) == 0x04100000) ||
((insn & 0x0f700010) == 0x06100000)) {
if (!arm_dc_feature(s, ARM_FEATURE_V7MP)) {
goto illegal_op;
}
return; /* v7MP: Unallocated memory hint: must NOP */
}
if ((insn & 0x0e000f00) == 0x0c000100) {
if (arm_dc_feature(s, ARM_FEATURE_IWMMXT)) {
/* iWMMXt register transfer. */