From patchwork Thu Mar 6 15:47:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 870862 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp335761wri; Thu, 6 Mar 2025 07:59:41 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXaalY6GC2EsIL9ywxdaSrwz0BLq/UfhjTJy3rHLDkT44O5hf276k/z+vgdgHYRnzGRdUOjAw==@linaro.org X-Google-Smtp-Source: AGHT+IGFhqzJLeTuWHosVK2SmRzhdjthQQvoML0381Pw5aBJe0MCf/Zhr1HZ+URmqj/DNh1qHq94 X-Received: by 2002:a05:622a:1a1e:b0:475:5f2:d445 with SMTP id d75a77b69052e-4750b442ef5mr95030011cf.19.1741276781766; Thu, 06 Mar 2025 07:59:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741276781; cv=none; d=google.com; s=arc-20240605; b=jTyywJyzpe2UBu89Ylcy3aCzg5XfwbRIqq98n5ppe/iEhRm0dlNL17XbQQmxfGOqQC HE/q3zTuAbyUro084GwzmvJzSVtRGnNabqQ9IX1RYB8xbvANRj0K7CTYn1Cg+ujXSM90 UU0SEj1xFMHOLQUMUbLf+rxg1I4G+YpMpeNw14FKCXeR07ZXwStBQvcAsoqZAhaAwYiI gJFdMPBrHuTa0RsK4KJEwUErnkS5H8APxsH8DjN1UQ95ge0A13sksK9zr4MnB01op+kr SW43iAZuBkjw1ybDCWW6ThQ8eTmmx78u72CX71gbnc0HDb3Q+GPl7i5y7ybPDxBpK8Au W5Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=c1VlvOtxLHbEwfuyvRPb+ktDAXmv1s+XhzIa2Um25I8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=EKIVU9R+WD7L8xFbmG3Fg/mQGu5QJvHv7nKpYZmqkpagmnS1eRRE29b/qKxbpvx9qM zh4bHDQwo7vzwBsCcu8AGAbtUW2B52PgfkqoSi98uXe3Q2Q8nP3/NCZeKO0YR3WWx1BZ VQJ1fjAp1rbb0UMN8OI9/n+qEJP6zbuA7KUEn1c1W+TsGeM6zR+jzpHt9/RPpkzey89I bXatcf6MxJPUH5uP8xL02zUEb0rHYjnlCOeOMmQRmRXWoCaNyRxj7WVaWa2misNmQlBK VdzfkqMNpLyMVXWcrNYfObbSZhSvR5zliqj9TwJnsWJpxUEY0nXraIKS1DQXYgqQhtzJ 5cyA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UmD5xqVi; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4751daf8e33si14120461cf.240.2025.03.06.07.59.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Mar 2025 07:59:41 -0800 (PST) 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=UmD5xqVi; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqDU0-0002Yu-Hg; Thu, 06 Mar 2025 10:50:01 -0500 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 1tqDTe-0000kn-VU for qemu-devel@nongnu.org; Thu, 06 Mar 2025 10:49:40 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqDTd-0006Oe-4U for qemu-devel@nongnu.org; Thu, 06 Mar 2025 10:49:38 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3912c09bea5so643727f8f.1 for ; Thu, 06 Mar 2025 07:49:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741276175; x=1741880975; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=c1VlvOtxLHbEwfuyvRPb+ktDAXmv1s+XhzIa2Um25I8=; b=UmD5xqViltVPiOVNYS5sqGi7eZ3XrLY+3Ut07Vmc/syZvPvLKdTBJ4QEmWkKFwMEzm sbo539BQ64vmDS94wESeTg82zVsFdRh9YUlUeRSSJesh/4nTI/+5cO/PTwYhVrJP6JiF k352JlV16pmr/+b9ssm4dgo5RITqSm+heHh99hCtRaTJulNbcBWIUAKPOKmHXPzS08Q+ 3bY0Dy7Q86mq9knkOtdfUqEaed4QmJ9mU/Ag5YzyWYHO8svqb+lr1ilymtPMx4XpBQVW pOpm5/3AFzQmpC2cWHXoe6hciEuPpbqv0OfBrfZPqSJ2bDDnGUfJ6BpiKm5IYZnCQ6Cz 9RYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741276175; x=1741880975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c1VlvOtxLHbEwfuyvRPb+ktDAXmv1s+XhzIa2Um25I8=; b=D56bmfnTzBKPeOblg3uPVqxKSIann4gcxisUR4DgkvOOy/j/ymeY44F/cg+NmRw4v7 p6TI+cvLp+6DkFEbE9dROErlJHydcCQzQLkNOl2EECQL9l7Z8F7I/9S8wWY3BpFa89fT uAPf68Hf5wKjIhxs9i4Qae7JhdH1H+xGo2mXAxsTXMfz2AoHvwd1f7LA98UlT1nJge7v 8gUjOcekIqBCZbOn9nGBE1o3GlVyruaHthkvh2QyEr+Z8MY7JbjLS+4ux/tVySy5cZYS nnX2mAREJoYaF5M8r/VsannctJqKIsSIslZZmXoFXjTME7ljwVrPsUB294fWMOeqZr4l OIrQ== X-Gm-Message-State: AOJu0YwZ9UvOC8ppmM8MST24b4St+G2You80z5cbTWONv5i8Ipaeypob v3DnzBdk42yUcV00qAkiic9LF6kP5Zo2S+/SRpVudyNse5VPvBOjR/Ss9Dahol9gW8ALVavf4D6 5DBc= X-Gm-Gg: ASbGncuFwEm6lc9Gk83lFqEfix9x/SGcehtX+dAwkoY2gkUk+1HvOQXuH34vfUm62uv 0H4TXOu2hMprI4hI9fqj4Yccc28QZYVrKgbC2CnQrqQL1yoHwvf/rCw5KKUDhVtb0YqgICelaFV eM7/8Pqj6svdFBQe7X3puSOeFmdyXkzYwzzCgBgVdfS6sITKD2Y+tV6ingw/lfzp69Zdt7nuo0a lbflW9ElCwSfv8ECGHAzeIGn7/lIF28PCnYDii77zMNoO1oaCAfYQ7f4PibhGKDaET5I8Y5wrbe /5pnY2ijYpPM6p3egiEzS/mPPTKJIDbHHGq2Z1kcZ7Knf//bYd2DviGKPu9ee/TiNyNGZlYNQpk JuHedCAoXy4lODCycE6g= X-Received: by 2002:a5d:6d83:0:b0:391:2a9a:478c with SMTP id ffacd0b85a97d-3912a9a491dmr3042976f8f.23.1741276175205; Thu, 06 Mar 2025 07:49:35 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfdfe61sm2440970f8f.38.2025.03.06.07.49.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 06 Mar 2025 07:49:34 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 26/54] target/microblaze: Explode MO_TExx -> MO_TE | MO_xx Date: Thu, 6 Mar 2025 16:47:08 +0100 Message-ID: <20250306154737.70886-27-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250306154737.70886-1-philmd@linaro.org> References: <20250306154737.70886-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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 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 Extract the implicit MO_TE definition in order to replace it by runtime variable in the next commit. Mechanical change using: $ for n in UW UL UQ UO SW SL SQ; do \ sed -i -e "s/MO_TE$n/MO_TE | MO_$n/" \ $(git grep -l MO_TE$n target/microblaze); \ done Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis Message-Id: <20241105130431.22564-14-philmd@linaro.org> --- target/microblaze/translate.c | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 24005f05b21..86efabb83b5 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -780,13 +780,13 @@ static bool trans_lbui(DisasContext *dc, arg_typeb *arg) static bool trans_lhu(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_load(dc, arg->rd, addr, MO_TEUW, dc->mem_index, false); + return do_load(dc, arg->rd, addr, MO_TE | MO_UW, dc->mem_index, false); } static bool trans_lhur(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_load(dc, arg->rd, addr, MO_TEUW, dc->mem_index, true); + return do_load(dc, arg->rd, addr, MO_TE | MO_UW, dc->mem_index, true); } static bool trans_lhuea(DisasContext *dc, arg_typea *arg) @@ -798,26 +798,26 @@ static bool trans_lhuea(DisasContext *dc, arg_typea *arg) return true; #else TCGv addr = compute_ldst_addr_ea(dc, arg->ra, arg->rb); - return do_load(dc, arg->rd, addr, MO_TEUW, MMU_NOMMU_IDX, false); + return do_load(dc, arg->rd, addr, MO_TE | MO_UW, MMU_NOMMU_IDX, false); #endif } static bool trans_lhui(DisasContext *dc, arg_typeb *arg) { TCGv addr = compute_ldst_addr_typeb(dc, arg->ra, arg->imm); - return do_load(dc, arg->rd, addr, MO_TEUW, dc->mem_index, false); + return do_load(dc, arg->rd, addr, MO_TE | MO_UW, dc->mem_index, false); } static bool trans_lw(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_load(dc, arg->rd, addr, MO_TEUL, dc->mem_index, false); + return do_load(dc, arg->rd, addr, MO_TE | MO_UL, dc->mem_index, false); } static bool trans_lwr(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_load(dc, arg->rd, addr, MO_TEUL, dc->mem_index, true); + return do_load(dc, arg->rd, addr, MO_TE | MO_UL, dc->mem_index, true); } static bool trans_lwea(DisasContext *dc, arg_typea *arg) @@ -829,14 +829,14 @@ static bool trans_lwea(DisasContext *dc, arg_typea *arg) return true; #else TCGv addr = compute_ldst_addr_ea(dc, arg->ra, arg->rb); - return do_load(dc, arg->rd, addr, MO_TEUL, MMU_NOMMU_IDX, false); + return do_load(dc, arg->rd, addr, MO_TE | MO_UL, MMU_NOMMU_IDX, false); #endif } static bool trans_lwi(DisasContext *dc, arg_typeb *arg) { TCGv addr = compute_ldst_addr_typeb(dc, arg->ra, arg->imm); - return do_load(dc, arg->rd, addr, MO_TEUL, dc->mem_index, false); + return do_load(dc, arg->rd, addr, MO_TE | MO_UL, dc->mem_index, false); } static bool trans_lwx(DisasContext *dc, arg_typea *arg) @@ -846,7 +846,7 @@ static bool trans_lwx(DisasContext *dc, arg_typea *arg) /* lwx does not throw unaligned access errors, so force alignment */ tcg_gen_andi_tl(addr, addr, ~3); - tcg_gen_qemu_ld_i32(cpu_res_val, addr, dc->mem_index, MO_TEUL); + tcg_gen_qemu_ld_i32(cpu_res_val, addr, dc->mem_index, MO_TE | MO_UL); tcg_gen_mov_tl(cpu_res_addr, addr); if (arg->rd) { @@ -930,13 +930,13 @@ static bool trans_sbi(DisasContext *dc, arg_typeb *arg) static bool trans_sh(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_store(dc, arg->rd, addr, MO_TEUW, dc->mem_index, false); + return do_store(dc, arg->rd, addr, MO_TE | MO_UW, dc->mem_index, false); } static bool trans_shr(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_store(dc, arg->rd, addr, MO_TEUW, dc->mem_index, true); + return do_store(dc, arg->rd, addr, MO_TE | MO_UW, dc->mem_index, true); } static bool trans_shea(DisasContext *dc, arg_typea *arg) @@ -948,26 +948,26 @@ static bool trans_shea(DisasContext *dc, arg_typea *arg) return true; #else TCGv addr = compute_ldst_addr_ea(dc, arg->ra, arg->rb); - return do_store(dc, arg->rd, addr, MO_TEUW, MMU_NOMMU_IDX, false); + return do_store(dc, arg->rd, addr, MO_TE | MO_UW, MMU_NOMMU_IDX, false); #endif } static bool trans_shi(DisasContext *dc, arg_typeb *arg) { TCGv addr = compute_ldst_addr_typeb(dc, arg->ra, arg->imm); - return do_store(dc, arg->rd, addr, MO_TEUW, dc->mem_index, false); + return do_store(dc, arg->rd, addr, MO_TE | MO_UW, dc->mem_index, false); } static bool trans_sw(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_store(dc, arg->rd, addr, MO_TEUL, dc->mem_index, false); + return do_store(dc, arg->rd, addr, MO_TE | MO_UL, dc->mem_index, false); } static bool trans_swr(DisasContext *dc, arg_typea *arg) { TCGv addr = compute_ldst_addr_typea(dc, arg->ra, arg->rb); - return do_store(dc, arg->rd, addr, MO_TEUL, dc->mem_index, true); + return do_store(dc, arg->rd, addr, MO_TE | MO_UL, dc->mem_index, true); } static bool trans_swea(DisasContext *dc, arg_typea *arg) @@ -979,14 +979,14 @@ static bool trans_swea(DisasContext *dc, arg_typea *arg) return true; #else TCGv addr = compute_ldst_addr_ea(dc, arg->ra, arg->rb); - return do_store(dc, arg->rd, addr, MO_TEUL, MMU_NOMMU_IDX, false); + return do_store(dc, arg->rd, addr, MO_TE | MO_UL, MMU_NOMMU_IDX, false); #endif } static bool trans_swi(DisasContext *dc, arg_typeb *arg) { TCGv addr = compute_ldst_addr_typeb(dc, arg->ra, arg->imm); - return do_store(dc, arg->rd, addr, MO_TEUL, dc->mem_index, false); + return do_store(dc, arg->rd, addr, MO_TE | MO_UL, dc->mem_index, false); } static bool trans_swx(DisasContext *dc, arg_typea *arg) @@ -1015,7 +1015,7 @@ static bool trans_swx(DisasContext *dc, arg_typea *arg) tcg_gen_atomic_cmpxchg_i32(tval, cpu_res_addr, cpu_res_val, reg_for_write(dc, arg->rd), - dc->mem_index, MO_TEUL); + dc->mem_index, MO_TE | MO_UL); tcg_gen_brcond_i32(TCG_COND_NE, cpu_res_val, tval, swx_fail);