From patchwork Fri Jun 26 15:13:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 191835 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp588770ilg; Fri, 26 Jun 2020 08:26:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBs83sXBP1b9c/57yB+DPfvi3hjfb2U6HRr+yTieHFmDojIYiA6o7Fc5MC0O14i2c2aLFO X-Received: by 2002:a5b:bc6:: with SMTP id c6mr6161042ybr.302.1593185212253; Fri, 26 Jun 2020 08:26:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593185212; cv=none; d=google.com; s=arc-20160816; b=VaFE0Lq4fAScq92TDVjE5QfA9Q2VBKgEXKj6iBOJI6/Sb2tb41VSgBWEgUDl3cXJWW EL03uANE4S+0LgHqJ+OoF9C6Xh4LzVhhoY94cvw2474d0Jwo5y/WqGWWG8i4ykrplyBS 6wN/MlGeLUYxB9hl0TOdtwfimu12qtR6Cmkccku5SF7PmphmnU38j0BZoKgqP4/EVK32 OTPJlVZOWs23br6yV0E6ws0eBjtTU56WXbTWrq4sWGFyG10yj+xHFaiI0hWqyqv0w/4p wiqhmcRooJL+/NYoRVemi26NELqkIdKVPRgA1xKV/AFCMljaGKFNea9R4IQgjPCPa1wm bXdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=9ezTOa/oqGR3aTnmsdS8WlxHF8a9UjrfoJ5j/vedODI=; b=YdHbjepnq3qcFBlwJ6ejJU7GcHO6XHA5DmNha8hsf+O+PRmHL/ja5QKIw8KiGAV2vw MOdg24I2+0NXaaNwZL+uOjm2j3E3eM3Ap3IMgfEeWJbW4trgkatU9jPkOmM8jUtLXdc+ sNAmFjvtrDknrRCzNckb94b0o+i24GQ8n/3KBj1+OC9rAdRDiGIHZa+cTbG765YXsxEE ekwRkIMhZOW2l/hW46Yw34LhlP15kIOg9z35hQxSPoLqPxy8UYuMOFTw18Ph3gEPSBu7 IfbISRKep0CDe2q+LN0LFO/4iDDbC6+zt0xOj603chk8eFZnH4msO3qf7Wg2/jirrIYi wYYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lFJCl7uj; 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=pass (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 194si23897653ybn.352.2020.06.26.08.26.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 08:26:52 -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=pass header.i=@linaro.org header.s=google header.b=lFJCl7uj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joqFf-0005iB-Mo for patch@linaro.org; Fri, 26 Jun 2020 11:26:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joq4E-0002iq-CL for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:02 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joq4C-0006WA-DW for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:15:01 -0400 Received: by mail-wr1-x435.google.com with SMTP id j4so7404816wrp.10 for ; Fri, 26 Jun 2020 08:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9ezTOa/oqGR3aTnmsdS8WlxHF8a9UjrfoJ5j/vedODI=; b=lFJCl7uj0/RSIqLu0QZIVzQL65uHlBKEO117xR8UTYXeDCG3Yn7ONTUuSpcRhkupdT IQUxwZgUMoT6y0ZeZFOn5wHPS3a+xYD200gcj/cxqItbxaO3SfnfHOASJt4PIh7jyuYe x5UtzXC8nEoJbXyMkpxMYrTkQALXWsZhQniKvLcE74eR7Wx88xjHewcJhUQw6l8kUTTd b3La1tAr5ZVAOyp4RDVvp8wBmX8q0wPUuVrqYx3lBXWB9/oI+Hn3RqxMV2Gsp6M95LHL HpEMB0LBii9NK/eII6ozqTKGy0KfGxxziR/yiEZoa+8trlc/TXZOBW9RfRKtqYbA703C 6hGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9ezTOa/oqGR3aTnmsdS8WlxHF8a9UjrfoJ5j/vedODI=; b=IX4JvOqLXZz22m/OR627c4bb+jHPC6Cl9mY6Qds3wQCdROBb9K8CWYi4KQMwe72OP9 uM5ylFhMsNSDZqjbgZLEj69nyxmgbuRIN0cWhyjYm0XPSo6luHgfHsh34oqvJrW5ujDR OXAT83+7pVvGhn5IJmE4hMZmvgMINcp50DkdW+nHo9R9Z+QwRkRpdeMTL7K+SLOR5tUc ASVBtzxr/ODQN4lhkHR38unOVprxknls3m8+o60auAcwrxpbrTXqKlp3b72KJsiyyYC9 BOU7LRzYMm1++4v9tjwff7j/1Bd+plW0D0cGb6tiQ38H2WTbS+lp5FqrfniUBgNFwZS2 +9GA== X-Gm-Message-State: AOAM5323NsRKzN27ELAOZ1LxHba1Jm2px9k4jMaKVzCuj4XqrRKagJ0S UJ5WfOY4+WNRAPG9aO7RBBW6idyjPtRrnw== X-Received: by 2002:a5d:6a04:: with SMTP id m4mr4217429wru.418.1593184498785; Fri, 26 Jun 2020 08:14:58 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm37838852wrr.67.2020.06.26.08.14.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 08:14:58 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 28/57] target/arm: Implement the STGP instruction Date: Fri, 26 Jun 2020 16:13:55 +0100 Message-Id: <20200626151424.30117-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626151424.30117-1-peter.maydell@linaro.org> References: <20200626151424.30117-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200626033144.790098-17-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 436191c15cf..e2295a371b2 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -2690,7 +2690,7 @@ static void disas_ld_lit(DisasContext *s, uint32_t insn) * +-----+-------+---+---+-------+---+-------+-------+------+------+ * * opc: LDP/STP/LDNP/STNP 00 -> 32 bit, 10 -> 64 bit - * LDPSW 01 + * LDPSW/STGP 01 * LDP/STP/LDNP/STNP (SIMD) 00 -> 32 bit, 01 -> 64 bit, 10 -> 128 bit * V: 0 -> GPR, 1 -> Vector * idx: 00 -> signed offset with non-temporal hint, 01 -> post-index, @@ -2715,6 +2715,7 @@ static void disas_ldst_pair(DisasContext *s, uint32_t insn) bool is_signed = false; bool postindex = false; bool wback = false; + bool set_tag = false; TCGv_i64 clean_addr, dirty_addr; @@ -2727,6 +2728,14 @@ static void disas_ldst_pair(DisasContext *s, uint32_t insn) if (is_vector) { size = 2 + opc; + } else if (opc == 1 && !is_load) { + /* STGP */ + if (!dc_isar_feature(aa64_mte_insn_reg, s) || index == 0) { + unallocated_encoding(s); + return; + } + size = 3; + set_tag = true; } else { size = 2 + extract32(opc, 1, 1); is_signed = extract32(opc, 0, 1); @@ -2767,7 +2776,7 @@ static void disas_ldst_pair(DisasContext *s, uint32_t insn) return; } - offset <<= size; + offset <<= (set_tag ? LOG2_TAG_GRANULE : size); if (rn == 31) { gen_check_sp_alignment(s); @@ -2777,8 +2786,22 @@ static void disas_ldst_pair(DisasContext *s, uint32_t insn) if (!postindex) { tcg_gen_addi_i64(dirty_addr, dirty_addr, offset); } - clean_addr = clean_data_tbi(s, dirty_addr); + if (set_tag) { + if (!s->ata) { + /* + * TODO: We could rely on the stores below, at least for + * system mode, if we arrange to add MO_ALIGN_16. + */ + gen_helper_stg_stub(cpu_env, dirty_addr); + } else if (tb_cflags(s->base.tb) & CF_PARALLEL) { + gen_helper_stg_parallel(cpu_env, dirty_addr, dirty_addr); + } else { + gen_helper_stg(cpu_env, dirty_addr, dirty_addr); + } + } + + clean_addr = clean_data_tbi(s, dirty_addr); if (is_vector) { if (is_load) { do_fp_ld(s, rt, clean_addr, size);