From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnWQ8-0000it-9U for qemu-devel@nongnu.org; Fri, 23 Sep 2016 15:46:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bnWQ4-0003qh-VZ for qemu-devel@nongnu.org; Fri, 23 Sep 2016 15:46:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnWQ4-0003qU-Ow for qemu-devel@nongnu.org; Fri, 23 Sep 2016 15:46:00 -0400 From: Eduardo Habkost Date: Fri, 23 Sep 2016 16:45:34 -0300 Message-Id: <1474659936-978-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1474659936-978-1-git-send-email-ehabkost@redhat.com> References: <1474659936-978-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 5/7] target-i386: xsave: Helper function to calculate xsave area size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Igor Mammedov 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. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7e66003..9034d8e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -548,6 +548,20 @@ static const ExtSaveArea x86_ext_save_areas[] = { .size = sizeof(XSavePKRU) }, }; +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) { @@ -2519,13 +2533,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; -- 2.7.4