Changeset 60422 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.cpp

Timestamp:

Apr 11, 2016 12:39:13 PM (9 years ago)

Author:

vboxsync

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

106508

Message:

VGABIOS,PCBIOS: Build variants for 80286 and 8086 in addition to the default 80386 one. Added build time checking of the BIOSORG results (sed + map file). Fixed shutdown code 0ah jump.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -6447 +6447 @@
     if (pThis->pbVgaBios == NULL)
     {
-        pbVgaBiosBinary = g_abVgaBiosBinary;
-        cbVgaBiosBinary = g_cbVgaBiosBinary;
+        PVM pVM = PDMDevHlpGetVM(pDevIns);
+        CPUMMICROARCH enmMicroarch = pVM ? pVM->cpum.ro.GuestFeatures.enmMicroarch : kCpumMicroarch_Intel_P6;
+        if (   enmMicroarch == kCpumMicroarch_Intel_8086
+            || enmMicroarch == kCpumMicroarch_Intel_80186
+            || enmMicroarch == kCpumMicroarch_NEC_V20
+            || enmMicroarch == kCpumMicroarch_NEC_V30)
+        {
+            pbVgaBiosBinary = g_abVgaBiosBinary8086;
+            cbVgaBiosBinary = g_cbVgaBiosBinary8086;
+            LogRel(("VGA: Using the 8086 BIOS image!\n"));
+        }
+        else if (enmMicroarch == kCpumMicroarch_Intel_80286)
+        {
+            pbVgaBiosBinary = g_abVgaBiosBinary286;
+            cbVgaBiosBinary = g_cbVgaBiosBinary286;
+            LogRel(("VGA: Using the 286 BIOS image!\n"));
+        }
+        else
+        {
+            pbVgaBiosBinary = g_abVgaBiosBinary386;
+            cbVgaBiosBinary = g_cbVgaBiosBinary386;
+            LogRel(("VGA: Using the 386+ BIOS image.\n"));
+        }
         fFlags          = PGMPHYS_ROM_FLAGS_PERMANENT_BINARY;
     }
@@ -6457 +6478 @@
     }
 
-    AssertReleaseMsg(g_cbVgaBiosBinary <= _64K && g_cbVgaBiosBinary >= 32*_1K, ("g_cbVgaBiosBinary=%#x\n", g_cbVgaBiosBinary));
-    AssertReleaseMsg(RT_ALIGN_Z(g_cbVgaBiosBinary, PAGE_SIZE) == g_cbVgaBiosBinary, ("g_cbVgaBiosBinary=%#x\n", g_cbVgaBiosBinary));
+    AssertReleaseMsg(cbVgaBiosBinary <= _64K && cbVgaBiosBinary >= 32*_1K, ("cbVgaBiosBinary=%#x\n", cbVgaBiosBinary));
+    AssertReleaseMsg(RT_ALIGN_Z(cbVgaBiosBinary, PAGE_SIZE) == cbVgaBiosBinary, ("cbVgaBiosBinary=%#x\n", cbVgaBiosBinary));
     /* Note! Because of old saved states we'll always register at least 36KB of ROM. */
     rc = PDMDevHlpROMRegister(pDevIns, 0x000c0000, RT_MAX(cbVgaBiosBinary, 36*_1K), pbVgaBiosBinary, cbVgaBiosBinary,