From patchwork Fri Jul 26 17:50:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11061683 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A7AD1399 for ; Fri, 26 Jul 2019 18:01:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69E8928958 for ; Fri, 26 Jul 2019 18:01:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E0EA28A30; Fri, 26 Jul 2019 18:01:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E205328958 for ; Fri, 26 Jul 2019 18:01:34 +0000 (UTC) Received: from localhost ([::1]:42610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4X7-0005Go-Ec for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 14:01:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59232) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4Nj-0006SG-6o for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr4Na-000133-GA for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:46 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:35148) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hr4NK-0000Zw-4h for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:41 -0400 Received: by mail-pg1-x543.google.com with SMTP id s1so18806272pgr.2 for ; Fri, 26 Jul 2019 10:51:26 -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=j/Y5KQrISdOhV+y6GL73HUL9WgurT5sljbcK6vWGUPQ=; b=DqavtkYf6IoaO0cuL4mNyqfvDRLI7vMm1q5C6uakUbdR1LJVwBUK/A2/zSn7JYdFIb JmuV2mTZz/QPX5By/YKKcQKnFqY3PjyOTmI5seSXG6bqSEgDCc4o9W1A/plSu+LFK30X 9Py9W/i1te/HU0WXoOWP4ld3bcytoz+Zki97kJvPSivIb7aYPZDSJYP7Jm3SqRjtEo5m KJM1qmBiC9XJG96QyNea+d98JS0jgGzaebqJA2gUR7Vxen9LlMfgULsw7Mmv+jT5pJff PF4SvbnedhlcXh2MXHiaZ53KbsHcggYXBb7XfPAFyiaG18nbmLisYo1Hymbw1mokXu4z ZZ/A== 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=j/Y5KQrISdOhV+y6GL73HUL9WgurT5sljbcK6vWGUPQ=; b=qvs4/xU8tGk2rFh8CPX3LQfEQrZVWlfyX2+qz8waiEu+NUEOd12zDEFUPK/37nesol va9Gt1J3lG4uEFnEPZxN6CcPxwBlKsTn29rVv89uT21ac2gw11/Y8cx2F+rjk8IhLWFC BIEMuxo8vXU11jRcNohrsvytMAaLOSx9q8+JQY8R6klQMXruR9NpOr/f4hODsnzyWj0H ZAueEq9nko1+otlPqwoCmBybvN3MDG1xzM02ZTdplO2+D2vSKVzlNehfU07F0sIocwhd DLOi/Df9tDQ/pb/qdq45kfCZMGmFh2Rr4/kcs683qk6l1Pihn9/LJp4Fc6qMKZaH8Ymf FRjA== X-Gm-Message-State: APjAAAVfVL2PPZAku7ecUkHj7wGe0dweq6iKVUGqE6ecsgNJjjtnHosv 3GiGZDEDPKJ41klv/sqvSdAcg3iYR9g= X-Google-Smtp-Source: APXvYqzGO6rhFYHOHjFAKRUdLnTPf6Y04Nw53cjQHF/gSr0NKVcgu9AL/WMtNTI3HuyP771840Dyxw== X-Received: by 2002:a63:2c8:: with SMTP id 191mr91127952pgc.139.1564163482963; Fri, 26 Jul 2019 10:51:22 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id o24sm104287919pfp.135.2019.07.26.10.51.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 10:51:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 10:50:06 -0700 Message-Id: <20190726175032.6769-42-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726175032.6769-1-richard.henderson@linaro.org> References: <20190726175032.6769-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::543 Subject: [Qemu-devel] [PATCH 41/67] 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, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Fold away all of the cases that now just goto illegal_op, because all of their internal bits are now in decodetree. Signed-off-by: Richard Henderson --- target/arm/translate.c | 78 ++---------------------------------------- 1 file changed, 3 insertions(+), 75 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index a750a2c092..836b3752f7 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10442,9 +10442,6 @@ static bool thumb_insn_is_16bit(DisasContext *s, 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 @@ -10485,34 +10482,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)) { @@ -10541,6 +10514,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)) { @@ -10599,49 +10573,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 */ - case 5: /* eret, in decodetree */ - 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)) { @@ -10649,14 +10580,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: + gen_illegal_op(s); } - return; -illegal_op: - gen_illegal_op(s); } static void disas_thumb_insn(DisasContext *s, uint32_t insn)