gwj / at91sam9263 · Commits

Commit 0086de1c66c06a86089456b195fa7f1dcce7df74

Authored by balrog
1 parent 2436b61a

Add Atom (x86) cpu identification. 

Also add SSSE3 to Core2 features.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5319 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 24 additions and 3 deletions
target-i386/helper.c
  View file @0086de1
@@ -174,11 +174,11 @@ static x86_def_t x86_defs[] = { @@ -174,11 +174,11 @@ static x86_def_t x86_defs[] = {
174 .stepping = 11, 174 .stepping = 11,
175 /* the original CPU does have many more features that are 175 /* the original CPU does have many more features that are
176 * not implemented yet */ 176 * not implemented yet */
177 - .features = PPRO_FEATURES | 177 + .features = PPRO_FEATURES |
178 CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | 178 CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
179 CPUID_PSE36, 179 CPUID_PSE36,
180 - .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR,  
181 - .ext2_features = (PPRO_FEATURES & 0x0183F3FF) | 180 + .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_SSSE3,
  181 + .ext2_features = (PPRO_FEATURES & 0x0183F3FF) |
182 CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, 182 CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
183 .xlevel = 0x8000000A, 183 .xlevel = 0x8000000A,
184 .model_id = "Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz", 184 .model_id = "Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz",
@@ -246,6 +246,27 @@ static x86_def_t x86_defs[] = { @@ -246,6 +246,27 @@ static x86_def_t x86_defs[] = {
246 /* XXX: put another string ? */ 246 /* XXX: put another string ? */
247 .model_id = "QEMU Virtual CPU version " QEMU_VERSION, 247 .model_id = "QEMU Virtual CPU version " QEMU_VERSION,
248 }, 248 },
  249 + {
  250 + .name = "atom",
  251 + /* original is on level 10 */
  252 + .level = 5,
  253 + .family = 6,
  254 + .model = 28,
  255 + .stepping = 2,
  256 + .features = PPRO_FEATURES |
  257 + CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_VME,
  258 + /* Missing: CPUID_DTS | CPUID_ACPI | CPUID_SS |
  259 + * CPUID_HT | CPUID_TM | CPUID_PBE */
  260 + /* Some CPUs got no CPUID_SEP */
  261 + .ext_features = CPUID_EXT_MONITOR |
  262 + CPUID_EXT_SSE3 /* PNI */, CPUID_EXT_SSSE3,
  263 + /* Missing: CPUID_EXT_DSCPL | CPUID_EXT_EST |
  264 + * CPUID_EXT_TM2 | CPUID_EXT_XTPR */
  265 + .ext2_features = (PPRO_FEATURES & 0x0183F3FF) | CPUID_EXT2_NX,
  266 + /* Missing: .ext3_features = CPUID_EXT3_LAHF_LM */
  267 + .xlevel = 0x8000000A,
  268 + .model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz",
  269 + },
249 }; 270 };
250 271
251 static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) 272 static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)