From patchwork Wed Mar 12 10:32:37 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: 872829 Delivered-To: patch@linaro.org Received: by 2002:a5d:64e7:0:b0:38f:210b:807b with SMTP id g7csp203206wri; Wed, 12 Mar 2025 03:33:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXL0jbmJAhBhNKfDCGVyjjk3rMtjTDBQcYmh9j+ubxdYlDqZh7BcGb5XDUC4jwgLPmpI/2hNA==@linaro.org X-Google-Smtp-Source: AGHT+IHK+aW+OjwpvRFEaYQFgmWky5S1q2AAvsTC+cJY6gEyYE4So+AzcmFo4cKf/l9xkECfAMUY X-Received: by 2002:a05:6214:1d24:b0:6e8:fa33:2964 with SMTP id 6a1803df08f44-6e90061c0e4mr283450506d6.10.1741775634162; Wed, 12 Mar 2025 03:33:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741775634; cv=none; d=google.com; s=arc-20240605; b=exLmuRQtuGrqfDYS3oGcIDTb0yc2XgMLn+LbD1aV4ERoZWqPmf4L9a9ilszNLkcuZk OeXg+lyYtYJYsGE21NF1CGCxIoRqj3xhFS41Kl1ICIn51iJ0XeB0GtbXS/2c7AHyOSBB 3mCtw54NAhai8nvw8Lb6U8TYo4hMwBzEuQ860spLq0UB0fXA3qdBnAqyDvDEzSzis6Sx 7mrMvYfIDO3Zmqzz+6KAsxb8xgIYwgScwuNMT8oxkeBJSNULtQ6Z0AdP1HM1kwdt2uuW tewJ4KK4xLTMhrC5BVdCbnjZgLMWaK1WAMp6UXd4VG8BPnatitEDAEvyTV+lIy7aeNiW Ww8g== 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=LkP/pXjo/XxmCPoswMyWGaFDc36zdsHqloQVUCzlEHY=; fh=LQlEdve26kxL7WUet+VlZ271EMbihdfIgvHvg+14QEo=; b=UMscU0Fn/wSzDziylLk7D2O6LPhG5508EWViW7ZPCkTrLQ4Wsa/F1iAlCSXMwA7QTU w+Qpmbpa367lg0oT0JqdpnCo9yTemtT+HsPbEnt6tDIVS65gRTyKuhI2tr3ax9NbKm/a +sxFeD6mqryf+NIXGd9OLHHtHUx2PVWGhVspF7M8VNYN0t0K5T8akhkcGw6G2hhtO1mx Yq2G/0qbWRW9pOrBLIoiqYNa3IV9BRJF2L642RjLFH4sqOSSKfO6O3b0Y2JApSC12z7c 8AXf8pQk4wQCJjQWfckfeuI/G5edR/rite8lTlPVEdoXMz5PhNxKM1oOC9sa+AB2Omdp 3U6w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uu6Bn7s0; 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 6a1803df08f44-6e8f709098esi128614516d6.105.2025.03.12.03.33.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Mar 2025 03:33:54 -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=uu6Bn7s0; 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 1tsJOu-0000wr-BG; Wed, 12 Mar 2025 06:33:29 -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 1tsJOO-0000nh-Mg for qemu-devel@nongnu.org; Wed, 12 Mar 2025 06:32:56 -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 1tsJOK-00023S-Oz for qemu-devel@nongnu.org; Wed, 12 Mar 2025 06:32:50 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43d0c18e84eso2151015e9.3 for ; Wed, 12 Mar 2025 03:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741775566; x=1742380366; 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=LkP/pXjo/XxmCPoswMyWGaFDc36zdsHqloQVUCzlEHY=; b=uu6Bn7s08L4TpJgQGHubZz5K9Aq5RBjeVbhJBaUYNoZc+zQK6xlNeLdHUt8Am91DD8 Y0gy64UZI4WBJz3F4psBeAQd8+teVjD0y0MgB6yZjRu7E5aU+wjRXPcTmcoVFucEWvRs AZqymYWWYlH40/KyaHMmjjZkHSTXAGUWom44OFg9Dc5gumQP4VhBmrFB7XdHY3xkx6pH /99rcRs95A+rBkOBx5rCRqvxi2YKfTRNyN5qqbyzN0t41KJweFy8J25bghJLEQKyrVlP IHYE3s+2CanE8Tr2rOELaIpTSN0b1WcGFyQeoO3Le9xuXaAvHkQ1k/NY4cne/+CRki+i llBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741775566; x=1742380366; 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=LkP/pXjo/XxmCPoswMyWGaFDc36zdsHqloQVUCzlEHY=; b=dMUrlf5ZalmBGFkLO3PN4+L7ppPv6JqbhcKhWf3TuJYiIuMFwsE/rS0gf8kNI7Ymo+ 3s4YJO9Ejvy9VtSVnkGmuM34HL3FZspcMq+Mlc0z7T5eyxdTNs9poPq3uE5qMUPK9Tpl FUXfMe8FFsJARNK3eFvSuTZAjdXeJorUjPVtIOvBsCncgPKcIsULGG9a7b/ZWtlhOM/x 9UOblD2WBBzI6XKUXiwrov1+ol6/E1Xu64vG80pn4uGx1MsAXSTPAQw4vdZvtXMM/MBS zUKKTLc80DkaoVzhxkwrRIaTgAH0OVmEKsXRfeyBCaBYNJEVHSX+yDBDUmv/ZHDxfxcz /yMg== X-Gm-Message-State: AOJu0Yyl1YEBIKyPLVFqAzKxAk61C2ivFiDPi3Gvs5sdoZHLYfnKBOqX gNSk8U3Xywym6sn2ngWTVQUCQLytQgTFhvglsoA6/7VSn0KiheV+8tb9wo+KBEUST84rlKIoKWt s X-Gm-Gg: ASbGncte17VF6X+B2uw5En4E6zMaJEQOIBFjWFn/Z7aVpVGGU02dLipkeljy5fI9AtO xGrmpvzU9RICur91E1a4QCe6MThcI6h4yKfuCaDG7pyW0jey0lm3VN7t19NG6gtBfWr1bvbNnuX xjDA/ftidTcyfmuaEDR1FTt/4/AUMct4MHFKF9rfoouQT/pSmnTVd8tp1apJ4HngjdS36tHuTcW uSv3+vL7/UXfSVQAg9mpSa8JkjHn3XrHdH8VHq2NzSBYPkD1EfDJj4NQ5U2nsa1a0dV839K5a5g 9tayyqe+P4SDfbH0iwmp6EjCl3nGOf+s8o2hTsmA7ia9nVEkpBGGtSDHJX+Z7p1NpHPkXypJ/nI Cjm6NRTWmZJMpJg== X-Received: by 2002:a05:600c:45d1:b0:43b:c878:144c with SMTP id 5b1f17b1804b1-43c5a60186emr163166895e9.12.1741775566363; Wed, 12 Mar 2025 03:32:46 -0700 (PDT) Received: from localhost.localdomain (99.167.185.81.rev.sfr.net. [81.185.167.99]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3947a24449bsm1360927f8f.45.2025.03.12.03.32.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Mar 2025 03:32:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Brian Cain , Anton Johansson , Alessandro Di Federico , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 1/2] target/hexagon: Explode MO_TExx -> MO_TE | MO_xx Date: Wed, 12 Mar 2025 11:32:37 +0100 Message-ID: <20250312103238.99981-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250312103238.99981-1-philmd@linaro.org> References: <20250312103238.99981-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@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 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 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/hexagon); \ done Signed-off-by: Philippe Mathieu-Daudé --- target/hexagon/macros.h | 10 +++++----- target/hexagon/genptr.c | 8 ++++---- target/hexagon/translate.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index ee3d4c88e7b..57825efa55d 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -115,27 +115,27 @@ #define MEM_LOAD2s(DST, VA) \ do { \ CHECK_NOSHUF(VA, 2); \ - tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TESW); \ + tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TE | MO_SW); \ } while (0) #define MEM_LOAD2u(DST, VA) \ do { \ CHECK_NOSHUF(VA, 2); \ - tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TEUW); \ + tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TE | MO_UW); \ } while (0) #define MEM_LOAD4s(DST, VA) \ do { \ CHECK_NOSHUF(VA, 4); \ - tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TESL); \ + tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TE | MO_SL); \ } while (0) #define MEM_LOAD4u(DST, VA) \ do { \ CHECK_NOSHUF(VA, 4); \ - tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TEUL); \ + tcg_gen_qemu_ld_tl(DST, VA, ctx->mem_idx, MO_TE | MO_UL); \ } while (0) #define MEM_LOAD8u(DST, VA) \ do { \ CHECK_NOSHUF(VA, 8); \ - tcg_gen_qemu_ld_i64(DST, VA, ctx->mem_idx, MO_TEUQ); \ + tcg_gen_qemu_ld_i64(DST, VA, ctx->mem_idx, MO_TE | MO_UQ); \ } while (0) #define MEM_STORE1_FUNC(X) \ diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 2c5e15cfcf6..561e93c9fd4 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -329,14 +329,14 @@ void gen_set_byte_i64(int N, TCGv_i64 result, TCGv src) static inline void gen_load_locked4u(TCGv dest, TCGv vaddr, int mem_index) { - tcg_gen_qemu_ld_tl(dest, vaddr, mem_index, MO_TEUL); + tcg_gen_qemu_ld_tl(dest, vaddr, mem_index, MO_TE | MO_UL); tcg_gen_mov_tl(hex_llsc_addr, vaddr); tcg_gen_mov_tl(hex_llsc_val, dest); } static inline void gen_load_locked8u(TCGv_i64 dest, TCGv vaddr, int mem_index) { - tcg_gen_qemu_ld_i64(dest, vaddr, mem_index, MO_TEUQ); + tcg_gen_qemu_ld_i64(dest, vaddr, mem_index, MO_TE | MO_UQ); tcg_gen_mov_tl(hex_llsc_addr, vaddr); tcg_gen_mov_i64(hex_llsc_val_i64, dest); } @@ -756,7 +756,7 @@ static void gen_load_frame(DisasContext *ctx, TCGv_i64 frame, TCGv EA) { Insn *insn = ctx->insn; /* Needed for CHECK_NOSHUF */ CHECK_NOSHUF(EA, 8); - tcg_gen_qemu_ld_i64(frame, EA, ctx->mem_idx, MO_TEUQ); + tcg_gen_qemu_ld_i64(frame, EA, ctx->mem_idx, MO_TE | MO_UQ); } #ifndef CONFIG_HEXAGON_IDEF_PARSER @@ -1230,7 +1230,7 @@ static void gen_vreg_load(DisasContext *ctx, intptr_t dstoff, TCGv src, tcg_gen_andi_tl(src, src, ~((int32_t)sizeof(MMVector) - 1)); } for (int i = 0; i < sizeof(MMVector) / 8; i++) { - tcg_gen_qemu_ld_i64(tmp, src, ctx->mem_idx, MO_TEUQ); + tcg_gen_qemu_ld_i64(tmp, src, ctx->mem_idx, MO_TE | MO_UQ); tcg_gen_addi_tl(src, src, 8); tcg_gen_st_i64(tmp, tcg_env, dstoff + i * 8); } diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index fe7858703c8..0e1183836ca 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -656,17 +656,17 @@ void process_store(DisasContext *ctx, int slot_num) case 2: tcg_gen_qemu_st_tl(hex_store_val32[slot_num], hex_store_addr[slot_num], - ctx->mem_idx, MO_TEUW); + ctx->mem_idx, MO_TE | MO_UW); break; case 4: tcg_gen_qemu_st_tl(hex_store_val32[slot_num], hex_store_addr[slot_num], - ctx->mem_idx, MO_TEUL); + ctx->mem_idx, MO_TE | MO_UL); break; case 8: tcg_gen_qemu_st_i64(hex_store_val64[slot_num], hex_store_addr[slot_num], - ctx->mem_idx, MO_TEUQ); + ctx->mem_idx, MO_TE | MO_UQ); break; default: {