From patchwork Tue May 2 16:08:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678423 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp595804wrs; Tue, 2 May 2023 09:10:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ42NbY9UKkchpMbuOcyj1kQ2CDk97QcHLmQ+fx4+b71HoCZU9h4h+4AbBoxedcMJ6WJm8yu X-Received: by 2002:a05:622a:1494:b0:3f2:1b6a:689 with SMTP id t20-20020a05622a149400b003f21b6a0689mr12016224qtx.3.1683043848096; Tue, 02 May 2023 09:10:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683043848; cv=none; d=google.com; s=arc-20160816; b=ZRKNGC3PeoC9bE+TkjAhmOGVeiFCqp+2j3iTJfTnfoTESuoBAYQ5m5aJ8+sqkiK3VE +uyeIGYnj/9dyGoIcWdBbAR/+0k9j9RT3WMWeXwQvGaorLgy67kk3leNKxL+4wyTpx/P x7CGX7eAO1Qhjw6T7ofGbbPYUNX6MM7dqek8Y2z9n8cfEJsyxiKRfs96Og1xrIS6s6rS gQzNHpNR7BgkcZsoRb+t5vZpjBL8QH6jvmmSbK5ZgMirRX+7YiQbB69nzuJLebiaWKd6 BiMuH7NXQPPTS6ZtHOy1aLrs5TXmJ7BeRRtoXSpDKbA0RdoQDK1GctFmraeDA1vDuZH5 KcPg== 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:cc:to :from:dkim-signature; bh=Ak9lI8a+Y3Ekw5fqxmz/fOYShDZB2hBrThel6H303CQ=; b=ROleo4XzN8QFpgwQapX2NmLno3yseaKhqjzZhbX4fViJlc3kX3wr4BQ+4kMmy9B7dj J88Iyi7e1zZ66V1AAJEUNCzCzVdVVWxMzdTNEhRKi+NUBfm4+8v5qSsQL2a35meFQsye zwSYfl66tDETkX83d7WH2s+rbthkcJMLqZ/kxLUf4kC6uX2VKxAKq4V1aHdCtCxN7QV/ fJR3S/2IeUpyb904RoulJeccRI3TGNJWJKHl50TDIa0BA4UV7+wd1IyxA51c4WrPnqNK 7F6lkEiv2ueW3rYPwSEYDr/cSIX8oTcFGonUTIPV3lOPf5g9cUc8VXjjGa/Pa5Z3ZlDM la3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kiM4bx9c; 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 o6-20020a05620a22c600b00746a2634149si16686154qki.642.2023.05.02.09.10.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 May 2023 09:10:48 -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=kiM4bx9c; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptsYz-0002qr-CC; Tue, 02 May 2023 12:09:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptsYh-0002m1-AU for qemu-devel@nongnu.org; Tue, 02 May 2023 12:09:03 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptsYf-0000dx-9F for qemu-devel@nongnu.org; Tue, 02 May 2023 12:08:54 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f09b4a1527so41720195e9.0 for ; Tue, 02 May 2023 09:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683043732; x=1685635732; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ak9lI8a+Y3Ekw5fqxmz/fOYShDZB2hBrThel6H303CQ=; b=kiM4bx9c8BffCFeInQPs2TaEJgMP6upq6yhI4671vB84k2F29DiOze+5wXz77BjnF8 Jg2lhBag8ZP1Ift0W2MTr3uW29F9ux3ihP4ZqLKeYNxWIb7lF4RCY2NeYLPrvnpboxeT 4qQS67N+eIw0kVrdzJSsSoJT+iOm985FxV+Us8+5RQ98hHvAAZWnOpMbzLY0TDH0lxuq 0H0QNmkr09ScDG/HsSi87zrY74KgByoAlQHgNiwplu4RDQ1TpQ3Licz9XrCdLWsBmExy npgLhj4Jba+PTHhPcWQAup6dzdmzxNk0og1N9om3g8nGqSTEtwrdpWFuw2vWQ3rIRxJ0 aU5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683043732; x=1685635732; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ak9lI8a+Y3Ekw5fqxmz/fOYShDZB2hBrThel6H303CQ=; b=Unf4WFLNmTxYpINxuCQvomEVgpKuxwf4XiXcf0TnlL0ZX9UfeMtJBy/i+r9YeCKBaQ IH6Yq6SeIEqeUvMSM418fWan/pHN+nWMdJD8OYBsNV6IOXnh2WR+Re/exDjjs0unQJ8Q +ZKXe2IhPJ/anWIJJj41a53TFfOU/58Z0uNSJlSeUX6SjTbTU2T1uCD+PiGu5tRq5Jin /uOzsiGClZmkPDHrkOmlgigfN8ARgQ9yuBAhQSX6TuHx1NSaRI6uvDcHthXPz07gICFB +i6//9WcvObHi8lTxZJLee60vrnFixR10y/Wr+W6+ZzKjN9bewZGlZ8o4sW7Ti/mPyqd Ptmg== X-Gm-Message-State: AC+VfDwoSFUj2PxfYnlrpSXGMDmfdIdjC1dkZ/tL9qOx9CQ7DCkmz3AW p7htbkWi2C/vAyyMdqi+fYhjtcJAe2gY6Kv0OL+YDg== X-Received: by 2002:a7b:cd18:0:b0:3f1:6f57:6fd3 with SMTP id f24-20020a7bcd18000000b003f16f576fd3mr12270265wmj.17.1683043731764; Tue, 02 May 2023 09:08:51 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id v16-20020a05600c471000b003ede3f5c81fsm39918471wmo.41.2023.05.02.09.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 09:08:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, jiaxun.yang@flygoat.com, crwulff@gmail.com, marex@denx.de, ysato@users.sourceforge.jp, mark.cave-ayland@ilande.co.uk Subject: [PATCH 06/16] target/mips: Add MO_ALIGN to gen_llwp, gen_scwp Date: Tue, 2 May 2023 17:08:36 +0100 Message-Id: <20230502160846.1289975-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502160846.1289975-1-richard.henderson@linaro.org> References: <20230502160846.1289975-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32e.google.com 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org These are atomic operations, so mark as requiring alignment. Signed-off-by: Richard Henderson --- target/mips/tcg/nanomips_translate.c.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/mips/tcg/nanomips_translate.c.inc b/target/mips/tcg/nanomips_translate.c.inc index 97b9572caa..e08343414c 100644 --- a/target/mips/tcg/nanomips_translate.c.inc +++ b/target/mips/tcg/nanomips_translate.c.inc @@ -998,7 +998,7 @@ static void gen_llwp(DisasContext *ctx, uint32_t base, int16_t offset, TCGv tmp2 = tcg_temp_new(); gen_base_offset_addr(ctx, taddr, base, offset); - tcg_gen_qemu_ld_i64(tval, taddr, ctx->mem_idx, MO_TEUQ); + tcg_gen_qemu_ld_i64(tval, taddr, ctx->mem_idx, MO_TEUQ | MO_ALIGN); if (cpu_is_bigendian(ctx)) { tcg_gen_extr_i64_tl(tmp2, tmp1, tval); } else { @@ -1039,7 +1039,8 @@ static void gen_scwp(DisasContext *ctx, uint32_t base, int16_t offset, tcg_gen_ld_i64(llval, cpu_env, offsetof(CPUMIPSState, llval_wp)); tcg_gen_atomic_cmpxchg_i64(val, taddr, llval, tval, - eva ? MIPS_HFLAG_UM : ctx->mem_idx, MO_64); + eva ? MIPS_HFLAG_UM : ctx->mem_idx, + MO_64 | MO_ALIGN); if (reg1 != 0) { tcg_gen_movi_tl(cpu_gpr[reg1], 1); }