diff --git a/bochs/cpu/cpudb/trinity_apu.cc b/bochs/cpu/cpudb/trinity_apu.cc
new file mode 100644
index 000000000..a0b73e1ca
--- /dev/null
+++ b/bochs/cpu/cpudb/trinity_apu.cc
@@ -0,0 +1,847 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2014 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+#include "bochs.h"
+#include "cpu.h"
+#include "param_names.h"
+#include "trinity_apu.h"
+
+#define LOG_THIS cpu->
+
+#if BX_SUPPORT_X86_64 && BX_SUPPORT_AVX
+
+trinity_apu_t::trinity_apu_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
+{
+  if (! BX_SUPPORT_X86_64)
+    BX_PANIC(("You must enable x86-64 for AMD A8-5600K APU (Trinity) configuration"));
+
+  BX_INFO(("WARNING: Light Weight Profiling (LWP) support is not implemented !"));
+
+  if (! BX_SUPPORT_SVM)
+    BX_INFO(("WARNING: SVM support is not compiled in !"));
+
+  if (! BX_SUPPORT_MONITOR_MWAIT)
+    BX_INFO(("WARNING: MONITOR/MWAIT support is not compiled in !"));
+}
+
+void trinity_apu_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const
+{
+  static bx_bool cpuid_limit_winnt = SIM->get_param_bool(BXPN_CPUID_LIMIT_WINNT)->get();
+  if (cpuid_limit_winnt)
+    if (function > 1 && function < 0x80000000) function = 1;
+
+  switch(function) {
+  case 0x80000000:
+    get_ext_cpuid_leaf_0(leaf);
+    return;
+  case 0x80000001:
+    get_ext_cpuid_leaf_1(leaf);
+    return;
+  case 0x80000002:
+  case 0x80000003:
+  case 0x80000004:
+    get_ext_cpuid_brand_string_leaf(function, leaf);
+    return;
+  case 0x80000005:
+    get_ext_cpuid_leaf_5(leaf);
+    return;
+  case 0x80000006:
+    get_ext_cpuid_leaf_6(leaf);
+    return;
+  case 0x80000007:
+    get_ext_cpuid_leaf_7(leaf);
+    return;
+  case 0x80000008:
+    get_ext_cpuid_leaf_8(leaf);
+    return;
+#if BX_SUPPORT_SVM
+  case 0x8000000A:
+    get_ext_cpuid_leaf_A(leaf);
+    return;
+#endif
+  case 0x80000019:
+    get_ext_cpuid_leaf_19(leaf);
+    return;
+  case 0x8000001A:
+    get_ext_cpuid_leaf_1A(leaf);
+    return;
+  case 0x8000001B:
+    get_ext_cpuid_leaf_1B(leaf);
+    return;
+  case 0x8000001C:
+    get_ext_cpuid_leaf_1C(leaf);
+    return;
+  case 0x8000001D:
+    get_ext_cpuid_leaf_1D(subfunction, leaf);
+    return;
+  case 0x8000001E:
+    get_ext_cpuid_leaf_1E(leaf);
+    return;
+  case 0x00000000:
+    get_std_cpuid_leaf_0(leaf);
+    return;
+  case 0x00000001:
+    get_std_cpuid_leaf_1(leaf);
+    return;
+#if BX_SUPPORT_MONITOR_MWAIT
+  case 0x00000005:
+    get_std_cpuid_leaf_5(leaf);
+    return;
+#endif
+  case 0x00000006:
+    get_std_cpuid_leaf_6(leaf);
+    return;
+  case 0x00000007:
+    get_std_cpuid_leaf_7(subfunction, leaf);
+    return;
+  case 0x0000000D:
+    get_std_cpuid_xsave_leaf(subfunction, leaf);
+    return;
+  default:
+    get_reserved_leaf(leaf);
+    return;
+  }
+}
+
+Bit64u trinity_apu_t::get_isa_extensions_bitmask(void) const
+{
+  return BX_ISA_X87 |
+         BX_ISA_486 |
+         BX_ISA_PENTIUM |
+         BX_ISA_P6 |
+         BX_ISA_MMX |
+         BX_ISA_SYSCALL_SYSRET_LEGACY |
+         BX_ISA_SYSENTER_SYSEXIT |
+         BX_ISA_CLFLUSH |
+         BX_ISA_SSE |
+         BX_ISA_SSE2 |
+         BX_ISA_SSE3 |
+         BX_ISA_SSSE3 |
+         BX_ISA_SSE4_1 |
+         BX_ISA_SSE4_2 |
+         BX_ISA_POPCNT |
+#if BX_SUPPORT_MONITOR_MWAIT
+         BX_ISA_MONITOR_MWAIT |
+#endif
+         BX_ISA_LM_LAHF_SAHF |
+         BX_ISA_CMPXCHG16B |
+         BX_ISA_RDTSCP |
+         BX_ISA_XSAVE |
+         BX_ISA_AES_PCLMULQDQ |
+         BX_ISA_AVX |
+         BX_ISA_AVX_F16C |
+         BX_ISA_AVX_FMA |
+         BX_ISA_SSE4A |
+         BX_ISA_LZCNT |
+         BX_ISA_FMA4 |
+#if BX_SUPPORT_SVM
+         BX_ISA_SVM |
+#endif
+         BX_ISA_XOP |
+         BX_ISA_TBM |
+         BX_ISA_BMI1;
+}
+
+Bit32u trinity_apu_t::get_cpu_extensions_bitmask(void) const
+{
+  return BX_CPU_DEBUG_EXTENSIONS |
+         BX_CPU_VME |
+         BX_CPU_PSE |
+         BX_CPU_PAE |
+         BX_CPU_PGE |
+         BX_CPU_PSE36 |
+         BX_CPU_MTRR |
+         BX_CPU_PAT |
+         BX_CPU_XAPIC |
+         BX_CPU_LONG_MODE |
+         BX_CPU_NX |
+         BX_CPU_FFXSR |
+         BX_CPU_1G_PAGES |
+         BX_CPU_MISALIGNED_SSE |
+         BX_CPU_ALT_MOV_CR8 |
+         BX_CPU_XAPIC_EXT;
+}
+
+#if BX_SUPPORT_SVM
+Bit32u trinity_apu_t::get_svm_extensions_bitmask(void) const
+{
+  return BX_CPUID_SVM_NESTED_PAGING |
+         BX_CPUID_SVM_LBR_VIRTUALIZATION |
+         BX_CPUID_SVM_SVM_LOCK |
+         BX_CPUID_SVM_NRIP_SAVE | 
+//       BX_CPUID_SVM_TSCRATE | // not implemented yet
+//       BX_CPUID_SVM_VMCB_CLEAN_BITS | // not implemented yet
+         BX_CPUID_SVM_FLUSH_BY_ASID |
+//       BX_CPUID_SVM_DECODE_ASSIST | // not implemented yet
+         BX_CPUID_SVM_PAUSE_FILTER;  // not implemented yet
+//       BX_CPUID_SVM_PAUSE_FILTER_THRESHOLD; // not implemented yet
+}
+#endif
+
+// leaf 0x00000000 //
+void trinity_apu_t::get_std_cpuid_leaf_0(cpuid_function_t *leaf) const
+{
+  static const char* vendor_string = "AuthenticAMD";
+
+  // EAX: highest std function understood by CPUID
+  // EBX: vendor ID string
+  // EDX: vendor ID string
+  // ECX: vendor ID string
+  static bx_bool cpuid_limit_winnt = SIM->get_param_bool(BXPN_CPUID_LIMIT_WINNT)->get();
+  if (cpuid_limit_winnt) {
+    leaf->eax = 0x1;
+  }
+  else {
+    leaf->eax = 0xd;
+  }
+
+  // CPUID vendor string (e.g. GenuineIntel, AuthenticAMD, CentaurHauls, ...)
+  memcpy(&(leaf->ebx), vendor_string,     4);
+  memcpy(&(leaf->edx), vendor_string + 4, 4);
+  memcpy(&(leaf->ecx), vendor_string + 8, 4);
+#ifdef BX_BIG_ENDIAN
+  leaf->ebx = bx_bswap32(leaf->ebx);
+  leaf->ecx = bx_bswap32(leaf->ecx);
+  leaf->edx = bx_bswap32(leaf->edx);
+#endif
+}
+
+// leaf 0x00000001 //
+void trinity_apu_t::get_std_cpuid_leaf_1(cpuid_function_t *leaf) const
+{
+  // EAX:       CPU Version Information
+  //   [3:0]   Stepping ID
+  //   [7:4]   Model: starts at 1
+  //   [11:8]  Family: 4=486, 5=Pentium, 6=PPro, ...
+  //   [13:12] Type: 0=OEM, 1=overdrive, 2=dual cpu, 3=reserved
+  //   [19:16] Extended Model
+  //   [27:20] Extended Family
+  leaf->eax = 0x00610F01;
+
+  // EBX:
+  //   [7:0]   Brand ID
+  //   [15:8]  CLFLUSH cache line size (value*8 = cache line size in bytes)
+  //   [23:16] Number of logical processors in one physical processor
+  //   [31:24] Local Apic ID
+
+  unsigned n_logical_processors = ncores*nthreads;
+  leaf->ebx = ((CACHE_LINE_SIZE / 8) << 8) |
+              (n_logical_processors << 16);
+#if BX_SUPPORT_APIC
+  leaf->ebx |= ((cpu->get_apic_id() & 0xff) << 24);
+#endif
+
+  // ECX: Extended Feature Flags
+  // * [0:0]   SSE3: SSE3 Instructions
+  // * [1:1]   PCLMULQDQ Instruction support
+  //   [2:2]   DTES64: 64-bit DS area
+  // * [3:3]   MONITOR/MWAIT support
+  //   [4:4]   DS-CPL: CPL qualified debug store
+  //   [5:5]   VMX: Virtual Machine Technology
+  //   [6:6]   SMX: Secure Virtual Machine Technology
+  //   [7:7]   EST: Enhanced Intel SpeedStep Technology
+  //   [8:8]   TM2: Thermal Monitor 2
+  // * [9:9]   SSSE3: SSSE3 Instructions
+  //   [10:10] CNXT-ID: L1 context ID
+  //   [11:11] reserved
+  // * [12:12] FMA Instructions support
+  // * [13:13] CMPXCHG16B: CMPXCHG16B instruction support
+  //   [14:14] xTPR update control
+  //   [15:15] PDCM - Perfon and Debug Capability MSR
+  //   [16:16] reserved
+  //   [17:17] PCID: Process Context Identifiers
+  //   [18:18] DCA - Direct Cache Access
+  // * [19:19] SSE4.1 Instructions
+  // * [20:20] SSE4.2 Instructions
+  //   [21:21] X2APIC
+  //   [22:22] MOVBE instruction
+  // * [23:23] POPCNT instruction
+  //   [24:24] TSC Deadline
+  // * [25:25] AES Instructions
+  // * [26:26] XSAVE extensions support
+  // * [27:27] OSXSAVE support
+  // * [28:28] AVX extensions support
+  //   [29:29] AVX F16C - Float16 conversion support
+  //   [30:30] RDRAND instruction
+  //   [31:31] reserved
+  leaf->ecx = BX_CPUID_EXT_SSE3 |
+              BX_CPUID_EXT_PCLMULQDQ |
+#if BX_SUPPORT_MONITOR_MWAIT
+              BX_CPUID_EXT_MONITOR_MWAIT |
+#endif
+              BX_CPUID_EXT_SSSE3 |
+              BX_CPUID_EXT_FMA |
+              BX_CPUID_EXT_CMPXCHG16B |
+              BX_CPUID_EXT_SSE4_1 |
+              BX_CPUID_EXT_SSE4_2 |
+              BX_CPUID_EXT_POPCNT |
+              BX_CPUID_EXT_AES |
+              BX_CPUID_EXT_XSAVE |
+              BX_CPUID_EXT_AVX |
+              BX_CPUID_EXT_AVX_F16C;
+  if (cpu->cr4.get_OSXSAVE())
+    leaf->ecx |= BX_CPUID_EXT_OSXSAVE;
+
+  // EDX: Standard Feature Flags
+  // * [0:0]   FPU on chip
+  // * [1:1]   VME: Virtual-8086 Mode enhancements
+  // * [2:2]   DE: Debug Extensions (I/O breakpoints)
+  // * [3:3]   PSE: Page Size Extensions
+  // * [4:4]   TSC: Time Stamp Counter
+  // * [5:5]   MSR: RDMSR and WRMSR support
+  // * [6:6]   PAE: Physical Address Extensions
+  // * [7:7]   MCE: Machine Check Exception
+  // * [8:8]   CXS: CMPXCHG8B instruction
+  // * [9:9]   APIC: APIC on Chip
+  //   [10:10] Reserved
+  // * [11:11] SYSENTER/SYSEXIT support
+  // * [12:12] MTRR: Memory Type Range Reg
+  // * [13:13] PGE/PTE Global Bit
+  // * [14:14] MCA: Machine Check Architecture
+  // * [15:15] CMOV: Cond Mov/Cmp Instructions
+  // * [16:16] PAT: Page Attribute Table
+  // * [17:17] PSE-36: Physical Address Extensions
+  //   [18:18] PSN: Processor Serial Number
+  // * [19:19] CLFLUSH: CLFLUSH Instruction support
+  //   [20:20] Reserved
+  //   [21:21] DS: Debug Store
+  //   [22:22] ACPI: Thermal Monitor and Software Controlled Clock Facilities
+  // * [23:23] MMX Technology
+  // * [24:24] FXSR: FXSAVE/FXRSTOR (also indicates CR4.OSFXSR is available)
+  // * [25:25] SSE: SSE Extensions
+  // * [26:26] SSE2: SSE2 Extensions
+  //   [27:27] Self Snoop
+  // * [28:28] Hyper Threading Technology
+  //   [29:29] TM: Thermal Monitor
+  //   [30:30] Reserved
+  //   [31:31] PBE: Pending Break Enable
+  leaf->edx = BX_CPUID_STD_X87 |
+              BX_CPUID_STD_VME |
+              BX_CPUID_STD_DEBUG_EXTENSIONS |
+              BX_CPUID_STD_PSE |
+              BX_CPUID_STD_TSC |
+              BX_CPUID_STD_MSR |
+              BX_CPUID_STD_PAE |
+              BX_CPUID_STD_MCE |
+              BX_CPUID_STD_CMPXCHG8B |
+              BX_CPUID_STD_SYSENTER_SYSEXIT |
+              BX_CPUID_STD_MTRR |
+              BX_CPUID_STD_GLOBAL_PAGES |
+              BX_CPUID_STD_MCA |
+              BX_CPUID_STD_CMOV |
+              BX_CPUID_STD_PAT |
+              BX_CPUID_STD_PSE36 |
+              BX_CPUID_STD_CLFLUSH |
+              BX_CPUID_STD_MMX |
+              BX_CPUID_STD_FXSAVE_FXRSTOR |
+              BX_CPUID_STD_SSE |
+              BX_CPUID_STD_SSE2 |
+              BX_CPUID_STD_HT;
+#if BX_SUPPORT_APIC
+  // if MSR_APICBASE APIC Global Enable bit has been cleared,
+  // the CPUID feature flag for the APIC is set to 0.
+  if (cpu->msr.apicbase & 0x800)
+    leaf->edx |= BX_CPUID_STD_APIC; // APIC on chip
+#endif
+}
+
+#if BX_SUPPORT_MONITOR_MWAIT
+
+// leaf 0x00000005 //
+void trinity_apu_t::get_std_cpuid_leaf_5(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x00000005 - MONITOR/MWAIT Leaf
+
+  // EAX - Smallest monitor-line size in bytes
+  // EBX - Largest  monitor-line size in bytes
+  // ECX -
+  //   [31:2] - reserved
+  //    [1:1] - exit MWAIT even with EFLAGS.IF = 0
+  //    [0:0] - MONITOR/MWAIT extensions are supported
+  // EDX -
+  //  [03-00] - number of C0 sub C-states supported using MWAIT
+  //  [07-04] - number of C1 sub C-states supported using MWAIT
+  //  [11-08] - number of C2 sub C-states supported using MWAIT
+  //  [15-12] - number of C3 sub C-states supported using MWAIT
+  //  [19-16] - number of C4 sub C-states supported using MWAIT
+  //  [31-20] - reserved (MBZ)
+  leaf->eax = CACHE_LINE_SIZE;
+  leaf->ebx = CACHE_LINE_SIZE;
+  leaf->ecx = 3;
+  leaf->edx = 0;
+}
+
+#endif
+
+// leaf 0x00000006 //
+void trinity_apu_t::get_std_cpuid_leaf_6(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x00000006 - Thermal and Power Management Leaf
+  leaf->eax = 0x00000000;
+  leaf->ebx = 0x00000000;
+  leaf->ecx = 0x00000001;
+  leaf->edx = 0x00000000;
+}
+
+// leaf 0x00000007 //
+void trinity_apu_t::get_std_cpuid_leaf_7(Bit32u subfunction, cpuid_function_t *leaf) const
+{
+  switch(subfunction) {
+  case 0:
+    leaf->eax = 0; /* report max sub-leaf that supported in leaf 7 */
+
+    //   [0:0]   FS/GS BASE access instructions
+    //   [1:1]   Support for IA32_TSC_ADJUST MSR
+    //   [2:2]   reserved
+    // * [3:3]   BMI1: Advanced Bit Manipulation Extensions
+    //   [4:4]   HLE: Hardware Lock Elision
+    //   [5:5]   AVX2
+    //   [6:6]   reserved
+    //   [7:7]   SMEP: Supervisor Mode Execution Protection
+    //   [8:8]   BMI2: Advanced Bit Manipulation Extensions
+    //   [9:9]   Support for Enhanced REP MOVSB/STOSB
+    //   [10:10] Support for INVPCID instruction
+    //   [11:11] RTM: Restricted Transactional Memory
+    //   [12:12] Supports Quality of Service (QoS) capability
+    //   [13:13] Deprecates FPU CS and FPU DS values
+    //   [17:14] reserved
+    //   [18:18] RDSEED instruction support
+    //   [19:19] ADCX/ADOX instructions support
+    //   [20:20] SMAP: Supervisor Mode Access Prevention
+    //   [31:21] reserved
+    leaf->ebx = BX_CPUID_EXT3_BMI1;
+    leaf->ecx = 0;
+    leaf->edx = 0;
+    break;
+  default:
+    leaf->eax = 0;
+    leaf->ebx = 0;
+    leaf->ecx = 0;
+    leaf->edx = 0;
+  }
+}
+
+// leaf 0x0000000D //
+void trinity_apu_t::get_std_cpuid_xsave_leaf(Bit32u subfunction, cpuid_function_t *leaf) const
+{
+  switch(subfunction) {
+  case 0:
+    // EAX - valid bits of XCR0 (lower part)
+    // EBX - Maximum size (in bytes) required by enabled features
+    // ECX - Maximum size (in bytes) required by CPU supported features
+    // EDX - valid bits of XCR0 (upper part)
+    leaf->eax = cpu->xcr0_suppmask;
+    leaf->ebx = 512+64;
+    if (cpu->xcr0.get_YMM())
+      leaf->ebx += 256;
+    leaf->ecx = 512+64+256 /* AVX */;
+    leaf->edx = 0;
+    return;
+
+  case 1:
+    leaf->eax = 0; /* XSAVEOPT supported */
+    leaf->ebx = 0;
+    leaf->ecx = 0;
+    leaf->edx = 0;
+    return;
+
+  case 2: // AVX leaf
+    leaf->eax = 256;
+    leaf->ebx = XSAVE_YMM_STATE_OFFSET;
+    leaf->ecx = 0;
+    leaf->edx = 0;
+    return;
+
+  default:
+    break;
+  }
+
+  leaf->eax = 0; // reserved
+  leaf->ebx = 0; // reserved
+  leaf->ecx = 0; // reserved
+  leaf->edx = 0; // reserved
+}
+
+// leaf 0x80000000 //
+void trinity_apu_t::get_ext_cpuid_leaf_0(cpuid_function_t *leaf) const
+{
+  static const char* vendor_string = "AuthenticAMD";
+
+  // EAX: highest extended function understood by CPUID
+  // EBX: reserved
+  // EDX: reserved
+  // ECX: reserved
+  leaf->eax = 0x8000001E;
+  memcpy(&(leaf->ebx), vendor_string,     4);
+  memcpy(&(leaf->edx), vendor_string + 4, 4);
+  memcpy(&(leaf->ecx), vendor_string + 8, 4);
+#ifdef BX_BIG_ENDIAN
+  leaf->ebx = bx_bswap32(leaf->ebx);
+  leaf->ecx = bx_bswap32(leaf->ecx);
+  leaf->edx = bx_bswap32(leaf->edx);
+#endif
+}
+
+// leaf 0x80000001 //
+void trinity_apu_t::get_ext_cpuid_leaf_1(cpuid_function_t *leaf) const
+{
+  // EAX:       CPU Version Information (same as 0x00000001.EAX)
+  leaf->eax = 0x00600f12;
+
+  // EBX:
+  //  [15:00]  Brand ID
+  //  [27:16]  Reserved
+  //  [31:28]  Package Type
+  leaf->ebx = 0x20000000;
+
+  // ECX:
+  // * [0:0]   LAHF/SAHF instructions support in 64-bit mode
+  // * [1:1]   CMP_Legacy: Core multi-processing legacy mode (AMD)
+  // * [2:2]   SVM: Secure Virtual Machine (AMD)
+  // * [3:3]   Extended APIC Space
+  // * [4:4]   AltMovCR8: LOCK MOV CR0 means MOV CR8
+  // * [5:5]   LZCNT: LZCNT instruction support
+  // * [6:6]   SSE4A: SSE4A Instructions support
+  // * [7:7]   Misaligned SSE support
+  // * [8:8]   PREFETCHW: PREFETCHW instruction support
+  // * [9:9]   OSVW: OS visible workarounds (AMD)
+  // * [10:10] IBS: Instruction based sampling
+  // * [11:11] XOP: Extended Operations Support and XOP Prefix
+  // * [12:12] SKINIT support
+  // * [13:13] WDT: Watchdog timer support
+  //   [14:14] Reserved
+  // * [15:15] LWP: Light weight profiling
+  // * [16:16] FMA4: Four-operand FMA instructions support
+  // * [17:17] Reserved
+  //   [18:18] Reserved
+  // * [19:19] NodeId: Indicates support for NodeId MSR (0xc001100c)
+  //   [20:20] Reserved
+  // * [21:21] TBM: trailing bit manipulation instructions support
+  // * [22:22] Topology extensions support
+  // * [23:23] PerfCtrExtCore: core perf counter extensions support
+  // * [24:24] PerfCtrExtNB: NB perf counter extensions support
+  //   [31:25] Reserved
+
+  leaf->ecx = BX_CPUID_EXT2_LAHF_SAHF |
+              BX_CPUID_EXT2_CMP_LEGACY |
+#if BX_SUPPORT_SVM
+              BX_CPUID_EXT2_SVM |
+#endif
+              BX_CPUID_EXT2_EXT_APIC_SPACE |
+              BX_CPUID_EXT2_ALT_MOV_CR8 |
+              BX_CPUID_EXT2_LZCNT |
+              BX_CPUID_EXT2_SSE4A |
+              BX_CPUID_EXT2_MISALIGNED_SSE |
+              BX_CPUID_EXT2_PREFETCHW |
+              BX_CPUID_EXT2_OSVW |
+              BX_CPUID_EXT2_IBS |
+              BX_CPUID_EXT2_XOP |
+           /* BX_CPUID_EXT2_SKINIT | */ // not implemented
+              BX_CPUID_EXT2_WDT |
+           /* BX_CPUID_EXT2_LWP | */    // not implemented
+              BX_CPUID_EXT2_FMA4 |
+              BX_CPUID_EXT2_NODEID |
+              BX_CPUID_EXT2_TBM |
+              BX_CPUID_EXT2_TOPOLOGY_EXTENSIONS |
+              BX_CPUID_EXT2_PERFCTR_EXT_CORE |
+              BX_CPUID_EXT2_PERFCTR_EXT_NB;
+
+  // EDX:
+  // Many of the bits in EDX are the same as FN 0x00000001 for AMD
+  // * [0:0]   FPU on chip
+  // * [1:1]   VME: Virtual-8086 Mode enhancements
+  // * [2:2]   DE: Debug Extensions (I/O breakpoints)
+  // * [3:3]   PSE: Page Size Extensions
+  // * [4:4]   TSC: Time Stamp Counter
+  // * [5:5]   MSR: RDMSR and WRMSR support
+  // * [6:6]   PAE: Physical Address Extensions
+  // * [7:7]   MCE: Machine Check Exception
+  // * [8:8]   CXS: CMPXCHG8B instruction
+  // * [9:9]   APIC: APIC on Chip
+  //   [10:10] Reserved
+  // * [11:11] SYSCALL/SYSRET support
+  // * [12:12] MTRR: Memory Type Range Reg
+  // * [13:13] PGE/PTE Global Bit
+  // * [14:14] MCA: Machine Check Architecture
+  // * [15:15] CMOV: Cond Mov/Cmp Instructions
+  // * [16:16] PAT: Page Attribute Table
+  // * [17:17] PSE-36: Physical Address Extensions
+  //   [18:18] Reserved
+  //   [19:19] Reserved
+  // * [20:20] No-Execute page protection
+  //   [21:21] Reserved
+  // * [22:22] AMD MMX Extensions
+  // * [23:23] MMX Technology
+  // * [24:24] FXSR: FXSAVE/FXRSTOR (also indicates CR4.OSFXSR is available)
+  // * [25:25] Fast FXSAVE/FXRSTOR mode support
+  // * [26:26] 1G paging support
+  // * [27:27] Support RDTSCP Instruction
+  //   [28:28] Reserved
+  // * [29:29] Long Mode
+  //   [30:30] AMD 3DNow! Extensions
+  //   [31:31] AMD 3DNow! Instructions
+  leaf->edx = BX_CPUID_STD_X87 |
+              BX_CPUID_STD_VME |
+              BX_CPUID_STD_DEBUG_EXTENSIONS |
+              BX_CPUID_STD_PSE |
+              BX_CPUID_STD_TSC |
+              BX_CPUID_STD_MSR |
+              BX_CPUID_STD_PAE |
+              BX_CPUID_STD_MCE |
+              BX_CPUID_STD_CMPXCHG8B |
+              BX_CPUID_STD2_SYSCALL_SYSRET |
+              BX_CPUID_STD_MTRR |
+              BX_CPUID_STD_GLOBAL_PAGES |
+              BX_CPUID_STD_MCA |
+              BX_CPUID_STD_CMOV |
+              BX_CPUID_STD_PAT |
+              BX_CPUID_STD_PSE36 |
+              BX_CPUID_STD2_NX |
+              BX_CPUID_STD2_AMD_MMX_EXT |
+              BX_CPUID_STD_MMX |
+              BX_CPUID_STD_FXSAVE_FXRSTOR |
+              BX_CPUID_STD2_FFXSR |
+              BX_CPUID_STD2_1G_PAGES |
+              BX_CPUID_STD2_RDTSCP |
+              BX_CPUID_STD2_LONG_MODE;
+#if BX_SUPPORT_APIC
+  // if MSR_APICBASE APIC Global Enable bit has been cleared,
+  // the CPUID feature flag for the APIC is set to 0.
+  if (cpu->msr.apicbase & 0x800)
+    leaf->edx |= BX_CPUID_STD_APIC; // APIC on chip
+#endif
+}
+
+// leaf 0x80000002 //
+// leaf 0x80000003 //
+// leaf 0x80000004 //
+void trinity_apu_t::get_ext_cpuid_brand_string_leaf(Bit32u function, cpuid_function_t *leaf) const
+{
+  // CPUID function 0x80000002-0x80000004 - Processor Name String Identifier
+  static const char* brand_string = "AMD A8-5600K APU with Radeon(tm) HD Graphics   ";
+  switch(function) {
+  case 0x80000002:
+    memcpy(&(leaf->eax), brand_string     , 4);
+    memcpy(&(leaf->ebx), brand_string +  4, 4);
+    memcpy(&(leaf->ecx), brand_string +  8, 4);
+    memcpy(&(leaf->edx), brand_string + 12, 4);
+    break;
+  case 0x80000003:
+    memcpy(&(leaf->eax), brand_string + 16, 4);
+    memcpy(&(leaf->ebx), brand_string + 20, 4);
+    memcpy(&(leaf->ecx), brand_string + 24, 4);
+    memcpy(&(leaf->edx), brand_string + 28, 4);
+    break;
+  case 0x80000004:
+    memcpy(&(leaf->eax), brand_string + 32, 4);
+    memcpy(&(leaf->ebx), brand_string + 36, 4);
+    memcpy(&(leaf->ecx), brand_string + 40, 4);
+    memcpy(&(leaf->edx), brand_string + 44, 4);
+    break;
+  default:
+    break;
+  }
+
+#ifdef BX_BIG_ENDIAN
+  leaf->eax = bx_bswap32(leaf->eax);
+  leaf->ebx = bx_bswap32(leaf->ebx);
+  leaf->ecx = bx_bswap32(leaf->ecx);
+  leaf->edx = bx_bswap32(leaf->edx);
+#endif
+}
+
+// leaf 0x80000005 //
+void trinity_apu_t::get_ext_cpuid_leaf_5(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x800000005 - L1 Cache and TLB Identifiers
+  leaf->eax = 0xFF40FF18;
+  leaf->ebx = 0xFF40FF30;
+  leaf->ecx = 0x10040140;
+  leaf->edx = 0x40020140;
+}
+
+// leaf 0x80000006 //
+void trinity_apu_t::get_ext_cpuid_leaf_6(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x800000006 - L2 Cache and TLB Identifiers
+  leaf->eax = 0x64006400;
+  leaf->ebx = 0x64004200;
+  leaf->ecx = 0x08008140;
+  leaf->edx = 0x00000000;
+}
+
+// leaf 0x80000007 //
+void trinity_apu_t::get_ext_cpuid_leaf_7(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x800000007 - Advanced Power Management
+  leaf->eax = 0;
+  leaf->ebx = 0;
+  leaf->ecx = 0;
+  leaf->edx = 0x000007D9;
+}
+
+// leaf 0x80000008 //
+void trinity_apu_t::get_ext_cpuid_leaf_8(cpuid_function_t *leaf) const
+{
+  // virtual & phys address size in low 2 bytes.
+  leaf->eax = BX_PHY_ADDRESS_WIDTH | (BX_LIN_ADDRESS_WIDTH << 8);
+  leaf->ebx = 0;
+
+  // [17..16] Performance time-stamp counter size.
+  // [15..12] APIC ID size, Zero value indicates that legacy methods must be
+  //          used to derive the maximum number of cores.
+  //  [11..8] (reserved)
+  //   [7..0] Number of physical cores - 1.
+  leaf->ecx = ncores - 1;
+  leaf->edx = 0;
+}
+
+// leaf 0x80000009 : Reserved //
+
+#if BX_SUPPORT_SVM
+
+// leaf 0x8000000A : SVM //
+void trinity_apu_t::get_ext_cpuid_leaf_A(cpuid_function_t *leaf) const
+{
+  leaf->eax = 0x01; /* SVM revision ID */
+  leaf->ebx = 0x40; /* number of ASIDs */
+  leaf->ecx = 0;
+
+  // * [0:0]   NP - Nested paging support
+  // * [1:1]   LBR virtualization
+  // * [2:2]   SVM Lock
+  // * [3:3]   NRIPS - Next RIP save on VMEXIT
+  // * [4:4]   TscRate - MSR based TSC ratio control
+  // * [5:5]   VMCB Clean bits support
+  // * [6:6]   Flush by ASID support
+  // * [7:7]   Decode assists support
+  //   [8:8]   Reserved
+  //   [9:9]   Reserved
+  // * [10:10] Pause filter support
+  //   [11:11] Reserved
+  // * [12:12] Pause filter threshold support
+  //   [13:13] Advanced Virtual Interrupt Controller
+  leaf->edx = get_svm_extensions_bitmask();
+}
+
+#endif
+
+// leaf 0x8000000B - 0x80000018: Reserved //
+
+void trinity_apu_t::get_ext_cpuid_leaf_19(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x800000019 - 1G Page TLB Identifiers
+  leaf->eax = 0xF040F018;
+  leaf->ebx = 0x64006400;
+  leaf->ecx = 0;
+  leaf->edx = 0;
+}
+
+void trinity_apu_t::get_ext_cpuid_leaf_1A(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x80000001A - Performance Optimization Identifiers
+  leaf->eax = 0x00000003;
+  leaf->ebx = 0;
+  leaf->ecx = 0;
+  leaf->edx = 0;
+}
+
+void trinity_apu_t::get_ext_cpuid_leaf_1B(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x80000001B - Instruction Based Sampling Identifiers
+  leaf->eax = 0xFF;
+  leaf->ebx = 0;
+  leaf->ecx = 0;
+  leaf->edx = 0;
+
+  BX_INFO(("WARNING: Instruction Based Sampling is not implemented"));
+}
+
+void trinity_apu_t::get_ext_cpuid_leaf_1C(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x80000001C - Lightweight Profiling Capabilities (not implemented)
+  leaf->eax = 0;
+  leaf->ebx = 0;
+  leaf->ecx = 0;
+  leaf->edx = 0;
+}
+
+void trinity_apu_t::get_ext_cpuid_leaf_1D(Bit32u subfunction, cpuid_function_t *leaf) const
+{
+  // CPUID function 0x80000001D - Cache Properties
+  switch(subfunction) {
+  case 0:
+    leaf->eax = 0x00000121;
+    leaf->ebx = 0x00C0003F;
+    leaf->ecx = 0x0000003F;
+    leaf->edx = 0x00000000;
+    return;
+  case 1:
+    leaf->eax = 0x00004122;
+    leaf->ebx = 0x0040003F;
+    leaf->ecx = 0x000001FF;
+    leaf->edx = 0x00000000;
+    return;
+  case 2:
+    leaf->eax = 0x00004143;
+    leaf->ebx = 0x03C0003F;
+    leaf->ecx = 0x000007FF;
+    leaf->edx = 0x00000001;
+    return;
+  default:
+    leaf->eax = 0;
+    leaf->ebx = 0;
+    leaf->ecx = 0;
+    leaf->edx = 0;
+    return;
+  }
+}
+
+void trinity_apu_t::get_ext_cpuid_leaf_1E(cpuid_function_t *leaf) const
+{
+  // CPUID function 0x80000001E - Topology Extensions
+  leaf->eax = 0;
+  leaf->ebx = (ncores - 1) << 8;
+  leaf->ecx = 0;
+  leaf->edx = 0;
+}
+
+void trinity_apu_t::dump_cpuid(void) const
+{
+  struct cpuid_function_t leaf;
+  unsigned n;
+
+  for (n=0; n <= 0xd; n++) {
+    get_cpuid_leaf(n, 0x00000000, &leaf);
+    BX_INFO(("CPUID[0x%08x]: %08x %08x %08x %08x", n, leaf.eax, leaf.ebx, leaf.ecx, leaf.edx));
+  }
+
+  for (n=0x80000000; n<=0x8000001E; n++) {
+    get_cpuid_leaf(n, 0x00000000, &leaf);
+    BX_INFO(("CPUID[0x%08x]: %08x %08x %08x %08x", n, leaf.eax, leaf.ebx, leaf.ecx, leaf.edx));
+  }
+}
+
+bx_cpuid_t *create_trinity_apu_cpuid(BX_CPU_C *cpu) { return new trinity_apu_t(cpu); }
+
+#endif
diff --git a/bochs/cpu/cpudb/trinity_apu.h b/bochs/cpu/cpudb/trinity_apu.h
new file mode 100644
index 000000000..fc97c11ce
--- /dev/null
+++ b/bochs/cpu/cpudb/trinity_apu.h
@@ -0,0 +1,81 @@
+/////////////////////////////////////////////////////////////////////////
+// $Id$
+/////////////////////////////////////////////////////////////////////////
+//
+//   Copyright (c) 2014 Stanislav Shwartsman
+//          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//
+/////////////////////////////////////////////////////////////////////////
+
+#ifndef BX_AMD_TRINITY_CPUID_DEFINITIONS_H
+#define BX_AMD_TRINITY_CPUID_DEFINITIONS_H
+
+#if BX_SUPPORT_X86_64 && BX_SUPPORT_AVX
+
+#include "cpu/cpuid.h"
+
+class trinity_apu_t : public bx_cpuid_t {
+public:
+  trinity_apu_t(BX_CPU_C *cpu);
+  virtual ~trinity_apu_t() {}
+
+  // return CPU name
+  virtual const char *get_name(void) const { return "trinity_apu"; }
+
+  virtual Bit64u get_isa_extensions_bitmask(void) const;
+  virtual Bit32u get_cpu_extensions_bitmask(void) const;
+#if BX_SUPPORT_SVM
+  virtual Bit32u get_svm_extensions_bitmask(void) const;
+#endif
+
+  virtual void get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf) const;
+
+  virtual void dump_cpuid(void) const;
+
+private:
+  void get_std_cpuid_leaf_0(cpuid_function_t *leaf) const;
+  void get_std_cpuid_leaf_1(cpuid_function_t *leaf) const;
+#if BX_SUPPORT_MONITOR_MWAIT
+  void get_std_cpuid_leaf_5(cpuid_function_t *leaf) const;
+#endif
+  void get_std_cpuid_leaf_6(cpuid_function_t *leaf) const;
+  void get_std_cpuid_leaf_7(Bit32u subfunction, cpuid_function_t *leaf) const;
+  void get_std_cpuid_xsave_leaf(Bit32u subfunction, cpuid_function_t *leaf) const;
+
+  void get_ext_cpuid_leaf_0(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_1(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_brand_string_leaf(Bit32u function, cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_5(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_6(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_7(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_8(cpuid_function_t *leaf) const;
+#if BX_SUPPORT_SVM
+  void get_ext_cpuid_leaf_A(cpuid_function_t *leaf) const;
+#endif
+  void get_ext_cpuid_leaf_19(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_1A(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_1B(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_1C(cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_1D(Bit32u subfunction, cpuid_function_t *leaf) const;
+  void get_ext_cpuid_leaf_1E(cpuid_function_t *leaf) const;
+};
+
+extern bx_cpuid_t *create_trinity_apu_cpuid(BX_CPU_C *cpu);
+
+#endif // BX_SUPPORT_X86_64 && BX_SUPPORT_AVX
+
+#endif
diff --git a/bochs/cpu/cpudb/trinity_apu.txt b/bochs/cpu/cpudb/trinity_apu.txt
new file mode 100644
index 000000000..2dfd442ea
--- /dev/null
+++ b/bochs/cpu/cpudb/trinity_apu.txt
@@ -0,0 +1,504 @@
+CPU-Z TXT Report
+-------------------------------------------------------------------------
+
+Binaries
+-------------------------------------------------------------------------
+
+CPU-Z version			1.68.0.x64
+
+Processors
+-------------------------------------------------------------------------
+
+Number of processors		1
+Number of threads		4
+
+APICs
+-------------------------------------------------------------------------
+
+Processor 0	
+	-- Core 0	
+		-- Thread 0	0
+	-- Core 1	
+		-- Thread 0	1
+	-- Core 2	
+		-- Thread 0	2
+	-- Core 3	
+		-- Thread 0	3
+
+Timers
+-------------------------------------------------------------------------
+
+	ACPI timer		3.580 MHz
+	HPET timer		14.318 MHz
+	Perf timer		3.509 MHz
+	Sys timer		1.000 KHz
+	BCLK timer		99.80 MHz
+
+
+Processors Information
+-------------------------------------------------------------------------
+
+Processor 1			ID = 0
+	Number of cores		4 (max 4)
+	Number of threads	4 (max 4)
+	Name			AMD A8-5600K
+	Codename		Trinity
+	Specification		AMD A8-5600K APU with Radeon(tm) HD Graphics   
+	Package 		Socket FM2 (904)
+	CPUID			F.0.1
+	Extended CPUID		15.10
+	Core Stepping		TN-A1
+	Technology		32 nm
+	TDP Limit		99 Watts
+	Core Speed		3792.3 MHz
+	Multiplier x Bus Speed	38.0 x 99.8 MHz
+	Stock frequency		3600 MHz
+	Instructions sets	MMX (+), SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, SSE4A, x86-64, AMD-V, AES, AVX, XOP, FMA3, FMA4
+	L1 Data cache		4 x 16 KBytes, 4-way set associative, 64-byte line size
+	L1 Instruction cache	2 x 64 KBytes, 2-way set associative, 64-byte line size
+	L2 cache		2 x 2048 KBytes, 16-way set associative, 64-byte line size
+	FID/VID Control		yes
+	Min FID			7.0x
+	# of P-States		8
+	P-State			FID 0x17 - VID 0x10 - IDD 19 (19.50x - 1.450 V)
+	P-State			FID 0x16 - VID 0x14 - IDD 20 (19.00x - 1.425 V)
+	P-State			FID 0x14 - VID 0x22 - IDD 15 (18.00x - 1.337 V)
+	P-State			FID 0x10 - VID 0x2E - IDD 12 (16.00x - 1.262 V)
+	P-State			FID 0xC - VID 0x3C - IDD 9 (14.00x - 1.175 V)
+	P-State			FID 0x8 - VID 0x4E - IDD 7 (12.00x - 1.063 V)
+	P-State			FID 0x3 - VID 0x60 - IDD 5 (9.50x - 0.950 V)
+	P-State			FID 0x10C - VID 0x68 - IDD 3 (7.00x - 0.900 V)
+
+	PStateReg		0x800001BF-0x00002017
+	PStateReg		0x800001CA-0x00002816
+	PStateReg		0x80000194-0x00004414
+	PStateReg		0x80000177-0x00005C10
+	PStateReg		0x8000015D-0x0000780C
+	PStateReg		0x80000143-0x00009C08
+	PStateReg		0x8000012D-0x0000C003
+	PStateReg		0x80000121-0x0040D04C
+
+	Package Type		0x2
+	Model			00
+	String 1		0x0
+	String 2		0x0
+	Page			0x0
+	Base TDP		0 Watts
+	Boosted P-States	2
+	Max non-turbo ratio	36.00x
+	Max turbo ratio		39.00x
+	TSC			3593.6 MHz
+	APERF			3786.6 MHz
+	MPERF			3585.3 MHz
+	Attached device		PCI device at bus 0, device 24, function 0
+			100	00000000 00000000 00000000 00000000 
+			110	00000008 00000000 00000000 00000000 
+			120	00000000 00000000 00000000 00000000 
+			130	00000000 00000000 00000000 00000000 
+			140	00000000 00000000 00000000 00000000 
+			150	00000000 00000000 00000000 00000000 
+			160	00000000 00000000 00000800 0074003A 
+			170	00000001 00000000 00000000 00000000 
+			180	00000000 00000000 00000000 00000000 
+			190	00000000 00000000 00000000 00000000 
+			1A0	80000003 00000000 00000000 00000000 
+			1B0	00000000 00000000 00000000 00000000 
+			1C0	00000000 00000000 00000000 00000000 
+			1D0	00000000 00000000 00000000 0000000E 
+			1E0	00000000 00000000 00000000 00000000 
+			1F0	00000000 00000000 00000000 00000000 
+		
+	Attached device		PCI device at bus 0, device 24, function 1
+			100	00000000 00000000 00000000 00000000 
+			110	00000000 00000000 00000000 00000000 
+			120	00000000 00000089 00000000 00000000 
+			130	00000000 00000000 00000000 00000000 
+			140	00000000 00000000 00000000 00000000 
+			150	00000000 00000000 00000000 00000000 
+			160	00000000 00000000 00000000 00000000 
+			170	00000000 00000000 00000000 00000000 
+			180	00000000 00000000 00000000 00000000 
+			190	00000000 00000000 00000000 00000000 
+			1A0	00000000 00000000 00000000 00000000 
+			1B0	00000000 00000000 00000000 00000000 
+			1C0	00000000 00000000 00000000 00000000 
+			1D0	00000000 00000000 00000000 00000000 
+			1E0	00000000 00000000 00000000 00000000 
+			1F0	00000000 00000000 00000000 00000000 
+		
+	Attached device		PCI device at bus 0, device 24, function 2
+			100	00000000 00000000 00000000 00000000 
+			110	00000104 00000200 0C4CA424 0CE00F31 
+			120	00F99575 00000000 00000000 00000000 
+			130	C2DCF93D DD4FB91B 6635F25A 30899101 
+			140	00000001 00000029 00000000 00000000 
+			150	00000000 00000000 00000000 00000000 
+			160	01F8FFC0 00000000 00000000 00000000 
+			170	00000000 00000000 00020000 18000400 
+			180	0000000A 00800005 39000000 00020000 
+			190	03010000 9F590892 8D0F812F 000000A1 
+			1A0	030A0300 00000000 80320000 00000000 
+			1B0	0FC39001 4C0F7D26 00000000 00000000 
+			1C0	00000000 00000000 00000000 00000000 
+			1D0	00000000 00000000 00000000 00000000 
+			1E0	00000000 00000000 00000000 00000000 
+			1F0	00000000 00000000 00000000 00000000 
+		
+	Attached device		PCI device at bus 0, device 24, function 3
+			100	00000000 00000000 00000000 00000000 
+			110	00000000 00000000 00000000 00000000 
+			120	00000000 00000000 00000000 00000000 
+			130	00000000 00000000 00000000 00000000 
+			140	00A11555 00000077 0000052A 00000000 
+			150	00000000 00000000 00000000 00000000 
+			160	C00A0FFF 00000000 C00A0FFF 00000000 
+			170	00000000 00000000 00000000 00000004 
+			180	017003E0 00000000 08000010 00000000 
+			190	00000000 00000000 04000000 00000000 
+			1A0	00034182 00000000 00000000 00000000 
+			1B0	00000000 00000000 00000000 00000000 
+			1C0	00000000 00000000 00000000 00000100 
+			1D0	00000000 00000000 00000000 00000000 
+			1E0	00000000 80001385 00000000 00000000 
+			1F0	00080000 00000000 00000000 090E074F 
+		
+	Attached device		PCI device at bus 0, device 24, function 4
+			100	00000000 00000000 00000000 00830069 
+			110	000C2002 00000000 1907190B 00000000 
+			120	00000000 00000000 801C0280 00000000 
+			130	00000002 00000000 00000000 00000001 
+			140	0A418857 000210C6 1B8EAC33 0003C415 
+			150	50500850 34343434 00000083 00000089 
+			160	00610F01 00000000 00000000 00000276 
+			170	00000000 00000000 00000000 00000000 
+			180	00000000 00000000 00000000 00000000 
+			190	00000000 00000000 00000000 00000000 
+			1A0	00000000 00000000 00000000 00000000 
+			1B0	00000000 00000000 00000116 00000000 
+			1C0	00000000 00000000 00000000 00000000 
+			1D0	00000000 00000000 00000000 00000000 
+			1E0	0B7E2017 0B942816 0B284414 0AEE5C10 
+			1F0	0ABA780C 0A869C08 0A5AC003 0A43D04C 
+		
+	Attached device		PCI device at bus 0, device 24, function 5
+			100	00000000 00000000 00000000 00000000 
+			110	00000000 00000000 00000000 00000000 
+			120	00000011 00000000 00400058 0000002E 
+			130	00000000 00000000 00000000 00000000 
+			140	00000000 00000000 00000000 00000000 
+			150	00000000 00000000 01190021 01330014 
+			160	2A00F81D 2A011017 23011815 9D459899 
+			170	00000453 000AC05A 00060C04 B3000000 
+			180	00000000 00000000 0000002D 00000000 
+			190	00000000 0000000B 00202020 00000000 
+			1A0	00000000 00000000 00000000 00000000 
+			1B0	00000000 00000000 00000000 00000000 
+			1C0	00000000 00000000 00000000 00000000 
+			1D0	00000000 00000000 00000000 00000000 
+			1E0	00000000 00000000 00000000 00000000 
+			1F0	00000000 00000000 00000000 00000000 
+		
+
+
+Thread dumps
+-------------------------------------------------------------------------
+
+CPU Thread 0	
+	APIC ID			0
+	Topology		Processor ID 0, Core ID 0, Thread ID 0
+	Type			02040004h
+	Max CPUID level		0000000Dh
+	Max CPUID ext. level	8000001Eh
+	Cache descriptor	Level 1, D, 16 KB, 1 thread(s)
+	Cache descriptor	Level 1, I, 64 KB, 2 thread(s)
+	Cache descriptor	Level 2, U, 2 MB, 2 thread(s)
+
+	CPUID		 
+	0x00000000		0x0000000D	0x68747541	0x444D4163	0x69746E65
+	0x00000001		0x00610F01	0x00040800	0x3698320B	0x178BFBFF
+	0x00000002		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000003		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000004		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000005		0x00000040	0x00000040	0x00000003	0x00000000
+	0x00000006		0x00000000	0x00000000	0x00000001	0x00000000
+	0x00000007		0x00000000	0x00000008	0x00000000	0x00000000
+	0x00000008		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000A		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000D		0x00000007	0x00000240	0x000003C0	0x40000000
+	0x80000000		0x8000001E	0x68747541	0x444D4163	0x69746E65
+	0x80000001		0x00610F01	0x20000000	0x01EBBFFF	0x2FD3FBFF
+	0x80000002		0x20444D41	0x352D3841	0x4B303036	0x55504120
+	0x80000003		0x74697720	0x61522068	0x6E6F6564	0x296D7428
+	0x80000004		0x20444820	0x70617247	0x73636968	0x00202020
+	0x80000005		0xFF40FF18	0xFF40FF30	0x10040140	0x40020140
+	0x80000006		0x64006400	0x64004200	0x08008140	0x00000000
+	0x80000007		0x00000000	0x00000000	0x00000000	0x000007D9
+	0x80000008		0x00003030	0x00000000	0x00004003	0x00000000
+	0x80000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000A		0x00000001	0x00010000	0x00000000	0x00001CFF
+	0x8000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000D		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000E		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000F		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000010		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000011		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000012		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000013		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000014		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000015		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000016		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000017		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000018		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000019		0xF040F018	0x64006400	0x00000000	0x00000000
+	0x8000001A		0x00000003	0x00000000	0x00000000	0x00000000
+	0x8000001B		0x000000FF	0x00000000	0x00000000	0x00000000
+	0x8000001C		0x00000000	0x80032013	0x00010200	0x8000000F
+	0x8000001D		0x00000121	0x00C0003F	0x0000003F	0x00000000
+	0x8000001D		0x00004122	0x0040003F	0x000001FF	0x00000000
+	0x8000001D		0x00004143	0x03C0003F	0x000007FF	0x00000001
+	0x8000001E		0x00000010	0x00000100	0x00000000	0x00000000
+
+	MSR 0x0000001B		0x00000000	0xFEE00900
+	MSR 0xC0010114		0x00000000	0x00000008
+	MSR 0xC0010061		0x00000000	0x00000050
+	MSR 0xC0010062		0x00000000	0x00000000
+	MSR 0xC0010063		0x00000000	0x00000000
+	MSR 0xC0010064		0x800001BF	0x00002017
+	MSR 0xC0010065		0x800001CA	0x00002816
+	MSR 0xC0010066		0x80000194	0x00004414
+	MSR 0xC0010067		0x80000177	0x00005C10
+	MSR 0xC0010068		0x8000015D	0x0000780C
+	MSR 0xC0010015		0x00000000	0x09001011
+	MSR 0xC001001F		0x00404000	0x00810000
+	MSR 0xC0010058		0x00000000	0xE0000021
+	MSR 0xC0010071		0x01000006	0x2C012816
+	MSR 0xC0010070		0x00000000	0x2C012816
+
+CPU Thread 1	
+	APIC ID			1
+	Topology		Processor ID 0, Core ID 1, Thread ID 0
+	Type			02040004h
+	Max CPUID level		0000000Dh
+	Max CPUID ext. level	8000001Eh
+	Cache descriptor	Level 1, D, 16 KB, 1 thread(s)
+	Cache descriptor	Level 1, I, 64 KB, 2 thread(s)
+	Cache descriptor	Level 2, U, 2 MB, 2 thread(s)
+
+	CPUID		 
+	0x00000000		0x0000000D	0x68747541	0x444D4163	0x69746E65
+	0x00000001		0x00610F01	0x01040800	0x3698320B	0x178BFBFF
+	0x00000002		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000003		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000004		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000005		0x00000040	0x00000040	0x00000003	0x00000000
+	0x00000006		0x00000000	0x00000000	0x00000001	0x00000000
+	0x00000007		0x00000000	0x00000008	0x00000000	0x00000000
+	0x00000008		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000A		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000D		0x00000007	0x00000240	0x000003C0	0x40000000
+	0x80000000		0x8000001E	0x68747541	0x444D4163	0x69746E65
+	0x80000001		0x00610F01	0x20000000	0x01EBBFFF	0x2FD3FBFF
+	0x80000002		0x20444D41	0x352D3841	0x4B303036	0x55504120
+	0x80000003		0x74697720	0x61522068	0x6E6F6564	0x296D7428
+	0x80000004		0x20444820	0x70617247	0x73636968	0x00202020
+	0x80000005		0xFF40FF18	0xFF40FF30	0x10040140	0x40020140
+	0x80000006		0x64006400	0x64004200	0x08008140	0x00000000
+	0x80000007		0x00000000	0x00000000	0x00000000	0x000007D9
+	0x80000008		0x00003030	0x00000000	0x00004003	0x00000000
+	0x80000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000A		0x00000001	0x00010000	0x00000000	0x00001CFF
+	0x8000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000D		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000E		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000F		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000010		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000011		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000012		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000013		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000014		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000015		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000016		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000017		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000018		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000019		0xF040F018	0x64006400	0x00000000	0x00000000
+	0x8000001A		0x00000003	0x00000000	0x00000000	0x00000000
+	0x8000001B		0x000000FF	0x00000000	0x00000000	0x00000000
+	0x8000001C		0x00000000	0x80032013	0x00010200	0x8000000F
+	0x8000001D		0x00000121	0x00C0003F	0x0000003F	0x00000000
+	0x8000001D		0x00004122	0x0040003F	0x000001FF	0x00000000
+	0x8000001D		0x00004143	0x03C0003F	0x000007FF	0x00000001
+	0x8000001E		0x00000011	0x00000100	0x00000000	0x00000000
+
+	MSR 0x0000001B		0x00000000	0xFEE00800
+	MSR 0xC0010114		0x00000000	0x00000008
+	MSR 0xC0010061		0x00000000	0x00000050
+	MSR 0xC0010062		0x00000000	0x00000000
+	MSR 0xC0010063		0x00000000	0x00000000
+	MSR 0xC0010064		0x800001BF	0x00002017
+	MSR 0xC0010065		0x800001CA	0x00002816
+	MSR 0xC0010066		0x80000194	0x00004414
+	MSR 0xC0010067		0x80000177	0x00005C10
+	MSR 0xC0010068		0x8000015D	0x0000780C
+	MSR 0xC0010015		0x00000000	0x09001011
+	MSR 0xC001001F		0x00404000	0x00810000
+	MSR 0xC0010058		0x00000000	0xE0000021
+	MSR 0xC0010071		0x01000006	0x2C012816
+	MSR 0xC0010070		0x00000000	0x2C012816
+
+CPU Thread 2	
+	APIC ID			2
+	Topology		Processor ID 0, Core ID 2, Thread ID 0
+	Type			02040004h
+	Max CPUID level		0000000Dh
+	Max CPUID ext. level	8000001Eh
+	Cache descriptor	Level 1, D, 16 KB, 1 thread(s)
+	Cache descriptor	Level 1, I, 64 KB, 2 thread(s)
+	Cache descriptor	Level 2, U, 2 MB, 2 thread(s)
+
+	CPUID		 
+	0x00000000		0x0000000D	0x68747541	0x444D4163	0x69746E65
+	0x00000001		0x00610F01	0x02040800	0x3698320B	0x178BFBFF
+	0x00000002		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000003		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000004		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000005		0x00000040	0x00000040	0x00000003	0x00000000
+	0x00000006		0x00000000	0x00000000	0x00000001	0x00000000
+	0x00000007		0x00000000	0x00000008	0x00000000	0x00000000
+	0x00000008		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000A		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000D		0x00000007	0x00000240	0x000003C0	0x40000000
+	0x80000000		0x8000001E	0x68747541	0x444D4163	0x69746E65
+	0x80000001		0x00610F01	0x20000000	0x01EBBFFF	0x2FD3FBFF
+	0x80000002		0x20444D41	0x352D3841	0x4B303036	0x55504120
+	0x80000003		0x74697720	0x61522068	0x6E6F6564	0x296D7428
+	0x80000004		0x20444820	0x70617247	0x73636968	0x00202020
+	0x80000005		0xFF40FF18	0xFF40FF30	0x10040140	0x40020140
+	0x80000006		0x64006400	0x64004200	0x08008140	0x00000000
+	0x80000007		0x00000000	0x00000000	0x00000000	0x000007D9
+	0x80000008		0x00003030	0x00000000	0x00004003	0x00000000
+	0x80000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000A		0x00000001	0x00010000	0x00000000	0x00001CFF
+	0x8000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000D		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000E		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000F		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000010		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000011		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000012		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000013		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000014		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000015		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000016		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000017		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000018		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000019		0xF040F018	0x64006400	0x00000000	0x00000000
+	0x8000001A		0x00000003	0x00000000	0x00000000	0x00000000
+	0x8000001B		0x000000FF	0x00000000	0x00000000	0x00000000
+	0x8000001C		0x00000000	0x80032013	0x00010200	0x8000000F
+	0x8000001D		0x00000121	0x00C0003F	0x0000003F	0x00000000
+	0x8000001D		0x00004122	0x0040003F	0x000001FF	0x00000000
+	0x8000001D		0x00004143	0x03C0003F	0x000007FF	0x00000001
+	0x8000001E		0x00000012	0x00000101	0x00000000	0x00000000
+
+	MSR 0x0000001B		0x00000000	0xFEE00800
+	MSR 0xC0010114		0x00000000	0x00000008
+	MSR 0xC0010061		0x00000000	0x00000050
+	MSR 0xC0010062		0x00000000	0x00000000
+	MSR 0xC0010063		0x00000000	0x00000000
+	MSR 0xC0010064		0x800001BF	0x00002017
+	MSR 0xC0010065		0x800001CA	0x00002816
+	MSR 0xC0010066		0x80000194	0x00004414
+	MSR 0xC0010067		0x80000177	0x00005C10
+	MSR 0xC0010068		0x8000015D	0x0000780C
+	MSR 0xC0010015		0x00000000	0x09001011
+	MSR 0xC001001F		0x00404000	0x00810000
+	MSR 0xC0010058		0x00000000	0xE0000021
+	MSR 0xC0010071		0x00000006	0x2C002017
+	MSR 0xC0010070		0x00000000	0x2C002017
+
+CPU Thread 3	
+	APIC ID			3
+	Topology		Processor ID 0, Core ID 3, Thread ID 0
+	Type			02040004h
+	Max CPUID level		0000000Dh
+	Max CPUID ext. level	8000001Eh
+	Cache descriptor	Level 1, D, 16 KB, 1 thread(s)
+	Cache descriptor	Level 1, I, 64 KB, 2 thread(s)
+	Cache descriptor	Level 2, U, 2 MB, 2 thread(s)
+
+	CPUID		 
+	0x00000000		0x0000000D	0x68747541	0x444D4163	0x69746E65
+	0x00000001		0x00610F01	0x03040800	0x3698320B	0x178BFBFF
+	0x00000002		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000003		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000004		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000005		0x00000040	0x00000040	0x00000003	0x00000000
+	0x00000006		0x00000000	0x00000000	0x00000001	0x00000000
+	0x00000007		0x00000000	0x00000008	0x00000000	0x00000000
+	0x00000008		0x00000000	0x00000000	0x00000000	0x00000000
+	0x00000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000A		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x0000000D		0x00000007	0x00000240	0x000003C0	0x40000000
+	0x80000000		0x8000001E	0x68747541	0x444D4163	0x69746E65
+	0x80000001		0x00610F01	0x20000000	0x01EBBFFF	0x2FD3FBFF
+	0x80000002		0x20444D41	0x352D3841	0x4B303036	0x55504120
+	0x80000003		0x74697720	0x61522068	0x6E6F6564	0x296D7428
+	0x80000004		0x20444820	0x70617247	0x73636968	0x00202020
+	0x80000005		0xFF40FF18	0xFF40FF30	0x10040140	0x40020140
+	0x80000006		0x64006400	0x64004200	0x08008140	0x00000000
+	0x80000007		0x00000000	0x00000000	0x00000000	0x000007D9
+	0x80000008		0x00003030	0x00000000	0x00004003	0x00000000
+	0x80000009		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000A		0x00000001	0x00010000	0x00000000	0x00001CFF
+	0x8000000B		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000C		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000D		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000E		0x00000000	0x00000000	0x00000000	0x00000000
+	0x8000000F		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000010		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000011		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000012		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000013		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000014		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000015		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000016		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000017		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000018		0x00000000	0x00000000	0x00000000	0x00000000
+	0x80000019		0xF040F018	0x64006400	0x00000000	0x00000000
+	0x8000001A		0x00000003	0x00000000	0x00000000	0x00000000
+	0x8000001B		0x000000FF	0x00000000	0x00000000	0x00000000
+	0x8000001C		0x00000000	0x80032013	0x00010200	0x8000000F
+	0x8000001D		0x00000121	0x00C0003F	0x0000003F	0x00000000
+	0x8000001D		0x00004122	0x0040003F	0x000001FF	0x00000000
+	0x8000001D		0x00004143	0x03C0003F	0x000007FF	0x00000001
+	0x8000001E		0x00000013	0x00000101	0x00000000	0x00000000
+
+	MSR 0x0000001B		0x00000000	0xFEE00800
+	MSR 0xC0010114		0x00000000	0x00000008
+	MSR 0xC0010061		0x00000000	0x00000050
+	MSR 0xC0010062		0x00000000	0x00000000
+	MSR 0xC0010063		0x00000000	0x00000000
+	MSR 0xC0010064		0x800001BF	0x00002017
+	MSR 0xC0010065		0x800001CA	0x00002816
+	MSR 0xC0010066		0x80000194	0x00004414
+	MSR 0xC0010067		0x80000177	0x00005C10
+	MSR 0xC0010068		0x8000015D	0x0000780C
+	MSR 0xC0010015		0x00000000	0x09001011
+	MSR 0xC001001F		0x00404000	0x00810000
+	MSR 0xC0010058		0x00000000	0xE0000021
+	MSR 0xC0010071		0x01000006	0x2C012816
+	MSR 0xC0010070		0x00000000	0x2C012816
diff --git a/bochs/cpu/cpudb/zambezi.cc b/bochs/cpu/cpudb/zambezi.cc
index 5d60a4add..0664a2471 100644
--- a/bochs/cpu/cpudb/zambezi.cc
+++ b/bochs/cpu/cpudb/zambezi.cc
@@ -2,7 +2,7 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
-//   Copyright (c) 2012-2013 Stanislav Shwartsman
+//   Copyright (c) 2012-2014 Stanislav Shwartsman
 //          Written by Stanislav Shwartsman [sshwarts at sourceforge net]
 //
 //  This library is free software; you can redistribute it and/or