diff options
| -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; } } |