From a93d01c61d12f122a32290ca4d9b000bfbc7c8da Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 15 Jun 2020 12:52:46 -0400 Subject: [PATCH] target/arm: Use a non-overlapping group for misc control The miscellaneous control instructions are mutually exclusive within the t32 decode sub-group. Backports commit d6084fba47bb9aef79775c1102d4b647eb58c365 from qemu --- qemu/target/arm/t32.decode | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/target/arm/t32.decode b/qemu/target/arm/t32.decode index c63082fc..c21a988f 100644 --- a/qemu/target/arm/t32.decode +++ b/qemu/target/arm/t32.decode @@ -312,13 +312,13 @@ CLZ 1111 1010 1011 ---- 1111 .... 1000 .... @rdm &cps # Miscellaneous control - { + [ CLREX 1111 0011 1011 1111 1000 1111 0010 1111 DSB 1111 0011 1011 1111 1000 1111 0100 ---- DMB 1111 0011 1011 1111 1000 1111 0101 ---- ISB 1111 0011 1011 1111 1000 1111 0110 ---- SB 1111 0011 1011 1111 1000 1111 0111 0000 - } + ] # Note that the v7m insn overlaps both the normal and banked insn. {