Changeset 60411 in vbox

Timestamp:

Apr 10, 2016 5:16:09 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106497

Message:

VMM,Main: Added 286, 186 and 8086 CPU profiles to play with.

Location:

trunk/src/VBox

Files:

• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• VMM/VMMR3/CPUMR3CpuId.cpp (modified) (1 diff)
• VMM/VMMR3/CPUMR3Db.cpp (modified) (6 diffs)
• VMM/VMMR3/cpus/Intel_80186.h (added)
• VMM/VMMR3/cpus/Intel_80286.h (added)
• VMM/VMMR3/cpus/Intel_8086.h (added)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -978 +978 @@
         /* CPUM profile name. */
         hrc = pMachine->COMGETTER(CPUProfile)(bstr.asOutParam());                           H();
-        InsertConfigString(pRoot, "GuestCPUName", bstr);
+        InsertConfigString(pCPUM, "GuestCpuName", bstr);
 
         /*
@@ -986 +986 @@
          * 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);
 

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -2219 +2219 @@
     uint32_t        uMaxCentaurLeaf;
     uint32_t        uMaxIntelFamilyModelStep;
-    char        szCpuName[128];
+    char            szCpuName[128];
 } CPUMCPUIDCONFIG;
 /** Pointer to CPUID config (from CFGM). */

trunk/src/VBox/VMM/VMMR3/CPUMR3Db.cpp

@@ -53 +53 @@
     /** 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 +80 @@
 *   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 +193 @@
 #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 +248 @@
     &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 +282 @@
 #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 +880 @@
         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;