From: Thomas Huth <thuth@redhat.com>
To: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
qemu-devel@nongnu.org
Cc: chenrui333@gmail.com, QEMU Trivial <qemu-trivial@nongnu.org>
Subject: Re: [PATCH] target/tricore: Rename tricore_feature
Date: Fri, 21 Jul 2023 08:35:04 +0200 [thread overview]
Message-ID: <463afc6c-4c42-6d98-5ea6-9c8437ffda2e@redhat.com> (raw)
In-Reply-To: <20230721060605.76636-1-kbastian@mail.uni-paderborn.de>
On 21/07/2023 08.06, Bastian Koppelmann wrote:
> 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 <kbastian@mail.uni-paderborn.de>
> ---
> target/tricore/cpu.c | 8 ++++----
> target/tricore/cpu.h | 2 +-
> target/tricore/helper.c | 4 ++--
> target/tricore/op_helper.c | 4 ++--
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
> index f15169bd1b..133a9ac70e 100644
> --- a/target/tricore/cpu.c
> +++ b/target/tricore/cpu.c
> @@ -104,18 +104,18 @@ static void tricore_cpu_realizefn(DeviceState *dev, Error **errp)
> }
>
> /* Some features automatically imply others */
> - if (tricore_feature(env, TRICORE_FEATURE_162)) {
> + if (tricore_has_feature(env, TRICORE_FEATURE_162)) {
> set_feature(env, TRICORE_FEATURE_161);
> }
>
> - if (tricore_feature(env, TRICORE_FEATURE_161)) {
> + if (tricore_has_feature(env, TRICORE_FEATURE_161)) {
> set_feature(env, TRICORE_FEATURE_16);
> }
>
> - 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 a50b91cc36..3708405be8 100644
> --- a/target/tricore/cpu.h
> +++ b/target/tricore/cpu.h
> @@ -277,7 +277,7 @@ enum tricore_features {
> TRICORE_FEATURE_162,
> };
>
> -static inline int tricore_feature(CPUTriCoreState *env, int feature)
> +static inline int tricore_has_feature(CPUTriCoreState *env, int feature)
> {
> return (env->features & (1ULL << feature)) != 0;
> }
> diff --git a/target/tricore/helper.c b/target/tricore/helper.c
> index 951024d491..731a6e9cb6 100644
> --- a/target/tricore/helper.c
> +++ b/target/tricore/helper.c
> @@ -155,7 +155,7 @@ void psw_write(CPUTriCoreState *env, uint32_t val)
> #define FIELD_GETTER_WITH_FEATURE(NAME, REG, FIELD, FEATURE) \
> uint32_t NAME(CPUTriCoreState *env) \
> { \
> - if (tricore_feature(env, TRICORE_FEATURE_##FEATURE)) { \
> + if (tricore_has_feature(env, TRICORE_FEATURE_##FEATURE)) { \
> return FIELD_EX32(env->REG, REG, FIELD ## _ ## FEATURE); \
> } \
> return FIELD_EX32(env->REG, REG, FIELD ## _13); \
> @@ -170,7 +170,7 @@ uint32_t NAME(CPUTriCoreState *env) \
> #define FIELD_SETTER_WITH_FEATURE(NAME, REG, FIELD, FEATURE) \
> void NAME(CPUTriCoreState *env, uint32_t val) \
> { \
> - if (tricore_feature(env, TRICORE_FEATURE_##FEATURE)) { \
> + if (tricore_has_feature(env, TRICORE_FEATURE_##FEATURE)) { \
> env->REG = FIELD_DP32(env->REG, REG, FIELD ## _ ## FEATURE, val); \
> } \
> env->REG = FIELD_DP32(env->REG, REG, FIELD ## _13, val); \
> diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c
> index 821a4b67cb..89be1ed648 100644
> --- a/target/tricore/op_helper.c
> +++ b/target/tricore/op_helper.c
> @@ -2584,7 +2584,7 @@ void helper_ret(CPUTriCoreState *env)
> /* PCXI = new_PCXI; */
> env->PCXI = new_PCXI;
>
> - if (tricore_feature(env, TRICORE_FEATURE_131)) {
> + if (tricore_has_feature(env, TRICORE_FEATURE_131)) {
> /* PSW = {new_PSW[31:26], PSW[25:24], new_PSW[23:0]}; */
> psw_write(env, (new_PSW & ~(0x3000000)) + (psw & (0x3000000)));
> } else { /* TRICORE_FEATURE_13 only */
> @@ -2695,7 +2695,7 @@ void helper_rfm(CPUTriCoreState *env)
> env->gpr_a[10] = cpu_ldl_data(env, env->DCX+8);
> env->gpr_a[11] = cpu_ldl_data(env, env->DCX+12);
>
> - if (tricore_feature(env, TRICORE_FEATURE_131)) {
> + if (tricore_has_feature(env, TRICORE_FEATURE_131)) {
> env->DBGTCR = 0;
> }
> }
Reviewed-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2023-07-21 6:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-21 6:06 [PATCH] target/tricore: Rename tricore_feature Bastian Koppelmann
2023-07-21 6:35 ` Thomas Huth [this message]
2023-07-21 7:31 ` Philippe Mathieu-Daudé
2023-07-21 8:54 ` [PATCH-for-8.1] " Philippe Mathieu-Daudé
2023-07-21 10:01 ` Bastian Koppelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=463afc6c-4c42-6d98-5ea6-9c8437ffda2e@redhat.com \
--to=thuth@redhat.com \
--cc=chenrui333@gmail.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).