From patchwork Wed Aug 28 19:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172478 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1241884ily; Wed, 28 Aug 2019 13:12:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyagjCpcTUAv+gyRGqMsP1FRqNtgPAMhqAHnZxMrwLuI6Mqut4iHXC4V70MbdLnrv8KI1qj X-Received: by 2002:a05:620a:13d1:: with SMTP id g17mr5686441qkl.499.1567023157798; Wed, 28 Aug 2019 13:12:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567023157; cv=none; d=google.com; s=arc-20160816; b=yEJm1rRKZpSWG3GKoH8ltkfYv4Hyko4G3ownGOqoDMdCd6s9x3r2ViSRhJ5O6DjnZF 2H9tEFuAsI1st8CWGcg3vMhy+er+zu6sp3C36TOPmQ94/5DgTK1xZ3lZXLXX/zGi6z6E M1StUH/XjQtnzqEUYPWVH/I1HnbhFHDWmGr0y12TIUPqAJLT/690aQdgom3QPx1D9ehw Simconoz4yF8bXLuD41EA9RLaMSa8Ia9zdHVuH2A8p74UJdGlmGLHK99rgHQmeWZkJx2 VZn4R7Xl47kdmSB96q0p+LHL1ItoemayF2aK0mcKLlo7ZwdAv34jCL/urmM6d0gx2zBo LE/A== 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=Lx+8GdSOm4AFV3gPcXa/Gz1WHaL2tglqVzn+6pptTZA=; b=RjSaDfKxXu/8swJkqTy2uCrv1pCivPF4Lvk1j2i02vhYT8crJEaqy5nxaYndCTlnlr gl/c6d8iFW9zUzukTx3oogUDkgHXT7z5xqm931+0Is0Sr2jIXE7LN76Pz77mwx9xM7S4 +INiaLFO1YbyJc6Vd3j5feFM4kX8L2k/BlBsXzONPh18dP2d/WZpMYWm2hTJTPq5rqdG MRC1xTH17ELP/unY0X/IY2jGkFycTuBl5qhtOjJguc4YPueJzo+Lf/JHeeicdt5GsZkc C9rWPpkkfC4bXmW/vnFQ2CzGFlL7WdSLBBQXo229FDLcOkpMJoto2DEK7vWu3RhzLMMU 9nGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EwFti39e; 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 j24si162464qtc.232.2019.08.28.13.12.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 13:12:37 -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=EwFti39e; 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]:42068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i34J2-0002y4-Us for patch@linaro.org; Wed, 28 Aug 2019 16:12:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39034) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33H3-00044u-7f for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33H0-0000pC-TA for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:28 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:39459) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33H0-0000mv-Dt for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:26 -0400 Received: by mail-pf1-x435.google.com with SMTP id y200so391139pfb.6 for ; Wed, 28 Aug 2019 12:06:24 -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=Lx+8GdSOm4AFV3gPcXa/Gz1WHaL2tglqVzn+6pptTZA=; b=EwFti39eQXHd8pj+7tYzrtWdwD06ZkjllFuQS6SE/1jq89J3rlwXZBViLNyNVTSfx+ rnMNhskIAtiyZKBufQMiCXj6GD2OXMqNybObMG4TZNpxyPc9Byd/KB+WBLHY9uBil2xv Pnvpp39xJym8N5egXpnaKYRfvHx3EchvNodm0YseCXClxud0tX2fKiz7wcOOYLQF4s0u 4f8wg06d/XSddypNw0DSpLGhALIF4FR6JwBMrQCFVBadlmnzV459sNklCekm+oeZKaLC iVbNtDNXpXKf8SHnYMdwm17bnCISmmYDm2RxVFfPXnsZfhQRPY52ZrtX8HAc+uZ97e6f bXAw== 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=Lx+8GdSOm4AFV3gPcXa/Gz1WHaL2tglqVzn+6pptTZA=; b=Rozzib62CIyEDPWx5WHRGD8dvfRuTxvctBVmpTkErUouMDtzvpG8+ss0DpmWq0kdun GecgYQ3a0LV2KZVNU9CLBS5uMhgm60NvpEgSDwfZYjy2AucdvfxyKVoCvvjMc/O0mGgK JL47GcSPyDPn50i/XoIQFcLl0zAAomy1+NH0xrKoe5GF2uiMtjyZNRX/GUItLg9S7Dni e8pz8gsTfY37Zc5lroMH4j0dqU+bB4GeqWd2Hj5WN8ThV8tbhqY8Vv9synvEtoUAJrjJ Unvdhpfc1HkvbGcHp88IzQu76eiiJ/J/Lp2+bu6Is6ShSZmhq2ZRrnkmhfSP3oCTyEWN D/jQ== X-Gm-Message-State: APjAAAVvy1dTLtQNeRXJkKl6vDjBfaSKDrMWBgrpl36LMYFumJe4+WDr Et0mM6JY0Ic+JwYatYVIFWqxHTOdNhw= X-Received: by 2002:a62:1858:: with SMTP id 85mr6656045pfy.120.1567019183524; Wed, 28 Aug 2019 12:06:23 -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.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:06:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:53 -0700 Message-Id: <20190828190456.30315-67-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::435 Subject: [Qemu-devel] [PATCH v3 66/69] target/arm: Convert T16, Unconditional branch 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" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate.c | 9 ++------- target/arm/t16.decode | 6 ++++++ 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index fe9f7e4f42..574a791461 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10713,7 +10713,6 @@ static void disas_thumb2_insn(DisasContext *s, uint32_t insn) static void disas_thumb_insn(DisasContext *s, uint32_t insn) { - uint32_t val; int32_t offset; TCGv_i32 tmp; TCGv_i32 tmp2; @@ -10757,12 +10756,8 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) gen_bx(s, tmp); break; } - /* unconditional branch */ - val = read_pc(s); - offset = ((int32_t)insn << 21) >> 21; - val += offset << 1; - gen_jmp(s, val); - break; + /* unconditional branch, in decodetree */ + goto illegal_op; case 15: /* thumb_insn_is_16bit() ensures we can't get here for diff --git a/target/arm/t16.decode b/target/arm/t16.decode index 0b4da411e0..a4c89dba61 100644 --- a/target/arm/t16.decode +++ b/target/arm/t16.decode @@ -266,3 +266,9 @@ LDM_t16 1011 110 ......... \ SVC 1101 1111 imm:8 &i B_cond_thumb 1101 cond:4 ........ &ci imm=%imm8_0x2 } + +# Unconditional Branch + +%imm11_0x2 0:s11 !function=times_2 + +B 11100 ........... &i imm=%imm11_0x2