CPUDB: added AMD Trinity to the database

bochs/.bochsrc

@@ -118,6 +118,7 @@
 #  corei7_ivy_bridge_3770k    Intel(R) Core(TM) i7-3770K CPU (Ivy Bridge)
 #  corei7_haswell_4770        Intel(R) Core(TM) i7-4770 CPU (Haswell)
 #  zambezi                    AMD FX(tm)-4100 Quad-Core Processor (Zambezi)
+#  trinity_apu                AMD A8-5600K APU (Trinity)
 #
 #  COUNT:
 #    Set the number of processors:cores per processor:threads per core when

bochs/CHANGES

@@ -1,11 +1,12 @@
-Changes after 2.6.2 (updated Mar 04, 2014):
+Changes after 2.6.2 (updated Mar 15, 2014):
 
 - CPU
   - Bugfixes for CPU emulation correctness (critical fixes for VMX, TBM/BMI and RDRAND instructions)
   - Implemented FCS/FDS Deprecation CPU feature
   - Implemented SHA instructions emulation
-  - Implemented AVX-512 instructions emulation (work in progress)
+  - Implemented AVX-512 instructions emulation
   ! CPUDB: Added Intel(R) Core(TM) i7-4770 CPU (Haswell) configuration to CPUDB
+  ! CPUDB: Added AMD A8-5600K APU (Trinity) configuration to CPUDB
   - Replace 'SSE' and 'AVX' .bochsrc option with single 'SIMD' option which controls presence
     of all CPU SIMD extensions from SSE to AVX-512
 

bochs/cpu/cpudb/Makefile.in

@@ -47,13 +47,14 @@ CPUDB_OBJS = pentium_mmx.o \
              phenomx3_8650_toliman.o \
              core_duo_t2400_yonah.o \
              core2_penryn_t9600.o \
+             atom_n270.o \
              corei5_lynnfield_750.o \
              corei5_arrandale_m520.o \
-             zambezi.o \
              corei7_sandy_bridge_2600K.o \
              corei7_ivy_bridge_3770K.o \
              corei7_haswell_4770.o \
-             atom_n270.o
+             zambezi.o \
+             trinity_apu.o
 
 BX_INCLUDES = ../../bochs.h ../../config.h
 
@@ -227,7 +228,16 @@ zambezi.o: zambezi.@CPP_SUFFIX@ ../../bochs.h \
  ../../gui/gui.h ../../instrument/stubs/instrument.h ../cpu.h ../cpuid.h \
  ../crregs.h ../descriptor.h ../instr.h ../ia_opcodes.h ../lazy_flags.h \
  ../icache.h ../apic.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
- ../fpu/status_w.h ../fpu/control_w.h ../xmm.h phenomx3_8650_toliman.h \
+ ../fpu/status_w.h ../fpu/control_w.h ../xmm.h zambezi.h \
+ ../../cpu/cpuid.h
+trinity_apu.o: trinity_apu.@CPP_SUFFIX@ ../../bochs.h \
+ ../../config.h ../../osdep.h ../../bx_debug/debug.h ../../config.h \
+ ../../osdep.h ../../gui/siminterface.h ../../cpudb.h \
+ ../../gui/paramtree.h ../../memory/memory.h ../../pc_system.h \
+ ../../gui/gui.h ../../instrument/stubs/instrument.h ../cpu.h ../cpuid.h \
+ ../crregs.h ../descriptor.h ../instr.h ../ia_opcodes.h ../lazy_flags.h \
+ ../icache.h ../apic.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
+ ../fpu/status_w.h ../fpu/control_w.h ../xmm.h trinity_apu.h \
  ../../cpu/cpuid.h
 phenomx3_8650_toliman.o: phenomx3_8650_toliman.@CPP_SUFFIX@ ../../bochs.h \
  ../../config.h ../../osdep.h ../../bx_debug/debug.h ../../config.h \

bochs/cpu/cpudb/zambezi.cc

@@ -152,8 +152,7 @@ Bit64u zambezi_t::get_isa_extensions_bitmask(void) const
 #if BX_SUPPORT_SVM
          BX_ISA_SVM |
 #endif
-         BX_ISA_XOP |
-         BX_ISA_TBM;
+         BX_ISA_XOP;
 }
 
 Bit32u zambezi_t::get_cpu_extensions_bitmask(void) const
@@ -686,8 +685,7 @@ void zambezi_t::get_ext_cpuid_leaf_A(cpuid_function_t *leaf) const
   // * [10:10] Pause filter support
   //   [11:11] Reserved
   // * [12:12] Pause filter threshold support
-  //   [31:13] Reserved
-
+  //   [13:13] Advanced Virtual Interrupt Controller
   leaf->edx = get_svm_extensions_bitmask();
 }
 

bochs/cpu/todo

@@ -59,4 +59,4 @@ TODO (know issues in CPU model):
 
 [!] TODO: Convert CPUDB to plugins and search for them in runtime
 
-[!] Implement MPX, AVX-512 and their extensions
+[!] Implement MPX, AVX-512 extensions

bochs/cpudb.h

@@ -42,6 +42,7 @@ bx_define_cpudb(corei5_lynnfield_750)
 bx_define_cpudb(corei5_arrandale_m520)
 #if BX_SUPPORT_AVX
 bx_define_cpudb(zambezi)
+bx_define_cpudb(trinity_apu)
 bx_define_cpudb(corei7_sandy_bridge_2600k)
 bx_define_cpudb(corei7_ivy_bridge_3770k)
 bx_define_cpudb(corei7_haswell_4770)