From patchwork Fri May 4 18:30:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135028 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp385816lji; Fri, 4 May 2018 11:39:18 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo5YwF51TZ2wtz6Wvm/ed6jUPO1BndnDYTvaxgoJvg1TTRBu5PDIR54e1+auzTgDjrHr+zb X-Received: by 2002:ac8:1881:: with SMTP id s1-v6mr20133176qtj.405.1525459158801; Fri, 04 May 2018 11:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525459158; cv=none; d=google.com; s=arc-20160816; b=suBnT8h1+SGRG/GjFplbbcuDa3DkFNDIrcbNtrc5eis/phlGqmeYfFoL/x25ekWwlO 0fmj+NER0bPez7kexFnuPQieUdzzbgAdH31cIhFKggLKI1rfwFEFXN6iGU5O8mSjfsMK oobVQ3S07KPxq/JTbm3G9YpiKwaujtdB2fTltBPmiLYZD5oWrChq/P59Pd14eOqZU4Gu zexmXRpcZTiAkBB+RtPWIfKJpcQ69AI+mt4nrb7LHIviMKE1dTHrlbOzad0FpQJh/NNa aVEi4UuCPlsM80CSR0ki+vJ45wWL+o5CzhrT4IKrrkO7s99ix6AtEOQDfBicmF6kwmNM ldzQ== 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:arc-authentication-results; bh=ThPvhn6D+UVVPyfam//ZDBRKSjR9Wis18Q00SIwCn4E=; b=ZDLk5AaZ52592XmviSYd0I5w6rUmMGlpNL6GqNzGNBR/s35ctpE5HZXyoP6SNpw9Bj WbfJL2/MSuJAN4yRwHdRefDZiQfWajUxEMeNsGDcFjaMMABRQ171lXPKjFQgJQ7CvfaH deA8g7jioDbkZrszfJEZR2fDLJIRbFkV1MSLc7OiVcBSYQ5f+jq9jCJrIRfg/e/hC4fs V/H9cuZ/eIC5aq/S8NycZnAJzptyQuiJ9275AchgavnDT410+q/ycBP3zrH39ngsBFoM TS08bcXSOdOrsRwJcXipQXME0rK1NZpAiOllUurXtQP28eWQHbxQu4JDnoBML78kdPIH PoxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X9KfoqKq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s6-v6si6580588qtb.240.2018.05.04.11.39.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 04 May 2018 11:39:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X9KfoqKq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:36024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEfby-0006Vn-BO for patch@linaro.org; Fri, 04 May 2018 14:39:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEfTZ-0007b7-F1 for qemu-devel@nongnu.org; Fri, 04 May 2018 14:30:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEfTY-0001Dc-42 for qemu-devel@nongnu.org; Fri, 04 May 2018 14:30:37 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:36176) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEfTX-0001Ci-VB for qemu-devel@nongnu.org; Fri, 04 May 2018 14:30:36 -0400 Received: by mail-pf0-x243.google.com with SMTP id w129so12647536pfd.3 for ; Fri, 04 May 2018 11:30:35 -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=ThPvhn6D+UVVPyfam//ZDBRKSjR9Wis18Q00SIwCn4E=; b=X9KfoqKqpbum7f63Qqa7Y6q2RS+TNVn2kvWZljpyJvM+1KDguuQbSwdZ/hpL2rymMD hVkq3afSZKgWMuTCX1MObOInefrq0F8QZgw0dKqiKavmQdXZ17ac+8OBKC0DYS+sBvsP a8NVHveBbovW5hyLqBYVif7HxOz++r24B8QzE= 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=ThPvhn6D+UVVPyfam//ZDBRKSjR9Wis18Q00SIwCn4E=; b=krSAQ7UuMTunOMmwhbmXhb1BxrpV2kO3DHNUM/4uGIV9xuGlJptG7yADhGxTO/y/L1 gq6bajji/DlF8tQGDLtC28w4NkA6oi7OOUwI4Z7OjeW3lvgtfESuk/7Dlb4S0s95aR4Y tf6HWZPcHZy0rlg8EiRpwiEz2Y7kFW1ySVz3xLA0zS8fYrWwraN4TX/KElEAnVVOZYQQ UE+1DD6jFvW9bBv+MTdiIfmC8Z9iIRVJjBWQP+G3imi6NSqoMsZmW55Cr3xbcWnRo5Da ajm9j5ETIlTpwXK8zSEugHWLKTtNsSw2VyAKrRtXPFFFOpyVhE2SAiK9DmDdG/ieZZnF FfMQ== X-Gm-Message-State: ALQs6tAjg/5ZnIqdVc0zut9UXVeAJc7Zn0Y6Gq2cJkmZz6hy7LOnlgyI 4YqK8MsTVnHNqD+dPRuqsVGlbUDVTWc= X-Received: by 2002:a17:902:a60d:: with SMTP id u13-v6mr10205339plq.40.1525458634738; Fri, 04 May 2018 11:30:34 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id r8-v6sm16987413pgn.2.2018.05.04.11.30.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 May 2018 11:30:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 4 May 2018 11:30:19 -0700 Message-Id: <20180504183021.19318-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180504183021.19318-1-richard.henderson@linaro.org> References: <20180504183021.19318-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v2 08/10] target/arm: Fill in disas_ldst_atomic 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" This implements all of the v8.1-Atomics instructions except for compare-and-swap, which is decoded elsewhere. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) -- 2.14.3 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 6acad791e6..5af6028089 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -84,6 +84,7 @@ typedef void NeonGenOneOpFn(TCGv_i64, TCGv_i64); typedef void CryptoTwoOpFn(TCGv_ptr, TCGv_ptr); typedef void CryptoThreeOpIntFn(TCGv_ptr, TCGv_ptr, TCGv_i32); typedef void CryptoThreeOpFn(TCGv_ptr, TCGv_ptr, TCGv_ptr); +typedef void AtomicThreeOpFn(TCGv_i64, TCGv_i64, TCGv_i64, TCGArg, TCGMemOp); /* Note that the gvec expanders operate on offsets + sizes. */ typedef void GVecGen2Fn(unsigned, uint32_t, uint32_t, uint32_t, uint32_t); @@ -2772,6 +2773,8 @@ static void disas_ldst_atomic(DisasContext *s, uint32_t insn, int rn = extract32(insn, 5, 5); int o3_opc = extract32(insn, 12, 4); int feature = ARM_FEATURE_V8_ATOMICS; + TCGv_i64 tcg_rn, tcg_rs; + AtomicThreeOpFn *fn; if (is_vector) { unallocated_encoding(s); @@ -2779,14 +2782,32 @@ static void disas_ldst_atomic(DisasContext *s, uint32_t insn, } switch (o3_opc) { case 000: /* LDADD */ + fn = tcg_gen_atomic_fetch_add_i64; + break; case 001: /* LDCLR */ + fn = tcg_gen_atomic_fetch_and_i64; + break; case 002: /* LDEOR */ + fn = tcg_gen_atomic_fetch_xor_i64; + break; case 003: /* LDSET */ + fn = tcg_gen_atomic_fetch_or_i64; + break; case 004: /* LDSMAX */ + fn = tcg_gen_atomic_fetch_smax_i64; + break; case 005: /* LDSMIN */ + fn = tcg_gen_atomic_fetch_smin_i64; + break; case 006: /* LDUMAX */ + fn = tcg_gen_atomic_fetch_umax_i64; + break; case 007: /* LDUMIN */ + fn = tcg_gen_atomic_fetch_umin_i64; + break; case 010: /* SWP */ + fn = tcg_gen_atomic_xchg_i64; + break; default: unallocated_encoding(s); return; @@ -2796,8 +2817,21 @@ static void disas_ldst_atomic(DisasContext *s, uint32_t insn, return; } - (void)rs; - (void)rn; + if (rn == 31) { + gen_check_sp_alignment(s); + } + tcg_rn = cpu_reg_sp(s, rn); + tcg_rs = read_cpu_reg(s, rs, false); + + if (o3_opc == 1) { /* LDCLR */ + tcg_gen_not_i64(tcg_rs, tcg_rs); + } + + /* The tcg atomic primitives are all full barriers. Therefore we + * can ignore the Acquire and Release bits of this instruction. + */ + fn(cpu_reg(s, rt), tcg_rn, tcg_rs, get_mem_index(s), + s->be_data | size | MO_ALIGN); } /* Load/store register (all forms) */