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

target-i386: xsave: Calculate enabled components only once

Browse source 
Instead of checking both env->features and ena_mask at two
different places in the CPUID code, initialize ena_mask based on
the features that are enabled for the CPU, and then clear
unsupported bits based on kvm_arch_get_supported_cpuid().

The results should be exactly the same, but it will make it
easier to move the mask calculation elsewhare, and reuse
x86_cpu_filter_features() for the kvm_arch_get_supported_cpuid()
check.

Backports commit 4928cd6de6b4211a79f98c8dc39115be1e815c2b from qemu
This commit is contained in:
Eduardo Habkost 2018-02-26 04:33:16 -05:00 committed by Lioncash
parent c3a0cba5b1
commit c7195afd32
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
qemu/target-i386/cpu.c
View file

@ -2528,21 +2528,28 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
break;
}
//if (kvm_enabled()) {
// Unicorn: commented out
//ena_mask = kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EDX);
//ena_mask <<= 32;
//ena_mask |= kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EAX);
//} else {
ena_mask = -1;
//}
ena_mask = (XSTATE_FP_MASK | XSTATE_SSE_MASK);
for (i = 2; i < ARRAY_SIZE(x86_ext_save_areas); i++) {
const ExtSaveArea *esa = &x86_ext_save_areas[i];
if (env->features[esa->feature] & esa->bits) {
ena_mask |= (1ULL << i);
}
}
/* Unicorn: commented out
if (kvm_enabled()) {
KVMState *s = cs->kvm_state;
uint64_t kvm_mask = kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EDX);
kvm_mask <<= 32;
kvm_mask |= kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EAX);
ena_mask &= kvm_mask;
} */
if (count == 0) {
*ecx = 0x240;
for (i = 2; i < ARRAY_SIZE(x86_ext_save_areas); i++) {
const ExtSaveArea *esa = &x86_ext_save_areas[i];
if ((env->features[esa->feature] & esa->bits)
&& ((ena_mask >> i) & 1) != 0) {
if ((ena_mask >> i) & 1) {
if (i < 32) {
*eax |= 1u << i;
} else {
@ -2557,8 +2564,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*eax = env->features[FEAT_XSAVE];
} else if (count < ARRAY_SIZE(x86_ext_save_areas)) {
const ExtSaveArea *esa = &x86_ext_save_areas[count];
if ((env->features[esa->feature] & esa->bits)
&& ((ena_mask >> count) & 1) != 0) {
if ((ena_mask >> count) & 1) {
*eax = esa->size;
*ebx = esa->offset;
}