diff options
| author | Peter Maydell | 2019-02-01 15:55:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-02-01 15:55:44 +0100 |
| commit | 08d5e3bde6b4ad32996bf69d93aa66ae43d3f3ff (patch) | |
| tree | 87d463e0b28b92101483856499fa2fe98ed54926 | |
| parent | hw/arm/mps2-tz: Add mps2-an521 model (diff) | |
| download | qemu-08d5e3bde6b4ad32996bf69d93aa66ae43d3f3ff.tar.gz qemu-08d5e3bde6b4ad32996bf69d93aa66ae43d3f3ff.tar.xz qemu-08d5e3bde6b4ad32996bf69d93aa66ae43d3f3ff.zip | |
target/arm/translate-a64: Don't underdecode system instructions
The "system instructions" and "system register move" subcategories
of "branches, exception generating and system instructions" for A64
only apply if bits [23:22] are zero; other values are currently
unallocated. Correctly UNDEF these unallocated encodings.
Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Message-id: 20190125182626.9221-2-peter.maydell@linaro.org
| -rw-r--r-- | target/arm/translate-a64.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 4d28a27c3b..e6df303e32 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -2144,7 +2144,11 @@ static void disas_b_exc_sys(DisasContext *s, uint32_t insn) break; case 0x6a: /* Exception generation / System */ if (insn & (1 << 24)) { - disas_system(s, insn); + if (extract32(insn, 22, 2) == 0) { + disas_system(s, insn); + } else { + unallocated_encoding(s); + } } else { disas_exc(s, insn); } |