enable EFER usage in i386 emulation - more cpuid bits

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1372 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index d0157ce8d29fdfa101de3fd7d4589233d67aa85a..3549511106fa4c5f72fcd8aff513d60ed109bdb6 100644 (file)
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -258,6 +258,7 @@
 
 #define CPUID_EXT2_SYSCALL (1 << 11)
 #define CPUID_EXT2_NX      (1 << 20)
+#define CPUID_EXT2_FFXSR   (1 << 25)
 #define CPUID_EXT2_LM      (1 << 29)
 
 #define EXCP00_DIVZ    0
@@ -464,9 +465,9 @@ typedef struct CPUX86State {
     uint32_t sysenter_cs;
     uint32_t sysenter_esp;
     uint32_t sysenter_eip;
+    uint64_t efer;
+    uint64_t star;
 #ifdef TARGET_X86_64
-    target_ulong efer;
-    target_ulong star;
     target_ulong lstar;
     target_ulong cstar;
     target_ulong fmask;
@@ -510,13 +511,17 @@ typedef struct CPUX86State {
     int singlestep_enabled;
 
     /* processor features (e.g. for CPUID insn) */
+    uint32_t cpuid_level;
     uint32_t cpuid_vendor1;
     uint32_t cpuid_vendor2;
     uint32_t cpuid_vendor3;
     uint32_t cpuid_version;
     uint32_t cpuid_features;
     uint32_t cpuid_ext_features;
-
+    uint32_t cpuid_xlevel;
+    uint32_t cpuid_model[12];
+    uint32_t cpuid_ext2_features;
+    
 #ifdef USE_KQEMU
     int kqemu_enabled;
 #endif