OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

x86: cpuid: reconstruct leaf 0Dh data

Browse Source 
The data in leaf 0Dh depends on information from other feature bits.
Instead of passing it blindly from the host, compute it based on
whether these feature bits are enabled.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-10-02 17:54:57 +02:00 committed by Gleb Natapov
parent c74f41bbcc
commit 2560f19f42
1 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
target-i386/cpu.c
View File

@ -328,6 +328,15 @@ X86RegisterInfo32 x86_reg_info_32[CPU_NB_REGS32] = {
}; };
#undef REGISTER #undef REGISTER
typedef struct ExtSaveArea {
uint32_t feature, bits;
uint32_t offset, size;
} ExtSaveArea;
static const ExtSaveArea ext_save_areas[] = {
[2] = { .feature = FEAT_1_ECX, .bits = CPUID_EXT_AVX,
.offset = 0x100, .size = 0x240 },
};
const char *get_register_name_32(unsigned int reg) const char *get_register_name_32(unsigned int reg)
{ {
@ -2180,29 +2189,51 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*edx = 0; *edx = 0;
} }
break; break;
case 0xD: case 0xD: {
KVMState *s = cs->kvm_state;
uint64_t kvm_mask;
int i;
/* Processor Extended State */ /* Processor Extended State */
if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) { *eax = 0;
*eax = 0; *ebx = 0;
*ebx = 0; *ecx = 0;
*ecx = 0; *edx = 0;
*edx = 0; if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE) || !kvm_enabled()) {
break; break;
} }
if (kvm_enabled()) { kvm_mask =
KVMState *s = cs->kvm_state; kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EAX) |
((uint64_t)kvm_arch_get_supported_cpuid(s, 0xd, 0, R_EDX) << 32);
*eax = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EAX); if (count == 0) {
*ebx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EBX); *ecx = 0x240;
*ecx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_ECX); for (i = 2; i < ARRAY_SIZE(ext_save_areas); i++) {
*edx = kvm_arch_get_supported_cpuid(s, 0xd, count, R_EDX); const ExtSaveArea *esa = &ext_save_areas[i];
} else { if ((env->features[esa->feature] & esa->bits) == esa->bits &&
*eax = 0; (kvm_mask & (1 << i)) != 0) {
*ebx = 0; if (i < 32) {
*ecx = 0; *eax |= 1 << i;
*edx = 0; } else {
*edx |= 1 << (i - 32);
}
*ecx = MAX(*ecx, esa->offset + esa->size);
}
}
*eax |= kvm_mask & (XSTATE_FP | XSTATE_SSE);
*ebx = *ecx;
} else if (count == 1) {
*eax = kvm_arch_get_supported_cpuid(s, 0xd, 1, R_EAX);
} else if (count < ARRAY_SIZE(ext_save_areas)) {
const ExtSaveArea *esa = &ext_save_areas[count];
if ((env->features[esa->feature] & esa->bits) == esa->bits &&
(kvm_mask & (1 << count)) != 0) {
*eax = esa->offset;
*ebx = esa->size;
}
} }
break; break;
}
case 0x80000000: case 0x80000000:
*eax = env->cpuid_xlevel; *eax = env->cpuid_xlevel;
*ebx = env->cpuid_vendor1; *ebx = env->cpuid_vendor1;