Commit b0704cbd authored by Andreas Färber's avatar Andreas Färber Committed by Anthony Liguori
Browse files

target-i386: Introduce x86_cpuid_version_set_model()



Move the logic for setting the model and extended model fields
into a helper function.

To make the function self-contained and to prepare for future
unordered/multiple uses, mask out any previous model values first.
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent ed5e1ec3
......@@ -607,6 +607,12 @@ static void x86_cpuid_version_set_family(CPUX86State *env, int family)
}
}
static void x86_cpuid_version_set_model(CPUX86State *env, int model)
{
env->cpuid_version &= ~0xf00f0;
env->cpuid_version |= ((model & 0xf) << 4) | ((model >> 4) << 16);
}
static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
{
unsigned int i;
......@@ -894,7 +900,7 @@ int cpu_x86_register (CPUX86State *env, const char *cpu_model)
env->cpuid_vendor_override = def->vendor_override;
env->cpuid_level = def->level;
x86_cpuid_version_set_family(env, def->family);
env->cpuid_version |= ((def->model & 0xf) << 4) | ((def->model >> 4) << 16);
x86_cpuid_version_set_model(env, def->model);
env->cpuid_version |= def->stepping;
env->cpuid_features = def->features;
env->cpuid_ext_features = def->ext_features;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment