From patchwork Wed Sep 4 19:30:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 173029 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp415740ilq; Wed, 4 Sep 2019 13:40:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqykGpB7m1Vg0ge7rm8k9HbEBPnD8jR1BikXqbTLaGhUXKYl4mUELDAIyiXaUULFS8IP3HgZ X-Received: by 2002:aa7:db43:: with SMTP id n3mr205190edt.136.1567629623816; Wed, 04 Sep 2019 13:40:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567629623; cv=none; d=google.com; s=arc-20160816; b=Q6FnUVpY3IpuU9h+pIGTYkVmZUyLS+IOUmc/Pzab6CVHkGKBk6NAjDtg6xRN1fQYRQ dNh2SchWLVXJgHuGk4+nak3JYoGE6sv8Ft0p4HhTHML7GvoO/eDZ0DOMLl2Kuc7vqnBF U7ywIfGuxw/QXbHqyUGvy1P2J2ATO3ikZ7WyeCQi4LzG7K0H0jFK216h/0ZrHmt7397v +6NmghDMMJL4SW1SgJqZPRVC0IWsk+b0bmuqmjXEc3L/Nz3rrHiPa8waHCttNShjg/iv BHgNe8xO69DVZkTIUsoxcVdhQGgmLaU27koTSy8TFWu4qLtBYx+FVhedjV8SB6NIBAjD ciaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=xM5PgyYOOv0mxKWZUoslajtfwKtehkeOEG0dCYT++iA=; b=r/n7uOn2Ou3LuIc4XjPbhVjUZ3yhQatqhEOn4mIXM8ZLVtMdNZIKNsYmdv+FuAYHBs 11K20ZPP78h3b8OaLhbqs+Gk/2qfX2woyU4C8Al2gD5mHgA7t18zhZajHdoRHL+iBS3P LR2852vK4ETyxvoRWB/3h+uzjn2hEgzLyCSSoQHNqtqqCnqaCg671kOvpSCrXm0J5No1 /K7tV03KXxolJRPQlSCbmDvX8m7LXLExpyt97M8oaGxYtzFD9h1ZZNZUH6tyFOOleWNu T8jV6BK+TyiTG4rFu/tW5nyX0pnxPXh4mvzoyUCNyOKudbolz2uwKoCjnMkHJBBw362D lK3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J7HnLA4g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fy13si92085ejb.50.2019.09.04.13.40.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:40:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J7HnLA4g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c4j-0000Bv-VL for patch@linaro.org; Wed, 04 Sep 2019 16:40:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41529) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5b17-0005eO-85 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:32:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5b15-0003Pz-At for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:32:33 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:38495) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5b14-0003La-EJ for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:32:31 -0400 Received: by mail-pg1-x543.google.com with SMTP id d10so7224056pgo.5 for ; Wed, 04 Sep 2019 12:32:28 -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=xM5PgyYOOv0mxKWZUoslajtfwKtehkeOEG0dCYT++iA=; b=J7HnLA4gZUweUgFUA/RP2tEKRY1pTK13ZQ/cKyGZH6pVy6DKYVfSv1xmX4zSblG+Wr hNWjdAK55jiBqAAkoMxKpeJrRlXJ4Ej/zqriMJuP7bZENW2VEnfzV39ck1WReKJYKrEO 2zmKsid0O0dLnaIkWTWoiDWQhVUDW6ianfo7tjW3Gy3CD4zOR0tfqJs10Cv6lLdnYQHo L7f5T0L8FBTsN4Ni6HHPMOBtGQQPlNvZFDHX/FHR95BhUpoPh26EQt/f70QtBrKnsY66 0IJt1GgoIvu4olQ37vU2D+G/oLdcm2wnYbTOy7HBEUx4kKG+lyjwJyoIjfoDYM3edMPB pi0w== 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=xM5PgyYOOv0mxKWZUoslajtfwKtehkeOEG0dCYT++iA=; b=HU+D/gVHw817gRHtf3KdlIhns5x2UGvIEwj0+FVnajUrWnlW4UNjIHNHEmyzEtfD5G KlwGCxsJ1v2WzocyboffLAfOXq4+1qNU4XPKDKOsjfk/EtmNM/R3wIF1EnFr3OmoNAPC 1gaZIOyWIQzTGKJKJpBombDtWc51VNIvPsJ9NBeoVGGGJZB8CX0fl0fU+EpzkO6ZF1KL VIYzXRd727l+l+7VREub8/z0QZ3dI6LoMnxuY/WvkNJab2RZHq6LiVdQ8F80j75tvbV9 cMnII7Lb9nj8btQQzxiMIelGlhWwMWtSdCQoYDdBi2WvT9MV/2fyxYkmBkkLxJhff+fP Qzaw== X-Gm-Message-State: APjAAAV+lqgJJBomLDXD+TnbGYiCi8AUanGD6MTk3Vrc5zOfO5/T4acw BHJzW4gY2+H9n970O+sy2b7KnRvDMHw= X-Received: by 2002:a63:6d6:: with SMTP id 205mr37640948pgg.262.1567625546919; Wed, 04 Sep 2019 12:32:26 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id f6sm18999174pga.50.2019.09.04.12.32.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 12:32:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:30:58 -0700 Message-Id: <20190904193059.26202-69-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190904193059.26202-1-richard.henderson@linaro.org> References: <20190904193059.26202-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 v4 68/69] target/arm: Clean up disas_thumb_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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now that everything is converted, remove the rest of the legacy decode. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index a99a5c2eef..2412dde631 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10770,32 +10770,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)