yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-22 10:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Supply uc_struct instance to tcg_enabled()

Browse source
This commit is contained in:
Lioncash 2019-08-08 19:55:12 -04:00
parent ecd3f0a5df
commit 59d808cf21
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/target/arm/cpu.c
View file

@ -721,7 +721,7 @@ static int arm_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err
* Presence of EL2 itself is ARM_FEATURE_EL2, and of the * Presence of EL2 itself is ARM_FEATURE_EL2, and of the
* Security Extensions is ARM_FEATURE_EL3. * Security Extensions is ARM_FEATURE_EL3.
*/ */
assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(arm_div, cpu)); assert(!tcg_enabled(uc) || no_aa32 || cpu_isar_feature(arm_div, cpu));
set_feature(env, ARM_FEATURE_LPAE); set_feature(env, ARM_FEATURE_LPAE);
set_feature(env, ARM_FEATURE_V7); set_feature(env, ARM_FEATURE_V7);
} }
@ -747,7 +747,7 @@ static int arm_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err
if (arm_feature(env, ARM_FEATURE_V6)) { if (arm_feature(env, ARM_FEATURE_V6)) {
set_feature(env, ARM_FEATURE_V5); set_feature(env, ARM_FEATURE_V5);
if (!arm_feature(env, ARM_FEATURE_M)) { if (!arm_feature(env, ARM_FEATURE_M)) {
assert(!tcg_enabled() || no_aa32 || cpu_isar_feature(jazelle, cpu)); assert(!tcg_enabled(uc) || no_aa32 || cpu_isar_feature(jazelle, cpu));
set_feature(env, ARM_FEATURE_AUXCR); set_feature(env, ARM_FEATURE_AUXCR);
} }
} }