From patchwork Fri May 5 21:24:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 679347 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp579864wrs; Fri, 5 May 2023 14:28:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ipmat72w9iJfGiCBpl/6sG1T+glpeK3S/d740QlT5ak9HfLsr4Sn6dXpqsDcFZvm3nQy5 X-Received: by 2002:ac8:5c0e:0:b0:3ef:59e2:b9b5 with SMTP id i14-20020ac85c0e000000b003ef59e2b9b5mr4657615qti.47.1683322128020; Fri, 05 May 2023 14:28:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683322128; cv=none; d=google.com; s=arc-20160816; b=ecLwJ4ljSZFtAtWSFS9M96555mNW16RgQ6qHnMd1FIlJ1bgHRQpF6kGFhgZ28cgYza gt5Bwmc8oK3gCJumTNA8WYCvBGlpfOSWfdNjOMX5KrGQX1WVs2lYlZNMiCbXChRZbUD3 FD+rYjlH3/tSYOQ1luB/MGY9yZOKjipJizuwP74gGzZhz/0W+xuEmOJiaT6QnY1Nz+KN HPSxbBzS7JLnlMBxi0bfnLY6sy45OEe8oRWXIbeeYrz7owYvSG5eNrIbzlLXUnIKURI8 6LFpDpsQANvEhPS0ufgQOtMlbulSt7AIHCYX9hpUjVFcVpcbILjytPbEy0L7+ryeowek qKfA== 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=7k6JbT1Cu9D6+D63VgpuW6vTvCzozecySlTlgzNc9d0=; b=O05r1MeNwShKMtZ4eZsjffq5wQ/CtN/rnZwvWT0Z3DCETCBNf/QOLkvMlNXAsR7dqV 4UbWLCP3tkLQF3HXvtJ/zx1yAbq1Q+gAi9d8wXw65gzJL8NkyNtsUtI9F2tbRcrYndkA z/H8MB6//KoMIDUtkY7cBYBhURJ3wJtsVGgxVclYIBPIFX4YrOR1FEtK9rGk7PyLbUC3 ++ru/VV7Xw7+s9xqTvWA3ok/i2k3UsAZM7iflpsp6jB8n/N5W1296L+9IW8i1crPSCKR rcya7zjdyCe+nzVLebwG6MofCSVvYONaVuvlWgMWTDQpDMnWntTdkmWZVhxAmys83ee+ KMWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mejBC6cA; 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 pj18-20020a05620a1d9200b0074e0d0cd485si978698qkn.542.2023.05.05.14.28.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 May 2023 14:28: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=fail header.i=@linaro.org header.s=google header.b=mejBC6cA; 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 ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pv2vC-0000cU-5E; Fri, 05 May 2023 17:24:58 -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 1pv2v9-0000bi-Oo for qemu-devel@nongnu.org; Fri, 05 May 2023 17:24:55 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pv2v7-0004O4-KL for qemu-devel@nongnu.org; Fri, 05 May 2023 17:24:55 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f20215fa70so15953625e9.0 for ; Fri, 05 May 2023 14:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683321892; x=1685913892; 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=7k6JbT1Cu9D6+D63VgpuW6vTvCzozecySlTlgzNc9d0=; b=mejBC6cATgoFyX/YdI5ycgQU2F3VEGtewOzIJDkBztdRKENNL0ZItMTOpQDexpR6SW vr9ZKY7LG3X9oQ5Chkejy6Dyh1AguMLV/KcX43NweAuECsemdyy5ZNjOxvkNBki+Gf1U WRkZPOPhGmLiAkDYXQcxOr9fVCk3iDMB/N9g/OoJVyVrPWGgnNWM2GLpcMST2QABKO03 J4hLyxNyFNUU3B5N7n8SXjXthk9NZ65CpvhcrJORzjz8CtOyX17gZGwX4fDPPzeHstmm F5PN5bZ1O7wmSX39VhoiuaBvWEqsHdgvSE9yYFsj1MqD3/UIexK3dUmnbq0gwSFHaUNP bXxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683321892; x=1685913892; 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=7k6JbT1Cu9D6+D63VgpuW6vTvCzozecySlTlgzNc9d0=; b=N3/DKlrPgRq5PJs/B8w3RIc9dDax1g2jn5pvZds3B5NXFgLrLUQB2uYuIFLVcSs3P+ Mqdu2C94dACL/kJlPlesyPR8sN8ZgKO+Y3XFHwA4z78qBk07eZqO19snFNBqj0uImSnD GMVQK/eUsp+mmw4Gqw1sHgJMHonCgefUe8wthFhO5Ju6oco5n7NKe55hsu2UOxwIsx7G DHHX9eZhEj+IQzqEvKTHwsykpwqdt2Kjoiiv07in2eKNvVxW7/+hZ0pkW0Vd6P638qko cm+DcVenv2g6rkvNRTV2x5eHBKQ7r4CGnFDYkqF/dfbvZURx1piO6H+407HBNRZIeGdK bMpw== X-Gm-Message-State: AC+VfDzBrTqrdmynhu9+UbTpR6cH9JJZDSRdSd0lEqRhtPPwRI3V6yFY THcJfnl0aNvHqGHTLx4tEkGklmP5GkzTBEx8KbHBjg== X-Received: by 2002:a1c:f408:0:b0:3f1:7372:f98f with SMTP id z8-20020a1cf408000000b003f17372f98fmr1839311wma.41.1683321892348; Fri, 05 May 2023 14:24:52 -0700 (PDT) Received: from stoup.. ([212.241.182.8]) by smtp.gmail.com with ESMTPSA id t14-20020a5d460e000000b003047ae72b14sm3426709wrq.82.2023.05.05.14.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 14:24:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Anton Johansson Subject: [PULL 06/42] target/mips: Finish conversion to tcg_gen_qemu_{ld, st}_* Date: Fri, 5 May 2023 22:24:11 +0100 Message-Id: <20230505212447.374546-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230505212447.374546-1-richard.henderson@linaro.org> References: <20230505212447.374546-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32d.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 Message-Id: <20230502135741.1158035-6-richard.henderson@linaro.org> --- 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 {