From 38c3dc462297e2daa3a4a2c61ea9cbf50651f62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 17 Feb 2012 17:46:03 +0100 Subject: target-i386: Introduce x86_cpuid_version_set_stepping() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the logic for setting the stepping field into a helper function. To make the function self-contained and to prepare for future unordered/multiple uses, mask out any previous stepping values first. Signed-off-by: Andreas Färber Signed-off-by: Anthony Liguori --- target-i386/cpuid.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'target-i386') diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index c528cd94dd..38c1d226ca 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -613,6 +613,12 @@ static void x86_cpuid_version_set_model(CPUX86State *env, int model) env->cpuid_version |= ((model & 0xf) << 4) | ((model >> 4) << 16); } +static void x86_cpuid_version_set_stepping(CPUX86State *env, int stepping) +{ + env->cpuid_version &= ~0xf; + env->cpuid_version |= stepping & 0xf; +} + static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) { unsigned int i; @@ -901,7 +907,7 @@ int cpu_x86_register (CPUX86State *env, const char *cpu_model) env->cpuid_level = def->level; x86_cpuid_version_set_family(env, def->family); x86_cpuid_version_set_model(env, def->model); - env->cpuid_version |= def->stepping; + x86_cpuid_version_set_stepping(env, def->stepping); env->cpuid_features = def->features; env->cpuid_ext_features = def->ext_features; env->cpuid_ext2_features = def->ext2_features; -- cgit v1.2.3