OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target-i386: Loop-based feature word filtering in TCG mode 

Instead of manually filtering each feature word, add a tcg_features
field to FeatureWordInfo, and use that field to filter all feature words
in TCG mode.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Eduardo Habkost 2014-04-30 13:48:38 -03:00 committed by Andreas Färber
parent e1c224b4eb
commit 37ce3522cb
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target-i386/cpu.c
View File

@ -325,42 +325,51 @@ typedef struct FeatureWordInfo {
bool cpuid_needs_ecx; /* CPUID instruction uses ECX as input */ bool cpuid_needs_ecx; /* CPUID instruction uses ECX as input */
uint32_t cpuid_ecx; /* Input ECX value for CPUID */ uint32_t cpuid_ecx; /* Input ECX value for CPUID */
int cpuid_reg; /* output register (R_* constant) */ int cpuid_reg; /* output register (R_* constant) */
uint32_t tcg_features; /* Feature flags supported by TCG */
} FeatureWordInfo; } FeatureWordInfo;
static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { static FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
[FEAT_1_EDX] = { [FEAT_1_EDX] = {
.feat_names = feature_name, .feat_names = feature_name,
.cpuid_eax = 1, .cpuid_reg = R_EDX, .cpuid_eax = 1, .cpuid_reg = R_EDX,
.tcg_features = TCG_FEATURES,
}, },
[FEAT_1_ECX] = { [FEAT_1_ECX] = {
.feat_names = ext_feature_name, .feat_names = ext_feature_name,
.cpuid_eax = 1, .cpuid_reg = R_ECX, .cpuid_eax = 1, .cpuid_reg = R_ECX,
.tcg_features = TCG_EXT_FEATURES,
}, },
[FEAT_8000_0001_EDX] = { [FEAT_8000_0001_EDX] = {
.feat_names = ext2_feature_name, .feat_names = ext2_feature_name,
.cpuid_eax = 0x80000001, .cpuid_reg = R_EDX, .cpuid_eax = 0x80000001, .cpuid_reg = R_EDX,
.tcg_features = TCG_EXT2_FEATURES,
}, },
[FEAT_8000_0001_ECX] = { [FEAT_8000_0001_ECX] = {
.feat_names = ext3_feature_name, .feat_names = ext3_feature_name,
.cpuid_eax = 0x80000001, .cpuid_reg = R_ECX, .cpuid_eax = 0x80000001, .cpuid_reg = R_ECX,
.tcg_features = TCG_EXT3_FEATURES,
}, },
[FEAT_C000_0001_EDX] = { [FEAT_C000_0001_EDX] = {
.feat_names = ext4_feature_name, .feat_names = ext4_feature_name,
.cpuid_eax = 0xC0000001, .cpuid_reg = R_EDX, .cpuid_eax = 0xC0000001, .cpuid_reg = R_EDX,
.tcg_features = TCG_EXT4_FEATURES,
}, },
[FEAT_KVM] = { [FEAT_KVM] = {
.feat_names = kvm_feature_name, .feat_names = kvm_feature_name,
.cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EAX, .cpuid_eax = KVM_CPUID_FEATURES, .cpuid_reg = R_EAX,
.tcg_features = TCG_KVM_FEATURES,
}, },
[FEAT_SVM] = { [FEAT_SVM] = {
.feat_names = svm_feature_name, .feat_names = svm_feature_name,
.cpuid_eax = 0x8000000A, .cpuid_reg = R_EDX, .cpuid_eax = 0x8000000A, .cpuid_reg = R_EDX,
.tcg_features = TCG_SVM_FEATURES,
}, },
[FEAT_7_0_EBX] = { [FEAT_7_0_EBX] = {
.feat_names = cpuid_7_0_ebx_feature_name, .feat_names = cpuid_7_0_ebx_feature_name,
.cpuid_eax = 7, .cpuid_eax = 7,
.cpuid_needs_ecx = true, .cpuid_ecx = 0, .cpuid_needs_ecx = true, .cpuid_ecx = 0,
.cpuid_reg = R_EBX, .cpuid_reg = R_EBX,
.tcg_features = TCG_7_0_EBX_FEATURES,
}, },
}; };
@ -2588,14 +2597,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
} }
if (!kvm_enabled()) { if (!kvm_enabled()) {
env->features[FEAT_1_EDX] &= TCG_FEATURES; FeatureWord w;
env->features[FEAT_1_ECX] &= TCG_EXT_FEATURES; for (w = 0; w < FEATURE_WORDS; w++) {
env->features[FEAT_7_0_EBX] &= TCG_7_0_EBX_FEATURES; env->features[w] &= feature_word_info[w].tcg_features;
env->features[FEAT_8000_0001_EDX] &= TCG_EXT2_FEATURES; }
env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES;
env->features[FEAT_SVM] &= TCG_SVM_FEATURES;
env->features[FEAT_KVM] &= TCG_KVM_FEATURES;
env->features[FEAT_C000_0001_EDX] &= TCG_EXT4_FEATURES;
} else { } else {
if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) { if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) {
error_setg(&local_err, error_setg(&local_err,