From nobody Wed Nov 27 07:52:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700418168571895.4968924840786; Sun, 19 Nov 2023 10:22:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4mQG-0005sN-BW; Sun, 19 Nov 2023 13:21:32 -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 1r4mQE-0005oH-PR; Sun, 19 Nov 2023 13:21:30 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r4mQC-0008Ha-RT; Sun, 19 Nov 2023 13:21:30 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B137C3490D; Sun, 19 Nov 2023 21:21:27 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 139943624B; Sun, 19 Nov 2023 21:21:24 +0300 (MSK) Received: (nullmailer pid 3314724 invoked by uid 1000); Sun, 19 Nov 2023 18:21:23 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Michael Tokarev Subject: [Stable-7.2.7 62/62] target/tricore: Rename tricore_feature Date: Sun, 19 Nov 2023 21:21:22 +0300 Message-Id: <20231119182123.3314699-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1700418169320100005 From: Bastian Koppelmann this name is used by capstone and will lead to a build failure of QEMU, when capstone is enabled. So we rename it to tricore_has_feature(), to match has_feature() in translate.c. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1774 Signed-off-by: Bastian Koppelmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20230721060605.76636-1-kbastian@mail.uni-paderborn.de> (cherry picked from commit f8cfdd2038c1823301e6df753242e465b1dc8539) Signed-off-by: Michael Tokarev (Mjt: update context in target/tricore/cpu.c, target/tricore/op_helper.c, d= rop chunks in target/tricore/helper.c) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 2c54a2825f..0594d3843b 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -100,14 +100,14 @@ static void tricore_cpu_realizefn(DeviceState *dev, E= rror **errp) } =20 /* Some features automatically imply others */ - if (tricore_feature(env, TRICORE_FEATURE_161)) { + if (tricore_has_feature(env, TRICORE_FEATURE_161)) { set_feature(env, TRICORE_FEATURE_16); } =20 - if (tricore_feature(env, TRICORE_FEATURE_16)) { + if (tricore_has_feature(env, TRICORE_FEATURE_16)) { set_feature(env, TRICORE_FEATURE_131); } - if (tricore_feature(env, TRICORE_FEATURE_131)) { + if (tricore_has_feature(env, TRICORE_FEATURE_131)) { set_feature(env, TRICORE_FEATURE_13); } cpu_reset(cs); diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index 3b9c533a7c..2e122b44a7 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -269,7 +269,7 @@ enum tricore_features { TRICORE_FEATURE_161, }; =20 -static inline int tricore_feature(CPUTriCoreState *env, int feature) +static inline int tricore_has_feature(CPUTriCoreState *env, int feature) { return (env->features & (1ULL << feature)) !=3D 0; } diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c index 532ae6b74c..676529f754 100644 --- a/target/tricore/op_helper.c +++ b/target/tricore/op_helper.c @@ -2528,7 +2528,7 @@ void helper_ret(CPUTriCoreState *env) /* PCXI =3D new_PCXI; */ env->PCXI =3D new_PCXI; =20 - if (tricore_feature(env, TRICORE_FEATURE_13)) { + if (tricore_has_feature(env, TRICORE_FEATURE_13)) { /* PSW =3D new_PSW */ psw_write(env, new_PSW); } else { @@ -2639,7 +2639,7 @@ void helper_rfm(CPUTriCoreState *env) env->gpr_a[10] =3D cpu_ldl_data(env, env->DCX+8); env->gpr_a[11] =3D cpu_ldl_data(env, env->DCX+12); =20 - if (tricore_feature(env, TRICORE_FEATURE_131)) { + if (tricore_has_feature(env, TRICORE_FEATURE_131)) { env->DBGTCR =3D 0; } } --=20 2.39.2