From patchwork Wed Aug 28 19:04:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172455 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1216901ily; Wed, 28 Aug 2019 12:50:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWQ0Mj4ZTuG0f5eBzAQCt0/2Heh6mwS4Q2U5IGL+03tOwM2tPDaf0yNnX7SjN5lcMTSvQE X-Received: by 2002:aa7:ccc4:: with SMTP id y4mr5969815edt.1.1567021804814; Wed, 28 Aug 2019 12:50:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567021804; cv=none; d=google.com; s=arc-20160816; b=dxOHXu3IVOQm3SajLalRxd0OkcEcFOkWWRsdFH/y8MSh6VUSO43GqabpHi0j9sZ9yg wnCJbXT8slIfb0pxUHtzn4BlQk7OqVAjh8rFbK1LugdCH0zEW6L947iW3OvtfMCfTxS2 p+D12i6tAH5XiY7kqLcUfVUSklkVTV+J3Vh13oJ4orFkYbisC8O9oI1SRsSvnSZP9ODC IthJw1QD/mSZ9Mc5nePl1fW3VHsIUOUHQCzJ/g7UIhTjxtDtHZ3iQwlkNiXXomZqSllG TCKuqQO91l1CZ3bF2h+FfkP7Cgy/0ePlpv1P8W+wmQznzN69iFw83Tm5nRhjRfyexGhg JhAg== 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=Xh3njORL91tYVCqkinovfhGK3k94iR1HSBdgpNlJCqs=; b=Zuj87o4MgU23ZmmbrovdKjdNj8BfDSIGEDk996xJZ1DR+TK7XDK+7Vtgct+7LZWy9n sczJonWEPxZ+zLun8Gn+f3VjskGqXpX4vVk1agoV5+F1PWFJJPARcO/lMf/palbx2PSJ UcmVdWqqAGPQ2O+nhweV3z/A7CGC3380cReUaIwnya27C9Oe5e2+oZNgtRN7u8qfa1oc nVABq2qbF1ewbO/MGn18S/c6uwnkJSzsWK5FFI/XCQHOBrJPGXkB8SEE2d5cwCfibAKq x8smStnZUSSKs5XE8nb2CmA31CgU8NahdgFjKaESFEqw0khl6YQBFXGjRfTticQIaY9l oUuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CMOh4v51; 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 lu15si7338ejb.128.2019.08.28.12.50.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 12:50:04 -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=CMOh4v51; 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]:41640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33xD-0003VL-05 for patch@linaro.org; Wed, 28 Aug 2019 15:50:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38784) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i33Gs-0003xD-4s for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i33Go-0000gD-3g for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:15 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:40507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i33Gn-0000ar-0s for qemu-devel@nongnu.org; Wed, 28 Aug 2019 15:06:13 -0400 Received: by mail-pl1-x643.google.com with SMTP id h3so393906pls.7 for ; Wed, 28 Aug 2019 12:06:08 -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=Xh3njORL91tYVCqkinovfhGK3k94iR1HSBdgpNlJCqs=; b=CMOh4v51aFrrn+VVcnMwP/eonazi2DDhn7yZSLIK5jtz7SGJkMvXVsHhdNS6cC4kYh QvZCTo3q8T7RXGbb5gQVKA85ZeZcGKP4mntvIDjOlypacZsOjxiw76YBxMhYzT1krILB CbWgQNESlUehZV1I/phISpkS64zns2jkrD0uYHbiOW4ZZFVLTdRHwxUx+hxdj4MBk5y2 wIfOSRFYu3D7839CRdj3owH4kfZrojBz5oLLiRzPcLVubXLfFzmJw8nawhZR4UeOcsff NdJrey+YXhB8hxfEyGQWOW9b3hm4Y7EkmIhI3kKb7kjQPqm3YvX7MQ5glglJBbXD8WzE YFJQ== 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=Xh3njORL91tYVCqkinovfhGK3k94iR1HSBdgpNlJCqs=; b=ZuwJYwImf5uR7ZhPbr2uCQ5yAoTitXOYBN6GxKEhs5iUZZxT46FzjkVl2Uv9zUBdHk /qty+YnLb7E1FeFIF2mT80pjoSOHkdk9efnS7AL5X1Hed5Oq1EnKzzSiam9NRI5c0wtA imfXG9Y9G/3KN7K4C2T80nUB38EVDbrJjdN3UTUVVoBC8SbJ36QYhoDExW5mwgyooUTz gBEV85RlU8KNuK6NNFFm/IIAhUWccHGIMBafu5dOPJDA+E1wUQO3tVUu9EXvfYca8e3l w4viCNuy0Av3ZfXmrbEUCQ/gGyCJboO3a6rYi9Yp6qMM8EKA8cvEBAiywKlg6gxhrWkg IboA== X-Gm-Message-State: APjAAAWFsO1g4KeYMcOXsqU3g1FaIinLB8GE1iaESI/wuwRwMtPKFonf ylXmYZBaIFfQy04RQQ13DkjWKtFyxTc= X-Received: by 2002:a17:902:d906:: with SMTP id c6mr5635816plz.13.1567019167406; Wed, 28 Aug 2019 12:06:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 12:06:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 12:04:40 -0700 Message-Id: <20190828190456.30315-54-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::643 Subject: [Qemu-devel] [PATCH v3 53/69] target/arm: Convert T16 branch and exchange 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 | 70 +++++++++++++++++------------------------- target/arm/t16.decode | 10 ++++++ 2 files changed, 39 insertions(+), 41 deletions(-) -- 2.17.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index d4d7d99da8..cd39329e5c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8338,7 +8338,7 @@ static bool trans_BX(DisasContext *s, arg_BX *a) if (!ENABLE_ARCH_4T) { return false; } - gen_bx(s, load_reg(s, a->rm)); + gen_bx_excret(s, load_reg(s, a->rm)); return true; } @@ -8365,6 +8365,32 @@ static bool trans_BLX_r(DisasContext *s, arg_BLX_r *a) return true; } +/* + * BXNS/BLXNS: only exist for v8M with the security extensions, + * and always UNDEF if NonSecure. We don't implement these in + * the user-only mode either (in theory you can use them from + * Secure User mode but they are too tied in to system emulation). + */ +static bool trans_BXNS(DisasContext *s, arg_BXNS *a) +{ + if (!s->v8m_secure || IS_USER_ONLY) { + unallocated_encoding(s); + } else { + gen_bxns(s, a->rm); + } + return true; +} + +static bool trans_BLXNS(DisasContext *s, arg_BLXNS *a) +{ + if (!s->v8m_secure || IS_USER_ONLY) { + unallocated_encoding(s); + } else { + gen_blxns(s, a->rm); + } + return true; +} + static bool trans_CLZ(DisasContext *s, arg_CLZ *a) { TCGv_i32 tmp; @@ -10733,49 +10759,11 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) } break; case 3: - { /* 0b0100_0111_xxxx_xxxx * - branch [and link] exchange thumb register + * In decodetree */ - bool link = insn & (1 << 7); - - if (insn & 3) { - goto undef; - } - if (link) { - ARCH(5); - } - if ((insn & 4)) { - /* BXNS/BLXNS: only exists for v8M with the - * security extensions, and always UNDEF if NonSecure. - * We don't implement these in the user-only mode - * either (in theory you can use them from Secure User - * mode but they are too tied in to system emulation.) - */ - if (!s->v8m_secure || IS_USER_ONLY) { - goto undef; - } - if (link) { - gen_blxns(s, rm); - } else { - gen_bxns(s, rm); - } - break; - } - /* BLX/BX */ - tmp = load_reg(s, rm); - if (link) { - val = (uint32_t)s->base.pc_next | 1; - tmp2 = tcg_temp_new_i32(); - tcg_gen_movi_i32(tmp2, val); - store_reg(s, 14, tmp2); - gen_bx(s, tmp); - } else { - /* Only BX works as exception-return, not BLX */ - gen_bx_excret(s, tmp); - } - break; - } + goto illegal_op; } break; } diff --git a/target/arm/t16.decode b/target/arm/t16.decode index 0654275e68..edddbfb9b8 100644 --- a/target/arm/t16.decode +++ b/target/arm/t16.decode @@ -24,6 +24,7 @@ &s_rri_rot !extern s rn rd imm rot &s_rrrr !extern s rd rn rm ra &ri !extern rd imm +&r !extern rm &ldst_rr !extern p w u rn rt rm shimm shtype &ldst_ri !extern p w u rn rt imm &ldst_block !extern rn i b u w list @@ -144,3 +145,12 @@ MOV_rxi 00100 ... ........ @arith_1i %s CMP_xri 00101 ... ........ @arith_1i s=1 ADD_rri 00110 ... ........ @arith_1i %s SUB_rri 00111 ... ........ @arith_1i %s + +# Branch and exchange + +@branchr .... .... . rm:4 ... &r + +BX 0100 0111 0 .... 000 @branchr +BLX_r 0100 0111 1 .... 000 @branchr +BXNS 0100 0111 0 .... 100 @branchr +BLXNS 0100 0111 1 .... 100 @branchr