From 80248fecb658a39f878d607d1ce9bc2a9943adec Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Sun, 3 Feb 2019 17:35:07 -0500 Subject: [PATCH] target/arm/translate-a64: Don't underdecode PRFM The PRFM prefetch insn in the load/store with imm9 encodings requires idx field 0b00; we were underdecoding this by only checking !is_unpriv (which is equivalent to idx != 2). Correctly UNDEF the unallocated encodings where idx == 0b01 and 0b11 as well as 0b10. Backports commit a80c4256543987ca88407349ee012a673a10a2ae from qemu --- qemu/target/arm/translate-a64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target/arm/translate-a64.c b/qemu/target/arm/translate-a64.c index 52b35173..b9118981 100644 --- a/qemu/target/arm/translate-a64.c +++ b/qemu/target/arm/translate-a64.c @@ -2871,7 +2871,7 @@ static void disas_ldst_reg_imm9(DisasContext *s, uint32_t insn, } else { if (size == 3 && opc == 2) { /* PRFM - prefetch */ - if (is_unpriv) { + if (idx != 0) { unallocated_encoding(s); return; }