@@ -10650,32 +10650,9 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn)
static void disas_thumb_insn(DisasContext *s, uint32_t insn)
{
- if (disas_t16(s, insn)) {
- return;
+ if (!disas_t16(s, insn)) {
+ unallocated_encoding(s);
}
- /* fall back to legacy decoder */
-
- switch (insn >> 12) {
- case 0: case 1: /* add/sub (3reg, 2reg imm), shift imm; in decodetree */
- case 2: case 3: /* add, sub, cmp, mov (reg, imm), in decodetree */
- case 4: /* ldr lit, data proc (2reg), data proc ext, bx; in decodetree */
- case 5: /* load/store register offset, in decodetree */
- case 6: /* load/store word immediate offset, in decodetree */
- case 7: /* load/store byte immediate offset, in decodetree */
- case 8: /* load/store halfword immediate offset, in decodetree */
- case 9: /* load/store from stack, in decodetree */
- case 10: /* add PC/SP (immediate), in decodetree */
- case 11: /* misc, in decodetree */
- case 12: /* load/store multiple, in decodetree */
- case 13: /* conditional branch or swi, in decodetree */
- case 14:
- case 15:
- /* branches, in decodetree */
- goto illegal_op;
- }
- return;
-illegal_op:
- unallocated_encoding(s);
}
static bool insn_crosses_page(CPUARMState *env, DisasContext *s)
Now that everything is converted, remove the rest of the legacy decode. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/arm/translate.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-)