From patchwork Mon Jan 14 01:11:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 155402 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3121302jaa; Sun, 13 Jan 2019 17:25:11 -0800 (PST) X-Google-Smtp-Source: ALg8bN6e+FIXYTBkC9nzWica3ji7MEWDvKeML1WiPQWBLDsKHajPK1pa7gONAbV17bi6d3yL0xwB X-Received: by 2002:adf:9f10:: with SMTP id l16mr22769169wrf.206.1547429111003; Sun, 13 Jan 2019 17:25:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547429110; cv=none; d=google.com; s=arc-20160816; b=FoQc1BDsV09vEgO/LqzEeUOUXhOHx6PPPqcVwxqEgvSJw3gkkWT2ThLE9Q/oA/rA4M 0+vzPx4VRmWYOF0sHfb/ofvg6R/jqsAsgnwH9vrH7TYBgo+8ny5/g8lYWyVZ+Y/OpyGR 5XeJynvkJ5BJAYnX15tcGPni+oJeU8LGCIqgPUwjDzOtmmOEfXjIgin98Cv3b9hJ5x5k 4NsEEdW/J6G9LIhF85/1dUQesARmd0KfcWibdq1qQdpF518dVAcbhKW+qM6nRhycV8EC yRUFu4BsMVMjcxAFgTnLFx7BIDYM81XHEpAZiLl2ZKMmAIS48Q4aYb1++tJc55w8G9+r nVUA== 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=zQWwHZdE0XEmu0eOmYlElX3aU8HsD5IKAzX45HBjqL0=; b=OenuM6ePv0Wsnx+jQm0KMosVGvrrow2I++cV7SM6SVndwHNWSbTwvSDK1q0bMaj5KU UQx78mje4zgSC7XtvbSkvrE6q63y4YOVpdT9q0es5u8WTi0E83UOijvQFF3OaTH8TF3L y6uN0kpjadJu7sGTVhdUuVCu/oKaEW0ARG9783Lx7riiXcW6llogGWrwMjrGcpEh76r1 UKvwWg4K3hbH6jz6w4+CPIa15Vq18QW7yf6GMKWGxQN24euBOofF/K9jehu27hUnhnMO FuKKNyrDUM9OUHGQ2Olvcku5MIBH3WRcOkCsGHEFdVTvAqvnjBYh3+R6igQOQEy68i7z 6c8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eVakkAEg; 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 15si18793830wmt.202.2019.01.13.17.25.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 13 Jan 2019 17:25:10 -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=eVakkAEg; 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]:57367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gir01-0006Rb-0D for patch@linaro.org; Sun, 13 Jan 2019 20:25:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giqnE-0005dq-PU for qemu-devel@nongnu.org; Sun, 13 Jan 2019 20:11:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1giqnD-0000uZ-OX for qemu-devel@nongnu.org; Sun, 13 Jan 2019 20:11:56 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:43031) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1giqnD-0000tu-JU for qemu-devel@nongnu.org; Sun, 13 Jan 2019 20:11:55 -0500 Received: by mail-pf1-x444.google.com with SMTP id w73so9535177pfk.10 for ; Sun, 13 Jan 2019 17:11:55 -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=zQWwHZdE0XEmu0eOmYlElX3aU8HsD5IKAzX45HBjqL0=; b=eVakkAEgn6TL8pgzLNe9EuYrR+dNvG07dJPTfb+6p9kFTO7iXTIr5WQXjq5hRcgHrQ Sl6svAP3zApq9qLsEtIwD702jOatMApY4hA3kPClXuO0VQXcSSN4WYtBMSAzRxK88ul8 4s3C0Pm22yOvBXQrp0dpqDsnmUuOErMblOEXQ= 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=zQWwHZdE0XEmu0eOmYlElX3aU8HsD5IKAzX45HBjqL0=; b=L8nviz2qPjzEmsgqxEv/cTHFzCzCbNAlTsalT//JWL9t6RgL59lDNVXTsXuIuVM964 HVZ9lgqntG39RhW89RoC+a686+Dbn5qTifrRv1HWa9WL4XLxVIJ4eCIz3T5lEHlBgVwl AvZ12g68JiF/2HVpQP0H6dCybvR+bUqpbuZuq3CNd0PIu/ftyNLonP24LoXZJpfCyUlD fUzlyQCop3aBXmhpEHxTyuoi0xrtYA7slqXJwN471YoObjsn47hif3yuE7L9OfCT50k7 D5tUimekrbLwZNALjCXhUP2zXgEY3DBjLNdZ+Xa7C/GRIQIpoGhDQl1cqUDWBgK+qhFS UnkQ== X-Gm-Message-State: AJcUukc49KfoGdRLH1/2IRo+gyeozMbb2IWuCKTa9LBlbkDeZN6qg0FY 3W8I7g1wq+g7G9Ku8Hp/NQ0VKwgjRyHwTA== X-Received: by 2002:a63:88c7:: with SMTP id l190mr20683453pgd.110.1547428314189; Sun, 13 Jan 2019 17:11:54 -0800 (PST) Received: from cloudburst.twiddle.net ([2001:8000:1064:7600:4085:6ae6:1bde:1c45]) by smtp.gmail.com with ESMTPSA id 5sm159602229pfz.149.2019.01.13.17.11.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 13 Jan 2019 17:11:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 12:11:12 +1100 Message-Id: <20190114011122.5995-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190114011122.5995-1-richard.henderson@linaro.org> References: <20190114011122.5995-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::444 Subject: [Qemu-devel] [PATCH 07/17] 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, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/helper-a64.h | 2 ++ target/arm/internals.h | 3 ++ target/arm/mte_helper.c | 34 ++++++++++++++++++ target/arm/translate-a64.c | 71 ++++++++++++++++++++++++++------------ 4 files changed, 87 insertions(+), 23 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 7a6051fdab..47577207b2 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -105,3 +105,5 @@ DEF_HELPER_FLAGS_2(xpacd, TCG_CALL_NO_RWG_SE, i64, env, i64) DEF_HELPER_FLAGS_2(mte_check, TCG_CALL_NO_WG, i64, env, i64) 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 2922324f63..a5a249b001 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1002,4 +1002,7 @@ static inline bool allocation_tag_access_enabled(CPUARMState *env, int el, return sctlr != 0; } +/* We associate one allocation tag per 16 bytes, the minimum. */ +#define LOG2_TAG_GRANULE 4 + #endif diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 1878393fc4..e2b1a5dd40 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -163,3 +163,37 @@ 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 = env->cp15.gcr_el1; + rtag = choose_nonexcluded_tag(start_tag, tag_offset, exclude); + } + + offset <<= LOG2_TAG_GRANULE; + 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 = env->cp15.gcr_el1; + rtag = choose_nonexcluded_tag(start_tag, tag_offset, exclude); + } + + offset <<= LOG2_TAG_GRANULE; + return address_with_allocation_tag(ptr - offset, rtag); +} diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index b0349bffc4..879d6b8d46 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -3652,7 +3652,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) { @@ -3663,10 +3665,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: @@ -3674,35 +3676,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); - 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