diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2013-04-22 16:00:16 -0300 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-05-06 17:53:08 +0200 |
commit | 04d104b61198615c259d1851684b2713213dcf99 (patch) | |
tree | a8b98f18d98ad4feea0ea004bbd4d1e6b547cf2f /target-i386/cpu.c | |
parent | 8e515b125d5f7849167dbee6cbe6ef61636607d4 (diff) | |
download | hqemu-04d104b61198615c259d1851684b2713213dcf99.zip hqemu-04d104b61198615c259d1851684b2713213dcf99.tar.gz |
target-i386: Add ECX information to FeatureWordInfo
FEAT_7_0_EBX uses ECX as input, so we have to take that into account
when reporting feature word values.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386/cpu.c')
-rw-r--r-- | target-i386/cpu.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9f2adad..0f92469 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -152,8 +152,10 @@ static const char *cpuid_7_0_ebx_feature_name[] = { typedef struct FeatureWordInfo { const char **feat_names; - uint32_t cpuid_eax; /* Input EAX for CPUID */ - int cpuid_reg; /* R_* register constant */ + uint32_t cpuid_eax; /* Input EAX for CPUID */ + bool cpuid_needs_ecx; /* CPUID instruction uses ECX as input */ + uint32_t cpuid_ecx; /* Input ECX value for CPUID */ + int cpuid_reg; /* output register (R_* constant) */ } FeatureWordInfo; static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { @@ -187,7 +189,9 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { }, [FEAT_7_0_EBX] = { .feat_names = cpuid_7_0_ebx_feature_name, - .cpuid_eax = 7, .cpuid_reg = R_EBX, + .cpuid_eax = 7, + .cpuid_needs_ecx = true, .cpuid_ecx = 0, + .cpuid_reg = R_EBX, }, }; |