From nobody Wed May  7 21:25:02 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass(p=none dis=none)  header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1651747521; cv=none;
	d=zohomail.com; s=zohoarc;
	b=AaWxyvnPDaRuG4ldKOb/C2mj0Q/zOffBy/dRGp7gtAhKgBA6pLfofbzeY8SX+r6jBqlecEzJR4S6Vj2zQ7JdwKUeTwGm9Aic4xXtu5t4WwJfApgUUejMngFEoL2XObKIXGV6qcmM9L//U7Ur62aTi1AgMjGstI8DaHFapPJuubw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1651747521;
 h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=lUUUty35mHrdlwzzNpzWoTHLJi4hbdRcoTC6a1ASl1U=;
	b=a1UUVe4K8tDxc8mQ1Yh4mU7HugFllTBRIDD0ZYRO2aZVIFIxkpO2zTKwEXqVtuHMrfTZzzHZPDp1MBsgX7NXAYFccWHyICg9P6S3Lar6g/g8DDw7aWWjou2eQ7kGXwO/OAHKe9adt+JoRYHPftmC2E1IhmZAcp/jd5FA/61LVm0=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1651747521757978.9344319318839;
 Thu, 5 May 2022 03:45:21 -0700 (PDT)
Received: from localhost ([::1]:33330 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1nmYz2-0002Mg-EL
	for importer@patchew.org; Thu, 05 May 2022 06:45:20 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:38806)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
 id 1nmXWt-0005Jg-Gw
 for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:11 -0400
Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:37664)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
 id 1nmXWr-0003OT-Vt
 for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:11 -0400
Received: by mail-wr1-x435.google.com with SMTP id t6so5237009wra.4
 for <qemu-devel@nongnu.org>; Thu, 05 May 2022 02:12:09 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
 by smtp.gmail.com with ESMTPSA id
 j14-20020adfe50e000000b0020c6a524fd5sm841612wrm.99.2022.05.05.02.12.07
 for <qemu-devel@nongnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 05 May 2022 02:12:07 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
 h=from:to:subject:date:message-id:in-reply-to:references:mime-version
 :content-transfer-encoding;
 bh=lUUUty35mHrdlwzzNpzWoTHLJi4hbdRcoTC6a1ASl1U=;
 b=CmktfocO/gJapdbi5n3Yx0H9W7/XwioywVs5X2HjhwZ0rFQvKMcX1hJiDAN+AtOyFP
 nTd+XBlDR3loVwIr6Jma7/xJOZdA3VR0SjRDyoXlOoIndFBFCJjGIRgYOkn37ooXRI2d
 hI0DmK86GwM9kD9vptoY2DB93ZaKLOqXg6Q9FwC1VmXSViN9+f7pZxD3Y+3DUzXewx6I
 TynS3ZRcsj6HXhtQ5mDQ1xjaqY7fFYecsPxZWYBzfbanipL/hWHc/ghBb66awX12c2IP
 WJuNMHoT2NvTxK7yupz8cebemGA0Ny3TdKOG4Jc9KSa19KvzfpUzRfN6mdO+h5QFBKw4
 4vng==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=lUUUty35mHrdlwzzNpzWoTHLJi4hbdRcoTC6a1ASl1U=;
 b=q4IPW+hRS6fFViOPQ3Or4X/BT3VFXzfvEHI4EYmnNIlVvcWWAXow7uaq79DCQeeQEW
 XfSdvQAarhMXRhYjyjpWDms1A2mpZDmseCzxIUcNWw5m1rbU9u3Do6LLs71OpbSpYWav
 ZWJk4EjQ/Ba5o+sOdvQ2STWgefwx3uSno3SNuU4ASGwXRYAYZoC4yNh8Fne4Z57BywOF
 jJMOP81HvKa6tEc6W0vj/1NbgsqYmUc7HUkOXA0R8DAXwp/DlW1DSju4qUMZGo94C4yx
 XsqnfXNGQhyAoCzuYBXr6XXCDyG3cG6W6GAPTa5uc7BqtJHAicfgfPa83Vxc5Wx27diA
 iyDQ==
X-Gm-Message-State: AOAM533PsJpWn2THZlt4oq/PDZ2QscL5ZItDBBvLDiq9BzXtRgKViSH7
 V2UZ9gavaiKAQjlXnWF7VNk1IQyvRgIYmQ==
X-Google-Smtp-Source: 
 ABdhPJzZ0rDT8Sxs5gLWOXWv62txKXHYLKxlsAl5dDPmqHNDdrXyytnPY+KsWUT4P9uaAlpRdo2gkA==
X-Received: by 2002:a05:6000:1841:b0:20c:788b:9306 with SMTP id
 c1-20020a056000184100b0020c788b9306mr8265320wri.369.1651741927952;
 Thu, 05 May 2022 02:12:07 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 20/23] target/arm: Remove HOST_BIG_ENDIAN ifdef in
 add_cpreg_to_hashtable
Date: Thu,  5 May 2022 10:11:44 +0100
Message-Id: <20220505091147.2657652-21-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20220505091147.2657652-1-peter.maydell@linaro.org>
References: <20220505091147.2657652-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
 as permitted sender) client-ip=209.51.188.17;
 envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
 helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::435;
 envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1651747522368100001
Content-Type: text/plain; charset="utf-8"

From: Richard Henderson <richard.henderson@linaro.org>

Since e03b56863d2bc, our host endian indicator is unconditionally
set, which means that we can use a normal C condition.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20220501055028.646596-20-richard.henderson@linaro.org
[PMM: quote correct git hash in commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/helper.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 81612952f3a..14ea5caad94 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -8602,12 +8602,9 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, cons=
t ARMCPRegInfo *r,
             r2->type |=3D ARM_CP_ALIAS;
         }
=20
-        if (r->state =3D=3D ARM_CP_STATE_BOTH) {
-#if HOST_BIG_ENDIAN
-            if (r2->fieldoffset) {
-                r2->fieldoffset +=3D sizeof(uint32_t);
-            }
-#endif
+        if (HOST_BIG_ENDIAN &&
+            r->state =3D=3D ARM_CP_STATE_BOTH && r2->fieldoffset) {
+            r2->fieldoffset +=3D sizeof(uint32_t);
         }
     }
=20
--=20
2.25.1