From patchwork Fri Jul 26 17:50: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: 169912 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp364622ilk; Fri, 26 Jul 2019 11:02:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqyGr17szOPmqwZpwiAV2ccXzoc3PjxdPYAEPt3lfaciK+r98pkJKA/oF8XWTQlWxtGFX5lb X-Received: by 2002:a17:906:e2c2:: with SMTP id gr2mr74249502ejb.284.1564164120884; Fri, 26 Jul 2019 11:02:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564164120; cv=none; d=google.com; s=arc-20160816; b=sv8o4wZR4+cbv74ZK/wGFkhOZRMxz0dlX2Q0q5vPx77xSTGUiKGBcqfJl3hWzPkisV KOnUATDMpM5okrI3LYFNuwvyRKXvCDmRFyfgeLvNXoznnEyg90VQr96WIndx6Ys1wWgd arJAu6/NmCTSBbTQs3Qeghf+ckp8ToUe6DX9SSvJqDWaW0sd68m+lBlpxYdqFAapKuo1 7hCRlIR3VCb9p3nzmFsuHu8Wcg2cdPAM3XURjTPMPkUPVngUsHpsb2sN5lNte1yKGly2 8Eg089dmHIt9MfIet4GIhxsPJcdQLXg6Zla3DFc2Z1pNRAJQNu9T0fNpqWmCcLyRq/kU lxNA== 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=GfZoaF1PKj02fL5gI7kwlJOVMtCnQ9O6XVR81E0meI8=; b=TVRBOnSHTzZXGdBGpFYJbk8GonlwsyXuB8tvSZtZyLgkUwY0qEiJhnYL8q5BuqzZTv s0AGymX3Yy4Ooo4sTbHNzSy1CXBkbHsVsK9OCZaUDGMV3/bL0biplzHNY/fi8Ipw46kl e0cWRjSUHdeLuTMjkdFVHdSe+oSumEJ8iaqjtid7AD/8di66J45XM/emAgvm/LMnMKK3 91MOaNS2cKr7Ot29//LPjcRMvaDTrq8wNzmDuuxwtfQb99JOHFDo9PqA3axDocqL8bhu 6iCLWReVMq55ne6+rJHNxfunSbLzQp583/KvdfYF8oNXgP7jSKEAEKmMZlbXpSX5P7Ce x7eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kcq8eWPV; 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 f15si14063610edf.297.2019.07.26.11.02.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jul 2019 11:02:00 -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=kcq8eWPV; 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]:42622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4XW-0006M3-Kh for patch@linaro.org; Fri, 26 Jul 2019 14:01:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59599) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4Nu-0007Ms-Op for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:52:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr4Nr-0001Hz-HP for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:52:00 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:34806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hr4Nn-0001AI-IY for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:51:56 -0400 Received: by mail-pg1-x541.google.com with SMTP id n9so18890225pgc.1 for ; Fri, 26 Jul 2019 10:51:52 -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=GfZoaF1PKj02fL5gI7kwlJOVMtCnQ9O6XVR81E0meI8=; b=kcq8eWPVuVdKWR6yW1d/KHcSAnOLyfw8o2AyH2g3hGs0sb1lxn1A0JA91+kpnwI0CS qppjr3UV2eo+kWSsTPm3Igg9+XENJRT6omZwXtoPzln8YbZFwhvmXqShJtOs+gWUxCbI HJL5Qwclub7i4zjhVYFcV/RnUvyw7xJ7RNyViifawnoL+u/kaoFsODr9lQYgnxIZr9Ee yGVhmt9i+LHlYGxDHjym7zm4dxuy5Fbnac9Pgng2GmSzyrkwS3bmj3hDq13G9v6VJfFp K49ZJeCEvLowoCCkYWtjZwPgnRGejqDJGD6/7r4MYQgJ/f9VNIQrxVniWbS1iD2tJ7qK MLTA== 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=GfZoaF1PKj02fL5gI7kwlJOVMtCnQ9O6XVR81E0meI8=; b=eHDBEObfeFUkmJ5lHLlEIhd2uI88aTn9xDKoGAJ3B9/unYqyITTDCw5W6XNZNpOD9L kAiaoTzJbn/PofZNui7zF1oPBM0Pt0XKELsDzvdulcuGN343EU6NG1GQ7PeFo5N3iDuv cF7CVA/Ftm4kR0eCRySg4BfgjzZbj4vIFdk2Hp8bn6BmBukE8SgoIhjRTJ8tdVcm9sVr nmPAjdcLWWQuVpMl98LRKJq8hMbY49bLDx/3iojpabHMW69VeHz1Tyx8fOhXVFszMvSi wz6+ehVBZIcd5XxQtNMyGxy3nXsZTdFn5y1I78YiIbR1qk/yhktSFCjdk8M7wn46mSUm B++A== X-Gm-Message-State: APjAAAWt1u3eRVuHv3bGPnyuIiJrn8Mydctz0/Q6x69zYBOGS3gGfc1x JG3Mjs3jYF/VoTrfdcy/qOhlvDTZiX0= X-Received: by 2002:aa7:8218:: with SMTP id k24mr22628587pfi.221.1564163511718; Fri, 26 Jul 2019 10:51:51 -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.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 10:51:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 10:50:30 -0700 Message-Id: <20190726175032.6769-66-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::541 Subject: [Qemu-devel] [PATCH 65/67] 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, alex.bennee@linaro.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. 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 a8db6e9280..c2b8b86fd2 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10677,32 +10677,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)) { + gen_illegal_op(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: - gen_illegal_op(s); } static bool insn_crosses_page(CPUARMState *env, DisasContext *s)