mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
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: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
28cbbdd28e
commit
8c0e8ed327
4 changed files with 9 additions and 9 deletions
|
@ -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); \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue