From patchwork Wed Aug 28 19:04:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11119769 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93EDC1398 for ; Wed, 28 Aug 2019 19:37:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B02722DA7 for ; Wed, 28 Aug 2019 19:37:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TACIcgiX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B02722DA7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33lG-0001EI-Vt for patchwork-qemu-devel@patchwork.kernel.org; Wed, 28 Aug 2019 15:37:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38434) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33Ga-0003qD-27 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33GX-0000TX-VL for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:59 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:38455) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33GX-0000Rz-E9 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:05:57 -0400 Received: by mail-pf1-x443.google.com with SMTP id o70so392945pfg.5 for ; Wed, 28 Aug 2019 12:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lWF0DHMsOHSMFqAdjC4WeFAcJm0Twlq0AR5wryvISQ8=; b=TACIcgiX8ImKdL0b8tY2JoEJzHK0lg+9uAjWlVwaPBAeXmuQyscMD5mM4ZUbbnOCEv 0/2a3A7LVSR4VBS8myVaf+ovAlMNjmdMxsufDQaSgTP35iASkBeAfE1s6CebkGHrdc6E q7jVAmarN7VdchWl3MTAbmo635kD+m2YTfJalfliyFVpw7Q6hH4K1BC0GFiSj5kWK782 N1eDCoCDWfbyls2Kh4sPJzx+PIW5tuSzAHwPTS3FLeGfmdUoQRtKtTBYGTmFYLdciQEY IMHhEO0cOzE9y20vfeNhoQnupAOrzaqmZpJL3fW6VVKiUErXY0Q+0TSLIYCn/Wy3vFwE E69A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lWF0DHMsOHSMFqAdjC4WeFAcJm0Twlq0AR5wryvISQ8=; b=e6XZnckBsJOnV3oFHhkjZP+C/NtyK1EgcrqkFjwuuloHytbyznfZTSF2sdPzBrCHrH g6OW3p1ZWOx+2NJyZUQ8EnaA1R3Sl69/Q0mIM7yg5QEiVVoh70CGsW9j25gvbRvbvut3 ArwqPcrDLWI9cYK8i5iJ9aCayEjMNLqZp65WuJ/WyZVgg5psb4jrWrGbb+qVfVM1H0Em tS91fTcisxuB5TzzwE0QOxX3VYRyTFwACJ4bdjearYPQxJA87B499oaQpbiYV7g4Ymqw tcCukTqxISYuFascR3hUDGtvsNeMyClYOIHOd1KdUZEUEBbdTb0a1MGlqXMB+KBgO8Yk sX5g== X-Gm-Message-State: APjAAAXr9nmgLR1dWjn13LB+M0eCFz9V/0ZQIyi9ACxFp8N4Xt8U1jmQ HyoAsz+X5olKBP4n5sM+XvhrK9uWark= X-Google-Smtp-Source: APXvYqx8L8Vjv4/Ex6OMFq4J9ZUTar0F2mn7Oe3el1vdS8F7IRgDDWYmJiEIh7aN9gopOu+/vcVhiw== X-Received: by 2002:a63:f048:: with SMTP id s8mr4721869pgj.26.1567019154922; Wed, 28 Aug 2019 12:05:54 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f27sm2967944pgm.60.2019.08.28.12.05.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:05:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:30 -0700 Message-Id: <20190828190456.30315-44-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828190456.30315-1-richard.henderson@linaro.org> References: <20190828190456.30315-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH v3 43/69] target/arm: Simplify disas_thumb2_insn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Fold away all of the cases that now just goto illegal_op, because all of their internal bits are now in decodetree. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate.c | 79 ++---------------------------------------- 1 file changed, 3 insertions(+), 76 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 05aa998640..5bb1d13a3d 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10529,9 +10529,6 @@ static bool thumb_insn_is_16bit(DisasContext *s, uint32_t pc, uint32_t insn) /* Translate a 32-bit thumb instruction. */ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) { - uint32_t rn; - int op; - /* * ARMv6-M supports a limited subset of Thumb2 instructions. * Other Thumb1 architectures allow only 32-bit @@ -10572,34 +10569,10 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) } /* fall back to legacy decoder */ - rn = (insn >> 16) & 0xf; switch ((insn >> 25) & 0xf) { case 0: case 1: case 2: case 3: /* 16-bit instructions. Should never happen. */ abort(); - case 4: - /* All in decodetree */ - goto illegal_op; - case 5: - /* All in decodetree */ - goto illegal_op; - case 13: /* Misc data processing. */ - op = ((insn >> 22) & 6) | ((insn >> 7) & 1); - if (op < 4 && (insn & 0xf000) != 0xf000) - goto illegal_op; - switch (op) { - case 0: /* Register controlled shift, in decodetree */ - case 1: /* Sign/zero extend, in decodetree */ - case 2: /* SIMD add/subtract, in decodetree */ - case 3: /* Other data processing, in decodetree */ - goto illegal_op; - case 4: case 5: - /* 32-bit multiply. Sum of absolute differences, in decodetree */ - goto illegal_op; - case 6: case 7: /* 64-bit multiply, Divide, in decodetree */ - goto illegal_op; - } - break; case 6: case 7: case 14: case 15: /* Coprocessor. */ if (arm_dc_feature(s, ARM_FEATURE_M)) { @@ -10628,6 +10601,7 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) } if (arm_dc_feature(s, ARM_FEATURE_VFP)) { + uint32_t rn = (insn >> 16) & 0xf; TCGv_i32 fptr = load_reg(s, rn); if (extract32(insn, 20, 1)) { @@ -10686,50 +10660,6 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) } } break; - case 8: case 9: case 10: case 11: - if (insn & (1 << 15)) { - /* Branches, misc control. */ - if (insn & 0x5000) { - /* Unconditional branch, in decodetree */ - goto illegal_op; - } else if (((insn >> 23) & 7) == 7) { - /* Misc control */ - if (insn & (1 << 13)) - goto illegal_op; - - if (insn & (1 << 26)) { - /* hvc, smc, in decodetree */ - goto illegal_op; - } else { - op = (insn >> 20) & 7; - switch (op) { - case 0: /* msr cpsr, in decodetree */ - case 1: /* msr spsr, in decodetree */ - goto illegal_op; - case 2: /* cps, nop-hint, in decodetree */ - goto illegal_op; - case 3: /* Special control operations, in decodetree */ - case 4: /* bxj, in decodetree */ - goto illegal_op; - case 5: /* Exception return. */ - case 6: /* MRS, in decodetree */ - case 7: /* MSR, in decodetree */ - goto illegal_op; - } - } - } else { - /* Conditional branch, in decodetree */ - goto illegal_op; - } - } else { - /* - * 0b1111_0xxx_xxxx_0xxx_xxxx_xxxx - * - Data-processing (modified immediate, plain binary immediate) - * All in decodetree. - */ - goto illegal_op; - } - break; case 12: if ((insn & 0x01100000) == 0x01000000) { if (disas_neon_ls_insn(s, insn)) { @@ -10737,14 +10667,11 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) } break; } - /* Load/store single data item, in decodetree */ goto illegal_op; default: - goto illegal_op; + illegal_op: + unallocated_encoding(s); } - return; -illegal_op: - unallocated_encoding(s); } static void disas_thumb_insn(DisasContext *s, uint32_t insn)