cpu: Add new models from qemu's target-x86_64.conf

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index 3ec4a7ead29fdd9a5bae779a8b83141bde78a6e4..986c61d2a21a2b3bb590624c71ab0af47c755e6e 100644 (file)
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -353,5 +353,288 @@
       <feature name='ssse3'/>
       <feature name='nx'/>
     </model>
+
+    <model name='Conroe'>
+      <vendor>Intel</vendor>
+      <feature name='sse2'/>
+      <feature name='sse'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='sep'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+      <feature name='ssse3'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='lm'/>
+      <feature name='syscall'/>
+      <feature name='nx'/>
+      <feature name='lahf_lm'/>
+    </model>
+
+    <model name='Penryn'>
+      <vendor>Intel</vendor>
+      <feature name='sse2'/>
+      <feature name='sse'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='sep'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+      <feature name='cx16'/>
+      <feature name='ssse3'/>
+      <feature name='sse4.1'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='lm'/>
+      <feature name='syscall'/>
+      <feature name='nx'/>
+      <feature name='lahf_lm'/>
+    </model>
+
+    <model name='Nehalem'>
+      <vendor>Intel</vendor>
+      <feature name='sse2'/>
+      <feature name='sse'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='sep'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+      <feature name='cx16'/>
+      <feature name='ssse3'/>
+      <feature name='sse4.1'/>
+      <feature name='sse4.2'/>
+      <feature name='popcnt'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='lm'/>
+      <feature name='syscall'/>
+      <feature name='nx'/>
+      <feature name='lahf_lm'/>
+    </model>
+
+    <model name='Opteron_G1'>
+      <vendor>AMD</vendor>
+      <feature name='sse2'/>
+      <feature name='sse'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='sep'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='lm'/>
+      <feature name='syscall'/>
+      <feature name='nx'/>
+    </model>
+
+    <model name='Opteron_G2'>
+      <vendor>AMD</vendor>
+      <feature name='sse2'/>
+      <feature name='sse'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='sep'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+      <feature name='cx16'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='lm'/>
+      <feature name='syscall'/>
+      <feature name='nx'/>
+      <feature name='rdtscp'/>
+      <feature name='svm'/>
+      <feature name='lahf_lm'/>
+    </model>
+
+    <model name='Opteron_G3'>
+      <vendor>AMD</vendor>
+      <feature name='sse2'/>
+      <feature name='sse'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='sep'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='mtrr'/>
+      <feature name='clflush'/>
+      <feature name='mca'/>
+      <feature name='pse36'/>
+      <feature name='pni'/>
+      <feature name='cx16'/>
+      <feature name='monitor'/>
+      <feature name='popcnt'/>
+      <feature name='fxsr'/>
+      <feature name='mmx'/>
+      <feature name='pat'/>
+      <feature name='cmov'/>
+      <feature name='pge'/>
+      <feature name='apic'/>
+      <feature name='cx8'/>
+      <feature name='mce'/>
+      <feature name='pae'/>
+      <feature name='msr'/>
+      <feature name='tsc'/>
+      <feature name='pse'/>
+      <feature name='de'/>
+      <feature name='fpu'/>
+      <feature name='lm'/>
+      <feature name='syscall'/>
+      <feature name='nx'/>
+      <feature name='rdtscp'/>
+      <feature name='svm'/>
+      <feature name='sse4a'/>
+      <feature name='abm'/>
+      <feature name='misalignsse'/>
+      <feature name='lahf_lm'/>
+    </model>
   </arch>
 </cpus>