From patchwork Wed Sep 4 19:30:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 173026 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp412704ilq; Wed, 4 Sep 2019 13:37:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXALmg3iviSZ/t/YgR+Px6OCvK0Xn38g53XGf9FbrRfy+vW+g4I0pCJbkaMjnMtUN+vZqy X-Received: by 2002:a05:6402:160d:: with SMTP id f13mr144663edv.227.1567629428567; Wed, 04 Sep 2019 13:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567629428; cv=none; d=google.com; s=arc-20160816; b=SRYcw7y9sFcjlmIV7zuLJIhMI+SjXNEBhcdy8wvEOEyipw2nqZkUXR+EC/ln9ZEmP/ m78MLuzad0/wST2Y6ExSNnkUHzyJt2N67Iou+CQeUksbraa6E+UmHc50DJG7IcSa7XcF thAeb6znXk+ZswMWysWSVhFy8fBjWbD16EG0xzhgXU/rOVG5Mh8ojeI7KXSvjRed7vH3 DjkJ2NVANtRmcf0+CWgCVGOR8MiIJQbUzQTvw+wZpS+1Q9TVYD05ACpvXlc+avcpFCtM cyF6xubE7CWXM7Ai7XMjPGN6V/nclixkGQNZtcX7v5yUPv+6ip0uJ/wfdw0e3C30sgI2 rLgQ== 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=ubjb98obYB0wcr0PkhZrvGjTKBKP700KuYx4LrhjRCk=; b=Jg7A7ia/BAEMtesrjKNCWrmWGuVNNysF1HHok4rAwP9zefftMFb+W/0+5W9dfUrZmG V7nY3/YkoocLl0DLxQ7OxFF/3OGItcoRwiYi5TLNQBxYFjdwUfMIk3vOxM+KYKbsC9tA Jjzu8jd8hiN2nFG1ZQYzNpAdrv5yXKg+zK46y7FNCDPCeeO+PcTRu/REzhjDKhmeAes6 3vyH6Xdx/QQcL+WWI3QvEUKjLC19GOAqGc5eArqHScmXruNcjDnQwBNRJCAPIyLy/MVG Fi5NlMzSlwQ0JzBBd2HW0+xteRN5A9GqjqL7dRc8pFdLfvdTgq9a8OBO/Ye+OplW9DYC EdJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fnGC5dr5; 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 y19si10114199edc.363.2019.09.04.13.37.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:37:08 -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=fnGC5dr5; 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]:39064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c1b-0005wp-Bx for patch@linaro.org; Wed, 04 Sep 2019 16:37:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41501) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5b15-0005dr-Bp for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5b13-0003N7-BP for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:32:30 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:44811) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5b11-0003J3-9w for qemu-devel@nongnu.org; Wed, 04 Sep 2019 15:32:29 -0400 Received: by mail-pf1-x435.google.com with SMTP id q21so8881001pfn.11 for ; Wed, 04 Sep 2019 12:32: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=ubjb98obYB0wcr0PkhZrvGjTKBKP700KuYx4LrhjRCk=; b=fnGC5dr5sDsjett47yIJEN9Of0JrUcyoeppmr5Qh4LB6cNBWhsckqvU5cTE8lpAHEx r8Ih/AEiuDrykNM3qjQWxFWR+jjJaLlsjxe9mg1TpwaVsT+RnZl9huleOuQSAG835P79 d/C2lrMy6NecLtog9sLd5wE6f7q4Gn2O/7ukzRdFtk7Fv54Pts+pFWsnar2VZ0ESCn1Y hei9Pgi0PcyBK4QHejEVrCVuOs+5re1vjz8E42CHCLQRvE7jXnBOvgH1sISdNxGI6hyw TcS9ct4nuGS6ZuqPUww/QbokyjRXMtnjhQ7/Z1CxLsP5FXm73LahSLKzsgvasxXST37I U79g== 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=ubjb98obYB0wcr0PkhZrvGjTKBKP700KuYx4LrhjRCk=; b=dqXP83yZQKTgevfEVDVVHHCUElCN+ZpJ11Y8EyOlWsL6+xQe1CDrcQGsQ11sGe2RYI VGA8VPtSJBLI6JvrH5TVdLAFe914m1oOKxvaiu0xnAgsBIh378snfv+v7uecTr/qqNhA Fum5j2aS/MYEuQZxA2KGvNzzVAmB669pbCKtRXmIkJ0qZamZqdHuCu4kAcozsetIkWF2 hreKiaINWdLE9R72Ri0l+Bx5KnIMHa5JnuzocdjdqddJoy6vMl4PRpRfSYP6d0O5m+Cj /M4weMCraVyeCerSHmae9uz6ZpwoGE83Olyhgc3qIGL3n0RU89vJjR5nDWe6U08ytJCI lABg== X-Gm-Message-State: APjAAAUepV2WpSrHkJLKF24Ysdex7ZBg+d5jtTe+hTFteq+g/ykGW0RW qXVRaDwW3mDBzcBbTEcUOGCmN7MJ2Zo= X-Received: by 2002:a63:6f8f:: with SMTP id k137mr36325209pgc.90.1567625544802; Wed, 04 Sep 2019 12:32:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 12:32:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:30:56 -0700 Message-Id: <20190904193059.26202-67-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::435 Subject: [Qemu-devel] [PATCH v4 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 4f4c77fc89..3238ccbf1e 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10736,7 +10736,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; @@ -10780,12 +10779,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