From patchwork Tue May 2 13:57:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678403 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp522612wrs; Tue, 2 May 2023 06:58:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55QKnJ2oqFej1c7QCHrQ5k5rROR19A81Fb9HZcr000Fm/xQ4AhZCXHkpNI3la8snjHUkxu X-Received: by 2002:a05:622a:204:b0:3f1:f65a:3b5b with SMTP id b4-20020a05622a020400b003f1f65a3b5bmr29481387qtx.56.1683035918396; Tue, 02 May 2023 06:58:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683035918; cv=none; d=google.com; s=arc-20160816; b=b+EwGmPvSS1fS/On6r9Sgj55NJIPTwu9lFvHzJxTzRLrsBk838SdGRlM/1bBjnfLDt 8tmztVNdP/2QD86m0kTQK5VdNHM3cd0rIWx6sl/qBATRFyvm2ynXN2Q/naO0OZx8Jdw4 /mTEnJW2WPd3S3XbrWpXhIqdcKAcLbV2bJC4lJxbZHt9por6LBwmxl7cRuNNliNLJ+rY pqqQt4y6GkcEZvVVk/SnBgrmtD9zgZO/KYscyq+bviQbiF9N2yb6Ib+FsGpp0eVbk6v0 H5qx821bzTeru0/Q845TICqtnlO5m5h8Jx8hmYiDGjZHVW6RWMU++CnyzHkG02O/Zwvp bEsw== 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=stImznoQH9DbswhM0sRTZE7S3VXdqMW16vSnFo+HToc=; b=pXCqXia6WB+UWYKhzLy8G3kPxNtNGcKsGnDjG9GPACu1/mVUHkDlxGAGueqCIf7C+D xpjf2Rp8Mhcpk2qxqvr0cVgXXxPPCRALL+NHnp6KK40qpr/Xz+RZUAC6WesF6ugIqR5f OSLjF5eHkljmXrgLaEVjtacWSK1iMY2wiQFHMrr21tcHDgYJcWgcEUt2gi2N98TdCR4x C2rN5Q+lwhxoLnV2bZA9SSNEReKB+8oAWPJmxR+iEME1L7jxjvzv+rrq2X4rx24FLESJ P0Qdn0/nE3pyR2E17RpUN9ptrvomBJSPMKnhykqSndheqicGaT8YW4Ls3Fbl6BNyhA6E kRww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ypZRo1oE; 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 d6-20020ac85d86000000b003f1e667c8bcsi7559617qtx.157.2023.05.02.06.58.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 May 2023 06:58:38 -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=ypZRo1oE; 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 1ptqVr-00019E-Tj; Tue, 02 May 2023 09:57:52 -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 1ptqVq-000191-9i for qemu-devel@nongnu.org; Tue, 02 May 2023 09:57:50 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptqVo-0003Tr-PI for qemu-devel@nongnu.org; Tue, 02 May 2023 09:57:50 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f315712406so170565425e9.0 for ; Tue, 02 May 2023 06:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683035867; x=1685627867; 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=stImznoQH9DbswhM0sRTZE7S3VXdqMW16vSnFo+HToc=; b=ypZRo1oElSCBwhj5j8h+wGaGYxrfOjZs8cGx0Hai3NSj98IBsHexGNnPB5+rRKnIDt 3UEtSmwANsBHfjVgKaDORF2iwexTy8JzN+AUtVZ/LDgYrvfJFO9I4sc2BdlupHo0lf09 JokRRICvDoTCIaZEFbS3SCZT+Vw/f/XVRf7g/TyRZBcKeYMQfOfZaGRlGuiMkLtg4xsF Nuvk+IvYwRCyOWlHzzYbOTLJB1UCsjSDffc9yhn7LezJ7LbMBPPA1jAHFpzMWOInM8fC f7RkZxId0RTDZI/BPuNKNafeWocHJSW4dYft+6OTU/b+6g6ivA28wuZ3HW0xmtMnI1IR yaow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683035867; x=1685627867; 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=stImznoQH9DbswhM0sRTZE7S3VXdqMW16vSnFo+HToc=; b=K4R4nOQvC0J16PriaPpir8P7mqG2LptNWQQB0LuVjlSlvllr1gZU1OuR6ZaAK0P7ci gSSAaArFN/Y05ciUqb5MCjCQWtOfTtqJGduHGb2mBpZ9f6VMhEhKjllX+9TKUGpFyMoF chdfL9TMhi1Cx9UENqEazjuF9UvPY10OZYptoQEBrbi0xWJW3Lkk8P9SbxUABanaKobk ppy3EfzFjBINdnHuAJLxzkB5u0COwvzLoXe0kaKiLOU2LOTmj0V2zmaTGGks+B4hyrJR wZAkFSnmYm7q8n2rHSs9hp7Yod+qSHPLK8SFLkHOvnOqs4T89XCiWrWijZjC+Z4hfs8y BZAg== X-Gm-Message-State: AC+VfDyZ+zr15Vuwy8w/qtIAYBeSzNRU9xryJPTIikeD9S1C4oqYE6Xi PAFVX4gVxfwwaLyrVCbQTBg5w9pAjJQNiIjWMLn/mA== X-Received: by 2002:a7b:cb86:0:b0:3f1:8129:2c53 with SMTP id m6-20020a7bcb86000000b003f181292c53mr13240221wmi.16.1683035867502; Tue, 02 May 2023 06:57:47 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id j32-20020a05600c1c2000b003f173987ec2sm39461140wms.22.2023.05.02.06.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 06:57:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mrolnik@gmail.com, edgar.iglesias@gmail.com, tsimpson@quicinc.com, ale@rev.ng, anjo@rev.ng, laurent@vivier.eu, philmd@linaro.org, jiaxun.yang@flygoat.com, david@redhat.com, iii@linux.ibm.com, thuth@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, jcmvbkbc@gmail.com Subject: [PATCH 5/9] target/mips: Finish conversion to tcg_gen_qemu_{ld,st}_* Date: Tue, 2 May 2023 14:57:37 +0100 Message-Id: <20230502135741.1158035-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502135741.1158035-1-richard.henderson@linaro.org> References: <20230502135741.1158035-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32f.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 Convert away from the old interface with the implicit MemOp argument. Signed-off-by: Richard Henderson Reviewed-by: Anton Johansson --- target/mips/tcg/translate.c | 8 ++++---- target/mips/tcg/nanomips_translate.c.inc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 999fbb7cc1..a6ca2e5a3b 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1949,13 +1949,13 @@ FOP_CONDNS(s, FMT_S, 32, gen_store_fpr32(ctx, fp0, fd)) /* load/store instructions. */ #ifdef CONFIG_USER_ONLY -#define OP_LD_ATOMIC(insn, fname) \ +#define OP_LD_ATOMIC(insn, memop) \ static inline void op_ld_##insn(TCGv ret, TCGv arg1, int mem_idx, \ DisasContext *ctx) \ { \ TCGv t0 = tcg_temp_new(); \ tcg_gen_mov_tl(t0, arg1); \ - tcg_gen_qemu_##fname(ret, arg1, ctx->mem_idx); \ + tcg_gen_qemu_ld_tl(ret, arg1, ctx->mem_idx, memop); \ tcg_gen_st_tl(t0, cpu_env, offsetof(CPUMIPSState, lladdr)); \ tcg_gen_st_tl(ret, cpu_env, offsetof(CPUMIPSState, llval)); \ } @@ -1967,9 +1967,9 @@ static inline void op_ld_##insn(TCGv ret, TCGv arg1, int mem_idx, \ gen_helper_##insn(ret, cpu_env, arg1, tcg_constant_i32(mem_idx)); \ } #endif -OP_LD_ATOMIC(ll, ld32s); +OP_LD_ATOMIC(ll, MO_TESL); #if defined(TARGET_MIPS64) -OP_LD_ATOMIC(lld, ld64); +OP_LD_ATOMIC(lld, MO_TEUQ); #endif #undef OP_LD_ATOMIC diff --git a/target/mips/tcg/nanomips_translate.c.inc b/target/mips/tcg/nanomips_translate.c.inc index 9398e28000..97b9572caa 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_ld64(tval, taddr, ctx->mem_idx); + tcg_gen_qemu_ld_i64(tval, taddr, ctx->mem_idx, MO_TEUQ); if (cpu_is_bigendian(ctx)) { tcg_gen_extr_i64_tl(tmp2, tmp1, tval); } else {