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

target-i386: xsave: Helper function to calculate xsave area size

Browse source 
Move the xsave area size calculation from cpu_x86_cpuid() inside
its own function. While doing it, change it to use the XSAVE area
struct sizes for the initial size, instead of the magic 0x240
number.

Backports commit 1fda6198e4126af9988754c8824cfc9928649890 from qemu
This commit is contained in:
Eduardo Habkost 2018-02-26 04:36:09 -05:00 committed by Lioncash
parent c35e9eb9af
commit 28f002cbaf
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -607,6 +607,20 @@ static const ExtSaveArea x86_ext_save_areas[] = {
},
};
static uint32_t xsave_area_size(uint64_t mask)
{
int i;
uint64_t ret = sizeof(X86LegacyXSaveArea) + sizeof(X86XSaveHeader);
for (i = 2; i < ARRAY_SIZE(x86_ext_save_areas); i++) {
const ExtSaveArea *esa = &x86_ext_save_areas[i];
if ((mask >> i) & 1) {
ret = MAX(ret, esa->offset + esa->size);
}
}
return ret;
}
const char *get_register_name_32(unsigned int reg)
{
if (reg >= CPU_NB_REGS32) {
@ -2546,13 +2560,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
} */
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 ((ena_mask >> i) & 1) {
*ecx = MAX(*ecx, esa->offset + esa->size);
}
}
*ecx = xsave_area_size(ena_mask);
*eax = ena_mask;
*edx = ena_mask >> 32;
*ebx = *ecx;