From 45fd08effd461f85d0480d3b8f85a07751fc55b3 Mon Sep 17 00:00:00 2001 From: aurel32 Date: Tue, 14 Oct 2008 19:20:52 +0000 Subject: target-i386: Add Core Duo Definition This patch adds a CPU definition for the Core Duo CPU. I tried to resemble the original as closely as possible and document what features are missing still. This patch enables the use of a recent CPU definition on 32 bit platforms. It also fixes two issues that went along the line: - invalid xlevel in core2duo spec While looking though the CPUIDs again, I found that xlevel is actually 8. - non-PSE36 support The CoreDuo CPUID does not expose the PSE36 capability, but CPUID 0x80000008 is tied to 36 bits. This broke Windows XP installation for me, so I just set it to 32 bits width when PSE36 is not available. The original CPU also exposes 32 bit width in CPUID 0x80000008. Signed-off-by: Alexander Graf Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5488 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-i386/op_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'target-i386/op_helper.c') diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index e9a6942440..644598a4b9 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -2026,7 +2026,10 @@ void helper_cpuid(void) #if defined(USE_KQEMU) EAX = 0x00000020; /* 32 bits physical */ #else - EAX = 0x00000024; /* 36 bits physical */ + if (env->cpuid_features & CPUID_PSE36) + EAX = 0x00000024; /* 36 bits physical */ + else + EAX = 0x00000020; /* 32 bits physical */ #endif } EBX = 0; -- cgit v1.2.3