From patchwork Thu Apr 17 13:10:00 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: 881854 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp306479wrs; Thu, 17 Apr 2025 06:11:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXl3VxnrW6IFDE1ZwbxFrFIokoCpmG2KQo3w785rv/iU/7rBq91OZ8/5/xa+wzWtU52gzXrjQ==@linaro.org X-Google-Smtp-Source: AGHT+IEpGB8BhwORKJ0Io6K/GVmVCSl+wJqSfBBo8jepcPWtPzfK8ZasTCzV8Xy0jmGHHu0SE6cc X-Received: by 2002:ad4:5e8b:0:b0:6d8:b115:76a6 with SMTP id 6a1803df08f44-6f2b2df3612mr85619596d6.0.1744895476557; Thu, 17 Apr 2025 06:11:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744895476; cv=none; d=google.com; s=arc-20240605; b=T2ZDqxn+IvEMZNgovi77qGVGdEcu4xhZcv5YRJ8fLn8PbgYNXxRSq7jR5etDmHB9zs OQnmZNw+YzhGRtzMbUABRax5PaicOl2EEwitfKavIy0MoiBA0Zgz+o0Mdsg8DsySwAtM 4I52MK0OO/W8rXJha81Cd8p2hZSgiNaKfsSfymVDr3q83O1CircPcnHapABnUL9Ndxge Z7m6byk2ap4JAV8CqTOOlSWCNMLlXdbO6aGLteHLwa2QXH299JkdXzQVf8/b2r+M5jwD J6kNlhGmH5c526xzowXD7SgM+wYNyTS3ewyM54AUlLCSbnj76fov+N1VF/Yvrmp3bZJX hq/Q== 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=PXZTsvplbDk/j8Hq5OCc8Z4OLE0QxnnIYztC0n6Y2e8=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=YjUgHa5+e423DOFrPV7mUH5k2ZW/rBhZNWckFTnhI1z322Hcn/ZuxfopwFG+KdFTsb V8NguiQ75BdhFIBss8fWaTZKZEq8uDmB6Slzd5u2XfQI+Po+aBtOaHXURaWZrJTI9F4m OJz64Tt5RdDHeJKN4Qsm3TVRq+22hqaIW+uv37nRLI2cT4p1WpH3LH18mQFbAu20e03P NXXR0oRVKj11/N4ermf7aSeVSP3Xv/DkchZ4L4FaVCaDYcY4ld8+j1uS4fNKud83ifOz F/gfwlsjbpr/vkvrrRZIYhUFBb2oNQHmcZdQr2SUkCW3MfjCJJxOhrIUWRb92b9WM4ra 0OlA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fHpY5MwL; 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-6f2b09f73besi42596976d6.285.2025.04.17.06.11.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 06:11:16 -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=fHpY5MwL; 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 1u5P1C-0005k7-1p; Thu, 17 Apr 2025 09:11:05 -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 1u5P0g-0005Xu-Q5 for qemu-devel@nongnu.org; Thu, 17 Apr 2025 09:10:31 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5P0d-0007w2-Kh for qemu-devel@nongnu.org; Thu, 17 Apr 2025 09:10:29 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3914aba1ce4so544983f8f.2 for ; Thu, 17 Apr 2025 06:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744895425; x=1745500225; 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=PXZTsvplbDk/j8Hq5OCc8Z4OLE0QxnnIYztC0n6Y2e8=; b=fHpY5MwLdE931IqqQvYrR+Fre+zvKqtHg5fQjnq8INE62vA79rBMYg63bVtpzt1Z7d gCmXnCldGy+0AEgA5EudAY1LuEE19f++4nCnF+uDH/e0d2tQUngSmJTMLOk68K6w+YNL Zcg4Z629XjN4Xnbkbj47/pHn4wIHDacXgx+a88tCxXsPB3EzM+sbigHfZXA/6i320rfh 6XTq8NL990D70MZ7UhX+rAPbkM+rPLtFgfXNw/Zh+ESD2WbsxW/52a4LJJCGthlLie31 /atZprsR9VcqjSM5NvbQy3ydRGvGiu/B4Zmwe5AQAub2aYTtJsasKYIbOD96sjfPAf4x Z2EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744895425; x=1745500225; 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=PXZTsvplbDk/j8Hq5OCc8Z4OLE0QxnnIYztC0n6Y2e8=; b=F3FnpyqD08szY2Suw0TGoYgo31bwmoyZW8BAKzvn0WdYAmYgygZx+kCfkazoGimzV8 d6+++xh8IK0hvotmUKQSVdgBjnmmVKR9HGnmLMlZ/Squ1xZJks4+r8+roi2xzbEfpajg qHwXYFt/0qGU7w58WVpESzgBwRSGFB+cjOPK+ll0lFP4TrlvPEzT6LxvqljJEQFEHMDE UKehL8g7pSZrlGnOww17xxEMG6H+dfiTtIAOdLWFWdNCFh8stEz8tkjRbh0t1DG4tKgz kzCsm7tCJNQlp+LTuQ9jcMOQ66RzXkStXI6NRwSTooqumdnsiHBVnqlm1jJrNa38JO+A JGBQ== X-Gm-Message-State: AOJu0YzJWNylPAC8EiHWo8qj3dDiP5/BoziN3uFxJUKuhEcnfVtzRDIi wOzCJXOrpLmO5kuWaD7tJ83n4xR6a2U2OoYy/qddBzer1RdqyXRUlkW+lrX140IegWdHV4MNgic s X-Gm-Gg: ASbGncs9opRa2fFosCl2UieaGUsAsHBdK5BIo75vk0J/hXpXowOqAsrQnixqZgvixqr Bq14MtG6lJNQfPkkTQdQx+bIVUvs8dDLiAN6yCGW3nWlb4xIXjToXINiU09vzytdaFcKGkefnRP zPjd//Xk0XvIiTuGBZjWg0HWIAItX6DZjdsnbBR6px0qjzJe8eHmoK31dMY8Fq+m42c4aXoQkTx GCEB7ah2+jSog3mVSVuy6sHFApel8P+29llnRDsQNbem7M034nyCrHXJ80fuNN7Td/65H+3E6fi yb28ctDIpYn9NtiUqXLrLDC3FSTG5rd9YWvrDCUX0QRzpTkq+ZGl0xSCBT0hy7B07XJZz3z6aPU th81whPup+cfZG7I= X-Received: by 2002:a5d:64e2:0:b0:39d:724f:a8a0 with SMTP id ffacd0b85a97d-39ee5ba03e4mr4945023f8f.58.1744895424613; Thu, 17 Apr 2025 06:10:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4405b50b897sm53357105e9.26.2025.04.17.06.10.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 06:10:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH 4/8] target/ppc: Evaluate TARGET_BIG_ENDIAN at compile time Date: Thu, 17 Apr 2025 15:10:00 +0200 Message-ID: <20250417131004.47205-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417131004.47205-1-philmd@linaro.org> References: <20250417131004.47205-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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 Rather than evaluating TARGET_BIG_ENDIAN at preprocessing time via #ifdef'ry, do it in C at compile time Signed-off-by: Philippe Mathieu-Daudé --- target/ppc/cpu_init.c | 12 ++++++------ target/ppc/mem_helper.c | 6 +----- target/ppc/translate.c | 6 +----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 077991ed535..bbab411a07c 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7262,14 +7262,14 @@ static void ppc_cpu_reset_hold(Object *obj, ResetType type) #if defined(TARGET_PPC64) msr |= (target_ulong)1 << MSR_TM; /* Transactional memory */ #endif -#if !TARGET_BIG_ENDIAN - msr |= (target_ulong)1 << MSR_LE; /* Little-endian user mode */ - if (!((env->msr_mask >> MSR_LE) & 1)) { - fprintf(stderr, "Selected CPU does not support little-endian.\n"); - exit(1); + if (!TARGET_BIG_ENDIAN) { + msr |= (target_ulong)1 << MSR_LE; /* Little-endian user mode */ + if (!((env->msr_mask >> MSR_LE) & 1)) { + fprintf(stderr, "Selected CPU does not support little-endian.\n"); + exit(1); + } } #endif -#endif #if defined(TARGET_PPC64) if (mmu_is_64bit(env->mmu_model)) { diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index d7e8d678f4b..cc3ed29a35b 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -32,11 +32,7 @@ static inline bool needs_byteswap(const CPUPPCState *env) { -#if TARGET_BIG_ENDIAN - return FIELD_EX64(env->msr, MSR, LE); -#else - return !FIELD_EX64(env->msr, MSR, LE); -#endif + return TARGET_BIG_ENDIAN ^ FIELD_EX64(env->msr, MSR, LE); } /*****************************************************************************/ diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 399107d319a..828b850b40e 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -213,11 +213,7 @@ struct DisasContext { /* Return true iff byteswap is needed in a scalar memop */ static inline bool need_byteswap(const DisasContext *ctx) { -#if TARGET_BIG_ENDIAN - return ctx->le_mode; -#else - return !ctx->le_mode; -#endif + return TARGET_BIG_ENDIAN ^ ctx->le_mode; } /* True when active word size < size of target_long. */