Commit 0514ef2f authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Andreas Färber
Browse files

target-i386: Replace cpuid_*features fields with a feature word array 



This replaces the feature-bit fields on both X86CPU and x86_def_t
structs with an array.

With this, we will be able to simplify code that simply does the same
operation on all feature words (e.g. kvm_check_features_against_host(),
filter_features_for_kvm(), add_flagname_to_bitmaps(), CPU feature-bit
property lookup/registration, and the proposed "feature-words" property)

The following field replacements were made on X86CPU and x86_def_t:

  (cpuid_)features         -> features[FEAT_1_EDX]
  (cpuid_)ext_features     -> features[FEAT_1_ECX]
  (cpuid_)ext2_features    -> features[FEAT_8000_0001_EDX]
  (cpuid_)ext3_features    -> features[FEAT_8000_0001_ECX]
  (cpuid_)ext4_features    -> features[FEAT_C000_0001_EDX]
  (cpuid_)kvm_features     -> features[FEAT_KVM]
  (cpuid_)svm_features     -> features[FEAT_SVM]
  (cpuid_)7_0_ebx_features -> features[FEAT_7_0_EBX]

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 27861ecc

bsd-user/elfload.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static const char *get_elf_platform(void) 


static uint32_t get_elf_hwcap(void)

{

  return thread_env->cpuid_features;

    return thread_env->features[FEAT_1_EDX];

}



#ifdef TARGET_X86_64

bsd-user/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1004,13 +1004,13 @@ int main(int argc, char **argv) 


    env->cr[0] = CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK;

    env->hflags |= HF_PE_MASK;

    if (env->cpuid_features & CPUID_SSE) {

    if (env->features[FEAT_1_EDX] & CPUID_SSE) {

        env->cr[4] |= CR4_OSFXSR_MASK;

        env->hflags |= HF_OSFXSR_MASK;

    }

#ifndef TARGET_ABI32

    /* enable 64 bit mode if possible */

    if (!(env->cpuid_ext2_features & CPUID_EXT2_LM)) {

    if (!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM)) {

        fprintf(stderr, "The selected x86 CPU does not support 64 bit mode\n");

        exit(1);

    }

hw/i386/kvm/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static const TypeInfo kvmclock_info = { 
void kvmclock_create(void)

{

    if (kvm_enabled() &&

        first_cpu->cpuid_kvm_features & ((1ULL << KVM_FEATURE_CLOCKSOURCE) |

        first_cpu->features[FEAT_KVM] & ((1ULL << KVM_FEATURE_CLOCKSOURCE) |

                                         (1ULL << KVM_FEATURE_CLOCKSOURCE2))) {

        sysbus_create_simple("kvmclock", -1, NULL);

    }

linux-user/elfload.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static const char *get_elf_platform(void) 


static uint32_t get_elf_hwcap(void)

{

    return thread_env->cpuid_features;

    return thread_env->features[FEAT_1_EDX];

}



#ifdef TARGET_X86_64

linux-user/main.c

+2 −2
Original line number Diff line number Diff line
@@ -3764,13 +3764,13 @@ int main(int argc, char **argv, char **envp) 


    env->cr[0] = CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK;

    env->hflags |= HF_PE_MASK;

    if (env->cpuid_features & CPUID_SSE) {

    if (env->features[FEAT_1_EDX] & CPUID_SSE) {

        env->cr[4] |= CR4_OSFXSR_MASK;

        env->hflags |= HF_OSFXSR_MASK;

    }

#ifndef TARGET_ABI32

    /* enable 64 bit mode if possible */

    if (!(env->cpuid_ext2_features & CPUID_EXT2_LM)) {

    if (!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM)) {

        fprintf(stderr, "The selected x86 CPU does not support 64 bit mode\n");

        exit(1);

    }