[3/5] i386: cpu: replace EXT2_FEATURE_MASK with CPUID_EXT2_AMD_ALIASES

Both constants have the same value, but CPUID_EXT2_AMD_ALIASES is
defined without using magic numbers.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target-i386/cpu.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

On 09/06/12 16:05, Eduardo Habkost wrote:
> Both constants have the same value, but CPUID_EXT2_AMD_ALIASES is
> defined without using magic numbers.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>   target-i386/cpu.c | 20 +++++++++++---------
>   1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 7c0953f..682895b 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -258,7 +258,6 @@ typedef struct x86_def_t {
>             CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | \
>             CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | \
>             CPUID_PAE | CPUID_SEP | CPUID_APIC)
> -#define EXT2_FEATURE_MASK 0x0183F3FF
>   
>   #define TCG_FEATURES (CPUID_FP87 | CPUID_PSE | CPUID_TSC | CPUID_MSR | \
>             CPUID_PAE | CPUID_MCE | CPUID_CX8 | CPUID_APIC | CPUID_SEP | \
> @@ -276,7 +275,7 @@ typedef struct x86_def_t {
>             /* missing:
>             CPUID_EXT_DTES64, CPUID_EXT_DSCPL, CPUID_EXT_VMX, CPUID_EXT_EST,
>             CPUID_EXT_TM2, CPUID_EXT_XTPR, CPUID_EXT_PDCM, CPUID_EXT_XSAVE */
> -#define TCG_EXT2_FEATURES ((TCG_FEATURES & EXT2_FEATURE_MASK) | \
> +#define TCG_EXT2_FEATURES ((TCG_FEATURES & CPUID_EXT2_AMD_ALIASES) | \
>             CPUID_EXT2_NX | CPUID_EXT2_MMXEXT | CPUID_EXT2_RDTSCP | \
>             CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT)
>             /* missing:
> @@ -305,7 +304,7 @@ static x86_def_t builtin_x86_defs[] = {
>               CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
>               CPUID_PSE36,
>           .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT,
> -        .ext2_features = (PPRO_FEATURES & EXT2_FEATURE_MASK) |
> +        .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
>               CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
>           .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM |
>               CPUID_EXT3_ABM | CPUID_EXT3_SSE4A,
> @@ -325,7 +324,7 @@ static x86_def_t builtin_x86_defs[] = {
>               CPUID_PSE36 | CPUID_VME | CPUID_HT,
>           .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_CX16 |
>               CPUID_EXT_POPCNT,
> -        .ext2_features = (PPRO_FEATURES & EXT2_FEATURE_MASK) |
> +        .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
>               CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX |
>               CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT | CPUID_EXT2_MMXEXT |
>               CPUID_EXT2_FFXSR | CPUID_EXT2_PDPE1GB | CPUID_EXT2_RDTSCP,
> @@ -373,7 +372,7 @@ static x86_def_t builtin_x86_defs[] = {
>           /* Missing: CPUID_EXT_POPCNT, CPUID_EXT_MONITOR */
>           .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16,
>           /* Missing: CPUID_EXT2_PDPE1GB, CPUID_EXT2_RDTSCP */
> -        .ext2_features = (PPRO_FEATURES & EXT2_FEATURE_MASK) |
> +        .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
>               CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
>           /* Missing: CPUID_EXT3_LAHF_LM, CPUID_EXT3_CMP_LEG, CPUID_EXT3_EXTAPIC,
>                       CPUID_EXT3_CR8LEG, CPUID_EXT3_ABM, CPUID_EXT3_SSE4A,
> @@ -402,7 +401,7 @@ static x86_def_t builtin_x86_defs[] = {
>           .features = PPRO_FEATURES |
>               CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_PSE36,
>           .ext_features = CPUID_EXT_SSE3,
> -        .ext2_features = PPRO_FEATURES & EXT2_FEATURE_MASK,
> +        .ext2_features = PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES,
>           .ext3_features = 0,
>           .xlevel = 0x80000008,
>           .model_id = "Common 32-bit KVM processor"
> @@ -467,8 +466,10 @@ static x86_def_t builtin_x86_defs[] = {
>           .family = 6,
>           .model = 2,
>           .stepping = 3,
> -        .features = PPRO_FEATURES | CPUID_PSE36 | CPUID_VME | CPUID_MTRR | CPUID_MCA,
> -        .ext2_features = (PPRO_FEATURES & EXT2_FEATURE_MASK) | CPUID_EXT2_MMXEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT,
> +        .features = PPRO_FEATURES | CPUID_PSE36 | CPUID_VME | CPUID_MTRR |
> +            CPUID_MCA,
> +        .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
> +            CPUID_EXT2_MMXEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT,
>           .xlevel = 0x80000008,
>       },
>       {
> @@ -484,7 +485,8 @@ static x86_def_t builtin_x86_defs[] = {
>               /* Some CPUs got no CPUID_SEP */
>           .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_SSSE3 |
>               CPUID_EXT_DSCPL | CPUID_EXT_EST | CPUID_EXT_TM2 | CPUID_EXT_XTPR,
> -        .ext2_features = (PPRO_FEATURES & EXT2_FEATURE_MASK) | CPUID_EXT2_NX,
> +        .ext2_features = (PPRO_FEATURES & CPUID_EXT2_AMD_ALIASES) |
> +            CPUID_EXT2_NX,
>           .ext3_features = CPUID_EXT3_LAHF_LM,
>           .xlevel = 0x8000000A,
>           .model_id = "Intel(R) Atom(TM) CPU N270   @ 1.60GHz",
Reviewed-by: Don Slutz <Don@CloudSwitch.com>