Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (revision 60410) +++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (revision 60411) @@ -978,5 +978,5 @@ /* CPUM profile name. */ hrc = pMachine->COMGETTER(CPUProfile)(bstr.asOutParam()); H(); - InsertConfigString(pRoot, "GuestCPUName", bstr); + InsertConfigString(pCPUM, "GuestCpuName", bstr); /* @@ -986,10 +986,8 @@ * dead wrong on 8086 (see http://www.os2museum.com/wp/undocumented-8086-opcodes/). */ - if ( bstr.equals("80286") - || bstr.equals("80186") - || bstr.equals("V30") - || bstr.equals("V20") - || bstr.equals("8086") - || bstr.equals("8088") ) + if ( bstr.equals("Intel 80286") + || bstr.equals("Intel 80186") + || bstr.equals("Nec V20") + || bstr.equals("Intel 8086") ) InsertConfigInteger(pEM, "IemExecutesAll", true); Index: /trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (revision 60410) +++ /trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (revision 60411) @@ -2219,5 +2219,5 @@ uint32_t uMaxCentaurLeaf; uint32_t uMaxIntelFamilyModelStep; - char szCpuName[128]; + char szCpuName[128]; } CPUMCPUIDCONFIG; /** Pointer to CPUID config (from CFGM). */ Index: /trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp (revision 60410) +++ /trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp (revision 60411) @@ -53,5 +53,5 @@ /** Scalable bus frequency used for reporting other frequencies. */ uint64_t uScalableBusFreq; - /** Flags (TBD). */ + /** Flags - CPUDB_F_XXX. */ uint32_t fFlags; /** The maximum physical address with of the CPU. This should correspond to @@ -80,4 +80,11 @@ * Defined Constants And Macros * *********************************************************************************************************************************/ +/** @name CPUDB_F_XXX - CPUDBENTRY::fFlags + * @{ */ +/** Should execute all in IEM. + * @todo Implement this - currently done in Main... */ +#define CPUDB_F_EXECUTE_ALL_IN_IEM RT_BIT_32(0) +/** @} */ + /** @def NULL_ALONE @@ -186,4 +193,7 @@ #include "cpus/Intel_Pentium_4_3_00GHz.h" #include "cpus/Intel_Atom_330_1_60GHz.h" +#include "cpus/Intel_80286.h" +#include "cpus/Intel_80186.h" +#include "cpus/Intel_8086.h" #include "cpus/AMD_FX_8150_Eight_Core.h" @@ -238,4 +248,19 @@ &g_Entry_Intel_Pentium_4_3_00GHz, #endif +#ifdef VBOX_CPUDB_Intel_80486 + &g_Entry_Intel_80486, +#endif +#ifdef VBOX_CPUDB_Intel_80386 + &g_Entry_Intel_80386, +#endif +#ifdef VBOX_CPUDB_Intel_80286 + &g_Entry_Intel_80286, +#endif +#ifdef VBOX_CPUDB_Intel_80186 + &g_Entry_Intel_80186, +#endif +#ifdef VBOX_CPUDB_Intel_8086 + &g_Entry_Intel_8086, +#endif #ifdef VBOX_CPUDB_AMD_FX_8150_Eight_Core @@ -257,4 +282,8 @@ #ifdef VBOX_CPUDB_VIA_QuadCore_L4700_1_2_GHz &g_Entry_VIA_QuadCore_L4700_1_2_GHz, +#endif + +#ifdef VBOX_CPUDB_NEC_V20 + &g_Entry_NEC_V20, #endif }; @@ -851,6 +880,9 @@ if (pEntry->cCpuIdLeaves) { - pInfo->paCpuIdLeavesR3 = (PCPUMCPUIDLEAF)RTMemDup(pEntry->paCpuIdLeaves, - sizeof(pEntry->paCpuIdLeaves[0]) * pEntry->cCpuIdLeaves); + /* Must allocate a multiple of 16 here, matching cpumR3CpuIdEnsureSpace. */ + size_t cbExtra = sizeof(pEntry->paCpuIdLeaves[0]) * (RT_ALIGN(pEntry->cCpuIdLeaves, 16) - pEntry->cCpuIdLeaves); + pInfo->paCpuIdLeavesR3 = (PCPUMCPUIDLEAF)RTMemDupEx(pEntry->paCpuIdLeaves, + sizeof(pEntry->paCpuIdLeaves[0]) * pEntry->cCpuIdLeaves, + cbExtra); if (!pInfo->paCpuIdLeavesR3) return VERR_NO_MEMORY; Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_80186.h =================================================================== --- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_80186.h (revision 60411) +++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_80186.h (revision 60411) @@ -0,0 +1,71 @@ +/* $Id$ */ +/** @file + * CPU database entry "Intel 80186". + * Handcrafted. + */ + +/* + * Copyright (C) 2013-2016 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef VBOX_CPUDB_Intel_80186 +#define VBOX_CPUDB_Intel_80186 + +#ifndef CPUM_DB_STANDALONE +/** + * Fake CPUID leaves for Intel(R) 80186. + * + * We fake these to keep the CPUM ignorant of CPUs wihtout CPUID leaves + * and avoid having to seed CPUM::GuestFeatures filling with bits from the + * CPUMDBENTRY. + */ +static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_80186[] = +{ + { 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x756e6547, 0x6c65746e, 0x49656e69, 0 }, + { 0x00000001, 0x00000000, 0x00000000, 0x00000100, 0x00000100, 0x00000000, 0x00000000, 0 }, + { 0x80000000, 0x00000000, 0x00000000, 0x80000008, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000002, 0x00000000, 0x00000000, 0x65746e49, 0x2952286c, 0x31303820, 0x20203638, 0 }, + { 0x80000003, 0x00000000, 0x00000000, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0 }, + { 0x80000004, 0x00000000, 0x00000000, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0 }, + { 0x80000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000008, 0x00000000, 0x00000000, 0x00001414, 0x00000000, 0x00000000, 0x00000000, 0 }, +}; +#endif /* !CPUM_DB_STANDALONE */ + +/** + * Database entry for Intel(R) 80186. + */ +static CPUMDBENTRY const g_Entry_Intel_80186 = +{ + /*.pszName = */ "Intel 80186", + /*.pszFullName = */ "Intel(R) 80186", + /*.enmVendor = */ CPUMCPUVENDOR_INTEL, + /*.uFamily = */ 2, + /*.uModel = */ 0, + /*.uStepping = */ 0, + /*.enmMicroarch = */ kCpumMicroarch_Intel_80186, + /*.uScalableBusFreq = */ CPUM_SBUSFREQ_UNKNOWN, + /*.fFlags = */ CPUDB_F_EXECUTE_ALL_IN_IEM, + /*.cMaxPhysAddrWidth= */ 20, + /*.paCpuIdLeaves = */ NULL_ALONE(g_aCpuIdLeaves_Intel_80186), + /*.cCpuIdLeaves = */ ZERO_ALONE(RT_ELEMENTS(g_aCpuIdLeaves_Intel_80186)), + /*.enmUnknownCpuId = */ CPUMUNKNOWNCPUID_DEFAULTS, + /*.DefUnknownCpuId = */ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, + /*.fMsrMask = */ 0, + /*.cMsrRanges = */ 0, + /*.paMsrRanges = */ NULL, +}; + +#endif /* !VBOX_CPUDB_Intel_80186 */ + Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_80286.h =================================================================== --- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_80286.h (revision 60411) +++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_80286.h (revision 60411) @@ -0,0 +1,71 @@ +/* $Id$ */ +/** @file + * CPU database entry "Intel 80286". + * Handcrafted. + */ + +/* + * Copyright (C) 2013-2016 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef VBOX_CPUDB_Intel_80286 +#define VBOX_CPUDB_Intel_80286 + +#ifndef CPUM_DB_STANDALONE +/** + * Fake CPUID leaves for Intel(R) 80286. + * + * We fake these to keep the CPUM ignorant of CPUs wihtout CPUID leaves + * and avoid having to seed CPUM::GuestFeatures filling with bits from the + * CPUMDBENTRY. + */ +static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_80286[] = +{ + { 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x756e6547, 0x6c65746e, 0x49656e69, 0 }, + { 0x00000001, 0x00000000, 0x00000000, 0x00000200, 0x00000100, 0x00000000, 0x00000000, 0 }, + { 0x80000000, 0x00000000, 0x00000000, 0x80000008, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000002, 0x00000000, 0x00000000, 0x65746e49, 0x2952286c, 0x32303820, 0x20203638, 0 }, + { 0x80000003, 0x00000000, 0x00000000, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0 }, + { 0x80000004, 0x00000000, 0x00000000, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0 }, + { 0x80000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000008, 0x00000000, 0x00000000, 0x00001818, 0x00000000, 0x00000000, 0x00000000, 0 }, +}; +#endif /* !CPUM_DB_STANDALONE */ + +/** + * Database entry for Intel(R) 80286. + */ +static CPUMDBENTRY const g_Entry_Intel_80286 = +{ + /*.pszName = */ "Intel 80286", + /*.pszFullName = */ "Intel(R) 80286", + /*.enmVendor = */ CPUMCPUVENDOR_INTEL, + /*.uFamily = */ 2, + /*.uModel = */ 0, + /*.uStepping = */ 0, + /*.enmMicroarch = */ kCpumMicroarch_Intel_80286, + /*.uScalableBusFreq = */ CPUM_SBUSFREQ_UNKNOWN, + /*.fFlags = */ CPUDB_F_EXECUTE_ALL_IN_IEM, + /*.cMaxPhysAddrWidth= */ 24, + /*.paCpuIdLeaves = */ NULL_ALONE(g_aCpuIdLeaves_Intel_80286), + /*.cCpuIdLeaves = */ ZERO_ALONE(RT_ELEMENTS(g_aCpuIdLeaves_Intel_80286)), + /*.enmUnknownCpuId = */ CPUMUNKNOWNCPUID_DEFAULTS, + /*.DefUnknownCpuId = */ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, + /*.fMsrMask = */ 0, + /*.cMsrRanges = */ 0, + /*.paMsrRanges = */ NULL, +}; + +#endif /* !VBOX_CPUDB_Intel_80286 */ + Index: /trunk/src/VBox/VMM/VMMR3/cpus/Intel_8086.h =================================================================== --- /trunk/src/VBox/VMM/VMMR3/cpus/Intel_8086.h (revision 60411) +++ /trunk/src/VBox/VMM/VMMR3/cpus/Intel_8086.h (revision 60411) @@ -0,0 +1,71 @@ +/* $Id$ */ +/** @file + * CPU database entry "Intel 8086". + * Handcrafted. + */ + +/* + * Copyright (C) 2013-2016 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef VBOX_CPUDB_Intel_8086 +#define VBOX_CPUDB_Intel_8086 + +#ifndef CPUM_DB_STANDALONE +/** + * Fake CPUID leaves for Intel(R) 8086. + * + * We fake these to keep the CPUM ignorant of CPUs wihtout CPUID leaves + * and avoid having to seed CPUM::GuestFeatures filling with bits from the + * CPUMDBENTRY. + */ +static CPUMCPUIDLEAF const g_aCpuIdLeaves_Intel_8086[] = +{ + { 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x756e6547, 0x6c65746e, 0x49656e69, 0 }, + { 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0 }, + { 0x80000000, 0x00000000, 0x00000000, 0x80000008, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000002, 0x00000000, 0x00000000, 0x65746e49, 0x2952286c, 0x38303820, 0x20202036, 0 }, + { 0x80000003, 0x00000000, 0x00000000, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0 }, + { 0x80000004, 0x00000000, 0x00000000, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0 }, + { 0x80000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0 }, + { 0x80000008, 0x00000000, 0x00000000, 0x00001414, 0x00000000, 0x00000000, 0x00000000, 0 }, +}; +#endif /* !CPUM_DB_STANDALONE */ + +/** + * Database entry for Intel(R) 8086. + */ +static CPUMDBENTRY const g_Entry_Intel_8086 = +{ + /*.pszName = */ "Intel 8086", + /*.pszFullName = */ "Intel(R) 8086", + /*.enmVendor = */ CPUMCPUVENDOR_INTEL, + /*.uFamily = */ 2, + /*.uModel = */ 0, + /*.uStepping = */ 0, + /*.enmMicroarch = */ kCpumMicroarch_Intel_8086, + /*.uScalableBusFreq = */ CPUM_SBUSFREQ_UNKNOWN, + /*.fFlags = */ CPUDB_F_EXECUTE_ALL_IN_IEM, + /*.cMaxPhysAddrWidth= */ 20, + /*.paCpuIdLeaves = */ NULL_ALONE(g_aCpuIdLeaves_Intel_8086), + /*.cCpuIdLeaves = */ ZERO_ALONE(RT_ELEMENTS(g_aCpuIdLeaves_Intel_8086)), + /*.enmUnknownCpuId = */ CPUMUNKNOWNCPUID_DEFAULTS, + /*.DefUnknownCpuId = */ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, + /*.fMsrMask = */ 0, + /*.cMsrRanges = */ 0, + /*.paMsrRanges = */ NULL, +}; + +#endif /* !VBOX_CPUDB_Intel_8086 */ +