[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/7] target/arm: Tidy up disas_arm_insn()
From: |
Peter Maydell |
Subject: |
[PATCH 4/7] target/arm: Tidy up disas_arm_insn() |
Date: |
Mon, 3 Aug 2020 12:18:46 +0100 |
The only thing left in the "legacy decoder" is the handling
of disas_xscale_insn(), and we can simplify the code.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/translate.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/target/arm/translate.c b/target/arm/translate.c
index b1be4cb9d60..639fe121a2e 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -8342,26 +8342,18 @@ static void disas_arm_insn(DisasContext *s, unsigned
int insn)
return;
}
/* fall back to legacy decoder */
-
- switch ((insn >> 24) & 0xf) {
- case 0xc:
- case 0xd:
- case 0xe:
- {
- /* First check for coprocessor space used for XScale/iwMMXt insns */
- int cpnum = (insn >> 8) & 0xf;
-
- if (arm_dc_feature(s, ARM_FEATURE_XSCALE) && (cpnum < 2)) {
+ /* TODO: convert xscale/iwmmxt decoder to decodetree ?? */
+ if (arm_dc_feature(s, ARM_FEATURE_XSCALE)) {
+ if (((insn & 0x0c000e00) == 0x0c000000)
+ && ((insn & 0x03000000) != 0x03000000)) {
+ /* Coprocessor insn, coprocessor 0 or 1 */
disas_xscale_insn(s, insn);
- break;
+ return;
}
- /* fall through */
- }
- default:
- illegal_op:
- unallocated_encoding(s);
- break;
}
+
+illegal_op:
+ unallocated_encoding(s);
}
static bool thumb_insn_is_16bit(DisasContext *s, uint32_t pc, uint32_t insn)
--
2.20.1
- [PATCH 0/7] target/arm: copro decode cleanup, Peter Maydell, 2020/08/03
- [PATCH 1/7] target/arm: Pull handling of XScale insns out of disas_coproc_insn(), Peter Maydell, 2020/08/03
- [PATCH 2/7] target/arm: Separate decode from handling of coproc insns, Peter Maydell, 2020/08/03
- [PATCH 3/7] target/arm: Convert A32 coprocessor insns to decodetree, Peter Maydell, 2020/08/03
- [PATCH 4/7] target/arm: Tidy up disas_arm_insn(),
Peter Maydell <=
- [PATCH 5/7] target/arm: Do M-profile NOCP checks early and via decodetree, Peter Maydell, 2020/08/03
- [PATCH 6/7] target/arm: Convert T32 coprocessor insns to decodetree, Peter Maydell, 2020/08/03
- [PATCH 7/7] target/arm: Remove ARCH macro, Peter Maydell, 2020/08/03