diff options
| author | Bastian Koppelmann <kbastian@mail.uni-paderborn.de> | 2023-07-21 08:06:05 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-11-19 21:15:23 +0300 |
| commit | a536d6a486d433c1a7f3da325c1c11ae4f56f97d (patch) | |
| tree | baf048e828f821ae186e54a45708a07cf9e260a7 | |
| parent | 38312c2c3b90370bfcc65344a3bad21c04b5d9d3 (diff) | |
target/tricore: Rename tricore_feature
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230721060605.76636-1-kbastian@mail.uni-paderborn.de>
(cherry picked from commit f8cfdd2038c1823301e6df753242e465b1dc8539)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(Mjt: update context in target/tricore/cpu.c, target/tricore/op_helper.c, drop chunks in target/tricore/helper.c)
| -rw-r--r-- | target/tricore/cpu.c | 6 | ||||
| -rw-r--r-- | target/tricore/cpu.h | 2 | ||||
| -rw-r--r-- | target/tricore/op_helper.c | 4 |
3 files changed, 6 insertions, 6 deletions
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, Error **errp) } /* 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); } - 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, }; -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/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 = new_PCXI; */ env->PCXI = new_PCXI; - if (tricore_feature(env, TRICORE_FEATURE_13)) { + if (tricore_has_feature(env, TRICORE_FEATURE_13)) { /* PSW = new_PSW */ psw_write(env, new_PSW); } else { @@ -2639,7 +2639,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; } } |