From patchwork Thu Mar 7 17:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159889 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7668594jad; Thu, 7 Mar 2019 09:05:32 -0800 (PST) X-Google-Smtp-Source: APXvYqzYNP7NchDVwUopk1Nwq2t7aw1ZR1oGsfComHlUjSNkQFHbjaGMzqq0ZRaBb7FLIKpiYVWE X-Received: by 2002:a25:3247:: with SMTP id y68mr11768073yby.321.1551978332097; Thu, 07 Mar 2019 09:05:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551978332; cv=none; d=google.com; s=arc-20160816; b=P9jq6uFKXGAkjmwkZl0BlpdNGvbgfeayNJFvh/5ZILGI4w0AtqZ52gpd0E7oc/zj1y VXNxkskOfMvwVIKQ/BgWtrL3gF1DjkIF1EtwwCGjbN+pYtjOV51mTRt2XFAlDpVUJ7/p +kc2g+MCNp3qtq36Zf6AgNfcJ9UqQvdPwRsWXCUzFf7sd42eXniLrNGN6M8xIhTB8taE 2rH7rnJyQ9F7yI/x7PVbgmI8nFZuCXUrkc8o32Mj/l/RpPKHYtHXet9lhIPlDUWtV6V3 a2z25LoVvJj4G5anKRQJseHWujfkc9pH5f/cTYpCFjOy61WOetCHWk2jlkphUBGDLpA0 jd0Q== 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=9w6QQtSNTfgYIQIE02VuHJLGHx4qCaX514ubVoqkBOQ=; b=zTeGs1jNSg8qvaaFLD15qmVyKNDv5fWtG4U86CERKs6cPxfB2775pzwKrskrMPxKT9 mxQqRgq8Zp6Yijyu+FTv1ihzNRKdP9DfR5Rp399dKaAnHgzYsIEs5C/XU/v+k9AXH4IM 3Cw2r28S0SOZvI2yJA0qK/oiYgkOu+KF+4ylzKmd+imE3L8b+RE772wp5qdXaChrbdV6 edjMVaIewlHMCVgsmyxH7zd651LyJzbTys3NRgEN//AVp0JSeGJbkcCbGlCNf1NbqKBt Wbwbmse2wjwvVsSQdDbIf6e7bUbr1JqXYiLUjbevmrPmV6fiU/8K/vtRcHgGjShcmTrs RiBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K29vjuKw; 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 k20si3068896ywe.213.2019.03.07.09.05.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Mar 2019 09:05:32 -0800 (PST) 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=K29vjuKw; 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 ([127.0.0.1]:55542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wSZ-0006Nl-ID for patch@linaro.org; Thu, 07 Mar 2019 12:05:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wS8-0006Jf-Sr for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:05:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wRz-0004SR-Vn for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:04:58 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:39359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wRx-0004Oc-0F for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:04:54 -0500 Received: by mail-pg1-x544.google.com with SMTP id h8so11733918pgp.6 for ; Thu, 07 Mar 2019 09:04:52 -0800 (PST) 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=9w6QQtSNTfgYIQIE02VuHJLGHx4qCaX514ubVoqkBOQ=; b=K29vjuKwIKXSD/s5w8x0qy9CNTPACGvFLTi5jUVVoAFFjnmhBOwFdfQb6GsVEc3qvH aGqkEygMMhvPO/k/cfqLzuPClKpaAJBOrtZGrTSoMMBKZR8wfO30KppTOrakkAGrVzVb Nq/97s0yV6M/3tDI+FVUB6H1wilgD6bNnZdGlx1cToaQqBGEvRgbqiznk0VCGL2Dghak 5OpCxxUkjpWS8UjYF76dNnYPZGsRHTjVAqB57cFn36cFUJ+9gGC0T9HpF70kZYpwm0oh 5k8BPgMr0/f0wkHX0aSrmnIzyXTQn9g4YRJPhrU8lPyOyTXTCsMgBcvCWqjWHdhXeijQ T7sQ== 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=9w6QQtSNTfgYIQIE02VuHJLGHx4qCaX514ubVoqkBOQ=; b=TzLqyL2wVGLNPlCLLuWRRdZVgB9Iyes2V8wc6+F11FlxyxDZuAqFMmYZUsjtAR/RMH ot3h7/9SYZK/JJh2qrfPUZ2Hd/x5KuX/ppqvog85J0TR41QH5OJWzQBkfoSJQigSzG2U Zj4c9uEAsqTpSsOU9exRUF0/CVUCp4RuCzh6ntukWfAlk/NECRYg6iuVPgeHrBezx7/l mY81DUzoNMNTnMEUTYmfQA5KD1NIeY0Epn4XyT7PTzo7vRSPxHLQEm+hmDADwDvP/kgk JRCOP0lTFwk7EkmB9IgqygDcrRkWEo2A25apNAwX6H2dHYrlO/tHvx7DuFJRuqvKCpMa /5Mg== X-Gm-Message-State: APjAAAXacFnQkPA23CGmyfOHEuW+qQse7lSvZ59NThgC3CCmBLgIRCjt clZo2MM6Nr+ZkiDPUPjUT0G0M6DgYow= X-Received: by 2002:a17:902:f096:: with SMTP id go22mr13373251plb.172.1551978291272; Thu, 07 Mar 2019 09:04:51 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id r82sm10040562pfa.161.2019.03.07.09.04.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Mar 2019 09:04:50 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 09:04:25 -0800 Message-Id: <20190307170440.3113-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190307170440.3113-1-richard.henderson@linaro.org> References: <20190307170440.3113-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::544 Subject: [Qemu-devel] [PATCH v4 07/22] target/arm: Implement ADDG, SUBG instructions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- v2: Shift offset in translate; use extract32. --- target/arm/helper-a64.h | 2 ++ target/arm/internals.h | 4 +++ target/arm/mte_helper.c | 32 +++++++++++++++++ target/arm/translate-a64.c | 71 ++++++++++++++++++++++++++------------ 4 files changed, 86 insertions(+), 23 deletions(-) -- 2.17.2 diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 0f6e78c77e..6ad23bf9ee 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -106,3 +106,5 @@ DEF_HELPER_FLAGS_2(xpacd, TCG_CALL_NO_RWG_SE, i64, env, i64) DEF_HELPER_FLAGS_2(mte_check1, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_3(mte_check2, TCG_CALL_NO_WG, i64, env, i64, i32) DEF_HELPER_FLAGS_3(irg, TCG_CALL_NO_RWG, i64, env, i64, i64) +DEF_HELPER_FLAGS_4(addg, TCG_CALL_NO_RWG_SE, i64, env, i64, i32, i32) +DEF_HELPER_FLAGS_4(subg, TCG_CALL_NO_RWG_SE, i64, env, i64, i32, i32) diff --git a/target/arm/internals.h b/target/arm/internals.h index fbfa770c23..8d1a81df8c 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1008,4 +1008,8 @@ static inline bool allocation_tag_access_enabled(CPUARMState *env, int el, */ #define GMID_EL1_BS 6 +/* We associate one allocation tag per 16 bytes, the minimum. */ +#define LOG2_TAG_GRANULE 4 +#define TAG_GRANULE (1 << LOG2_TAG_GRANULE) + #endif diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index cd04e4954b..7aca5b074f 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -188,3 +188,35 @@ uint64_t HELPER(irg)(CPUARMState *env, uint64_t rn, uint64_t rm) return address_with_allocation_tag(rn, rtag); } + +uint64_t HELPER(addg)(CPUARMState *env, uint64_t ptr, + uint32_t offset, uint32_t tag_offset) +{ + int el = arm_current_el(env); + uint64_t sctlr = arm_sctlr(env, el); + int rtag = 0; + + if (allocation_tag_access_enabled(env, el, sctlr)) { + int start_tag = allocation_tag_from_addr(ptr); + uint16_t exclude = extract32(env->cp15.gcr_el1, 0, 16); + rtag = choose_nonexcluded_tag(start_tag, tag_offset, exclude); + } + + return address_with_allocation_tag(ptr + offset, rtag); +} + +uint64_t HELPER(subg)(CPUARMState *env, uint64_t ptr, + uint32_t offset, uint32_t tag_offset) +{ + int el = arm_current_el(env); + uint64_t sctlr = arm_sctlr(env, el); + int rtag = 0; + + if (allocation_tag_access_enabled(env, el, sctlr)) { + int start_tag = allocation_tag_from_addr(ptr); + uint16_t exclude = extract32(env->cp15.gcr_el1, 0, 16); + rtag = choose_nonexcluded_tag(start_tag, tag_offset, exclude); + } + + return address_with_allocation_tag(ptr - offset, rtag); +} diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 6d8fd045da..181692cd1b 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -3758,7 +3758,9 @@ static void disas_pc_rel_adr(DisasContext *s, uint32_t insn) * sf: 0 -> 32bit, 1 -> 64bit * op: 0 -> add , 1 -> sub * S: 1 -> set flags - * shift: 00 -> LSL imm by 0, 01 -> LSL imm by 12 + * shift: 00 -> LSL imm by 0, + * 01 -> LSL imm by 12 + * 10 -> ADDG, SUBG */ static void disas_add_sub_imm(DisasContext *s, uint32_t insn) { @@ -3769,10 +3771,10 @@ static void disas_add_sub_imm(DisasContext *s, uint32_t insn) bool setflags = extract32(insn, 29, 1); bool sub_op = extract32(insn, 30, 1); bool is_64bit = extract32(insn, 31, 1); + bool is_tag = false; TCGv_i64 tcg_rn = cpu_reg_sp(s, rn); TCGv_i64 tcg_rd = setflags ? cpu_reg(s, rd) : cpu_reg_sp(s, rd); - TCGv_i64 tcg_result; switch (shift) { case 0x0: @@ -3780,35 +3782,58 @@ static void disas_add_sub_imm(DisasContext *s, uint32_t insn) case 0x1: imm <<= 12; break; + case 0x2: + /* ADDG, SUBG */ + if (!is_64bit || setflags || (imm & 0x30) || + !dc_isar_feature(aa64_mte_insn_reg, s)) { + goto do_unallocated; + } + is_tag = true; + break; default: + do_unallocated: unallocated_encoding(s); return; } - tcg_result = tcg_temp_new_i64(); - if (!setflags) { - if (sub_op) { - tcg_gen_subi_i64(tcg_result, tcg_rn, imm); - } else { - tcg_gen_addi_i64(tcg_result, tcg_rn, imm); - } - } else { - TCGv_i64 tcg_imm = tcg_const_i64(imm); - if (sub_op) { - gen_sub_CC(is_64bit, tcg_result, tcg_rn, tcg_imm); - } else { - gen_add_CC(is_64bit, tcg_result, tcg_rn, tcg_imm); - } - tcg_temp_free_i64(tcg_imm); - } + if (is_tag) { + TCGv_i32 tag_offset = tcg_const_i32(imm & 15); + TCGv_i32 offset = tcg_const_i32((imm >> 6) << LOG2_TAG_GRANULE); - if (is_64bit) { - tcg_gen_mov_i64(tcg_rd, tcg_result); + if (sub_op) { + gen_helper_subg(tcg_rd, cpu_env, tcg_rn, offset, tag_offset); + } else { + gen_helper_addg(tcg_rd, cpu_env, tcg_rn, offset, tag_offset); + } + tcg_temp_free_i32(tag_offset); + tcg_temp_free_i32(offset); } else { - tcg_gen_ext32u_i64(tcg_rd, tcg_result); - } + TCGv_i64 tcg_result; - tcg_temp_free_i64(tcg_result); + if (!setflags) { + tcg_result = tcg_rd; + if (sub_op) { + tcg_gen_subi_i64(tcg_result, tcg_rn, imm); + } else { + tcg_gen_addi_i64(tcg_result, tcg_rn, imm); + } + } else { + TCGv_i64 tcg_imm = tcg_const_i64(imm); + tcg_result = new_tmp_a64(s); + if (sub_op) { + gen_sub_CC(is_64bit, tcg_result, tcg_rn, tcg_imm); + } else { + gen_add_CC(is_64bit, tcg_result, tcg_rn, tcg_imm); + } + tcg_temp_free_i64(tcg_imm); + } + + if (is_64bit) { + tcg_gen_mov_i64(tcg_rd, tcg_result); + } else { + tcg_gen_ext32u_i64(tcg_rd, tcg_result); + } + } } /* The input should be a value in the bottom e bits (with higher