From patchwork Thu Feb 6 11:33:12 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: 862487 Delivered-To: patch@linaro.org Received: by 2002:a5d:51d2:0:b0:385:e875:8a9e with SMTP id n18csp78700wrv; Thu, 6 Feb 2025 03:35:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWcjz+UbIkbT8AicEeru0GWc9FRfaI5v9jsHhu94dk/se8rqro8ZjOVLDIuTOLLHZ1aBRFQ8w==@linaro.org X-Google-Smtp-Source: AGHT+IFytbBRdUgZpGZKfXIpJyq4QlEzJa/kkrQ1xUHhdkkTKcy0/d4HSKyGVgN4tCf1GFUdTl8V X-Received: by 2002:a05:622a:18a6:b0:467:8765:51bb with SMTP id d75a77b69052e-4702828d326mr86786861cf.37.1738841701629; Thu, 06 Feb 2025 03:35:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738841701; cv=none; d=google.com; s=arc-20240605; b=kpK/1krVqIAtXGFX3kkXZXBMyhAoCRI0oRHjwbKYjQNNQZKW/7ySgzWz8+g5tNAkmu nqJJ8rbG/6bMBP4JJqbUrWWN2dxbxL/yV/q4SbAXshlRg13bn1C9Xk+WAKcBsfBWNxHz Fmw7kNsqPyf1GaFSsCTKNGMavSMRJ9ooeb7HkC7C6z5WvvHutD4McZkfzfiI1VZlGoWt F2lXag29SZijsPVlSeWzdLlNTuNmNjUJpyqJhD1X9/g0Fdeeq6wEktRcgmhhzg7r0LXB EdGZ7TCSx95ysxSSls7f5bI0Gn00DX/eOv+BrMu6BARZPYWQnGvFFqGKz6K7rmDgA6Go +EPw== 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:cc:to :from:dkim-signature; bh=O4Wc+wPX9caPrybWTx+kUBv1XRxmKkHkBF0nt6GWIO0=; fh=OaAHxMTARHbdOyUu0z4YVf4KWcyvjUuwMwE9k4jy3DI=; b=Bu3Mwmq96vauWCmzxjQr0mvZfDSIwohnztTlAXkiIUAc1wesMr2odOtO/m2H6kSlka fbG0zX1xtPZZSmCm3LNSOYgyjQ6+c+0YOHlZGccu7KYvZo3BquQrM1ojECBcphJvAtw9 Q+Ua5jCdGEXZ+rBD7ZIegLVXQcNy5ILjcN0XRGa5/wzscjonS3CspBl5gYRiOflQgYE4 NhLumQrbajikVzLVBzrocW2sHtgsAnQ53BxeNA1mE31LiN5Tce9jqbKcL8Zky+Q3nDze hbZFVNSboqcst6yHZXnTM45E1WN67LX1UMILWI6DDLKq8a0PaFJDwSM7aiPoNrMa0xkY JPaQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iJYlcKiV; 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-47153be463csi9174161cf.593.2025.02.06.03.35.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Feb 2025 03:35:01 -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=iJYlcKiV; 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 1tg08w-00079G-LS; Thu, 06 Feb 2025 06:34:02 -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 1tg08u-00078u-L0 for qemu-devel@nongnu.org; Thu, 06 Feb 2025 06:34:00 -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 1tg08s-0000re-MZ for qemu-devel@nongnu.org; Thu, 06 Feb 2025 06:34:00 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-38db0146117so331253f8f.3 for ; Thu, 06 Feb 2025 03:33:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738841637; x=1739446437; darn=nongnu.org; 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=O4Wc+wPX9caPrybWTx+kUBv1XRxmKkHkBF0nt6GWIO0=; b=iJYlcKiV5dbG2xBRPwzMx3xkDjdSwlyLI2RR6OHWr+KHzJ7DlhieWl/2NzVxHAGO0Y siB2kIPHVHqgPrulijugHAUJqw8TYgBFSIlI1z5DVqIppVYzmI2kdew/zgBP2MuNZKaA qb6rscahlCElfurDi0ywv0dYlB7IJEHWzAv77qxv3SuN/u1DZLX1tNOKad6cbxi97NGU XamxZGgg95ZVUL7LTtaCFHyPicPs9cgiMWtrrVNfR7cIS/o6QIe34uEIkiRiYXHXDDD4 cmiz7hetPfX79Iam8Pdu6ZSvWRUMWYYF0a3qhkTngGPHT9Th9hTqrrr/PXN/k2g5P7CF gReA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738841637; x=1739446437; 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=O4Wc+wPX9caPrybWTx+kUBv1XRxmKkHkBF0nt6GWIO0=; b=ExNrONFHgqwsRKkXiKQkuPnrJYvujHj4Y44CN1w0QFFcQPBCOZ0Yd1+Mbvb1Y63lp5 NlBWLqU7XJg61PaDsp6ZujCy3rS+SJYcxu8uvouDUqzlovo+qw1SS/MobEw3HVJzQsDt ffKUBpTUXCYGNV+7qd+49CbkFFomRZjWnR2n3YfEmymEvel6Hkd8BeUUGzFEN77/7M4w yOubztGDPbUYQt1VK+/ZYlE8mdENHyiRqAyn3Dz7rK5rbjMEuixsJAi55uHhPsbtal+6 AbEzraisyNSA8L0jNfZnVeWDnU13zODWr550CsouvCp6/3TP8BnKPtK6giV61Ku0MYA6 4OTQ== X-Gm-Message-State: AOJu0Yz+GxbLiStM5f5FijZLfkzjEbNFVkyV1qvO/xeBA1bc+RQvjdxA U8HyEL0ISFHDwXrRuKRTcsKKFinXU93Tq8fisPy0iwHQK6VjeAG5vRvIVjajBNc8w/y0gD7LMPZ /Z6E= X-Gm-Gg: ASbGnctWpBw2r5tZexqZydmn47ziM82LSuQD11ybNMOzeVT6JnMa8uX4N9tiwxSUr9T Krs1XYe+MMrnuxcSh81vx9AaVwLEss/UGLg+tHkZI2IoKYa1hUzqDOgQrPuJqpIT5aPTTUFHKTD xtfLLZdpnaD7Sp9dPSJMLSUxacRg8fsTvYUiJRg+dMCprA5YNcd5QzsSJwKbwLJeIvDCec+fjLN 16WAfE0HqPOpQpJzD84Mj+u5oIpAvio036U9Kox81O9ADZcJox6hp8Mxj4rPpJwyda13XoF4rwm 3+utZ7c6tddMq/16YiV7ODjHinmLkoXxkta8SK8HlMQYaaGGyWceQ0hqwuPrHpwZcw== X-Received: by 2002:a05:6000:1fae:b0:38d:bf09:aa2b with SMTP id ffacd0b85a97d-38dbf09adb7mr1007083f8f.54.1738841636836; Thu, 06 Feb 2025 03:33:56 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4391dca34a8sm16320255e9.16.2025.02.06.03.33.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 06 Feb 2025 03:33:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Alistair Francis , Richard Henderson , Thomas Huth , Jason Wang , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Alistair Francis Subject: [PATCH v4 07/16] target/microblaze: Explode MO_TExx -> MO_TE | MO_xx Date: Thu, 6 Feb 2025 12:33:12 +0100 Message-ID: <20250206113321.94906-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250206113321.94906-1-philmd@linaro.org> References: <20250206113321.94906-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 --- 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);