vbox的更動 12239 路徑 trunk/src/VBox/Devices/PC

時間撮記:

2008-9-8 下午05:02:19 (16 年 以前)

作者:

vboxsync

訊息:

BIOS: Disabled the above 4GB memory change. This depends on PGM (and possibly MM) and therefore won't work yet. We'll get back to this later.

位置:

trunk/src/VBox/Devices/PC

檔案:

• BIOS/rombios.c (修改) (10 筆差異)
• DevPcBios.cpp (修改) (8 筆差異)

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -4559 +4559 @@
     write_word(ES, DI, start);
     write_word(ES, DI+2, start >> 16);
-    write_word(ES, DI+4, 0x00);
+    write_word(ES, DI+4, 0x00); /** @todo r=bird: why write it twice? */
     write_word(ES, DI+4, extra_start);
     write_word(ES, DI+6, 0x00);
@@ -4571 +4571 @@
         write_word(ES, DI+12, 0x0001);
     else
-        // XXX: nike - is it really correct? see QEMU BIOS patch
+        /** @todo XXX: nike - is it really correct? see QEMU BIOS patch */
         write_word(ES, DI+12, extra_end);
 #else /* !VBOX */
@@ -4588 +4588 @@
 {
   Bit32u  extended_memory_size=0; // 64bits long
+#if 0  /* bird: later */
   Bit32u  extra_lowbits_memory_size=0;
+#endif
   Bit16u  CX,DX;
+#if 0  /* bird: later */
   Bit8u   extra_highbits_memory_size=0;
+#endif
 
 BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax);
@@ -4664 +4668 @@
                 }
 
+#if 0 /* bird: later (btw. this ain't making sense complixity wise, unless its a AMI/AWARD/PHOENIX interface) */
                 extra_lowbits_memory_size = inb_cmos(0x61);
                 extra_lowbits_memory_size <<= 8;
@@ -4670 +4675 @@
                 extra_lowbits_memory_size *= 1024;
                 extra_highbits_memory_size = inb_cmos(0x63);
+#endif
 
                 switch(regs.u.r16.bx)
@@ -4716 +4722 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0x00100000L,
-                                       extended_memory_size - ACPI_DATA_SIZE ,0, 0, 1);
+                                       extended_memory_size - ACPI_DATA_SIZE, 0, 0, 1);
                         regs.u.r32.ebx = 4;
                         regs.u.r32.eax = 0x534D4150;
@@ -4737 +4743 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0xfffc0000L, 0x00000000L, 0, 0, 2);
+#if 0 /* bird: later */
                         if (extra_highbits_memory_size || extra_lowbits_memory_size)
                             regs.u.r32.ebx = 6;
                         else
+#endif
                             regs.u.r32.ebx = 0;
                         regs.u.r32.eax = 0x534D4150;
@@ -4745 +4753 @@
                         CLEAR_CF();
                         return;
+#if 0 /* bird: later */
                     case 6:
-                        /* Maping of memory above 4 GB */
-                        set_e820_range(ES, regs.u.r16.di, 
-                                       0x00000000L, extra_lowbits_memory_size, 
+                        /* Mapping of memory above 4 GB */
+                        set_e820_range(ES, regs.u.r16.di,
+                                       0x00000000L, extra_lowbits_memory_size,
                                        1, extra_highbits_memory_size + 1, 1);
                         regs.u.r32.ebx = 0;
@@ -4755 +4764 @@
                         CLEAR_CF();
                         return;
+#endif
                     default:  /* AX=E820, DX=534D4150, BX unrecognized */
                         goto int15_unimplemented;
@@ -8322 +8332 @@
   // signature. In general, it is impossible to tell a valid bootsector
   // from an invalid one.
-  // NB: It is somewhat common for failed OS installs to have the 
-  // 0x55AA signature and a valid partition table but zeros in the 
+  // NB: It is somewhat common for failed OS installs to have the
+  // 0x55AA signature and a valid partition table but zeros in the
   // rest of the boot sector. We do a quick check by comparing the first
   // two words of boot sector; if identical, the boot sector is

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -45 +45 @@
  * The BIOS uses a CMOS to store configuration data.
  * It is currently used as follows:
+ *
+ * @todo Mark which bits are compatible with which BIOSes and
+ *       which are our own definitions.
  *
  *     Base memory:
@@ -91 +94 @@
  *     RAM above 4G (in 64M units):
  *          0x61 - 0x63
+ *
+ * @todo r=bird: Is the 0x61 - 0x63 range defined by AMI,
+ *       PHOENIX or AWARD? If not I'd say 64MB units is a bit
+ *       too big, besides it forces unnecessary math stuff onto
+ *       the BIOS.
  */
 
@@ -155 +163 @@
     uint8_t        u8PXEDebug;
     /** Number of logical CPUs in guest */
-    uint16_t       u16numCPUs;
+    uint16_t       cCpus;
 } DEVPCBIOS, *PDEVPCBIOS;
 
@@ -502 +510 @@
      * Memory sizes.
      */
-    uint64_t ramInK = pThis->cbRam / _1K;
-    uint64_t above4GInK, below4GInK;
-    if (ramInK > 0xe0000000)
-    {
-        above4GInK = ramInK - 0xe0000000;
-        below4GInK = 0xe0000000;
+#if 0
+    uint64_t cKBRam = pThis->cbRam / _1K;
+    uint64_t cKBAbove4GB = 0;
+    uint32_t cKBBelow4GB = cKBRam;
+    AssertRelease(cKBBelow4GB == cKBRam);
+    if (cKBRam > UINT32_C(0xe0000000)) /** @todo this limit must be picked up from CFGM and coordinated with MM/PGM! */
+    {
+        cKBAbove4GB = cKBRam - UINT32_C(0xe0000000);
+        cKBBelow4GB = UINT32_C(0xe0000000);
     }
     else
     {
-        above4GInK = 0;
-        below4GInK = ramInK;
-    }
-
+        cKBAbove4GB = 0;
+        cKBBelow4GB = cKBRam;
+    }
 
     /* base memory. */
-    u32 = below4GInK > 640 ? 640 : (uint32_t)below4GInK;
+    u32 = cKBBelow4GB > 640 ? 640 : cKBBelow4GB;
     pcbiosCmosWrite(pDevIns, 0x15, u32 & 0xff);                                 /* 15h - Base Memory in K, Low Byte */
     pcbiosCmosWrite(pDevIns, 0x16, u32 >> 8);                                   /* 16h - Base Memory in K, High Byte */
 
     /* Extended memory, up to 65MB */
-    u32 = below4GInK >= 65 * _1K ? 0xffff : ((uint32_t)below4GInK - _1K);
+    u32 = cKBBelow4GB >= 65 * _1K ? 0xffff : (cKBBelow4GB - _1K);
     pcbiosCmosWrite(pDevIns, 0x17, u32 & 0xff);                                 /* 17h - Extended Memory in K, Low Byte */
     pcbiosCmosWrite(pDevIns, 0x18, u32 >> 8);                                   /* 18h - Extended Memory in K, High Byte */
@@ -529 +539 @@
 
     /* Bochs BIOS specific? Anyway, it's the amount of memory above 16MB */
-    if (below4GInK > 16 * _1K)
-    {
-        u32 = (uint32_t)( (below4GInK - 16 * _1K) / 64 );
+    if (cKBBelow4GB > 16 * _1K)
+    {
+        u32 = (uint32_t)( (cKBBelow4GB - 16 * _1K) / 64 );
         u32 = RT_MIN(u32, 0xffff);
     }
@@ -539 +549 @@
     pcbiosCmosWrite(pDevIns, 0x35, u32 >> 8);
 
-    /* RAM above 4G */
-    pcbiosCmosWrite(pDevIns, 0x61, above4GInK >> 16);
-    pcbiosCmosWrite(pDevIns, 0x62, above4GInK >> 24);
-    pcbiosCmosWrite(pDevIns, 0x63, above4GInK >> 32);
+    /* RAM above 4G, in 64MB units (needs discussing, see comments and @todos elsewhere). */
+    pcbiosCmosWrite(pDevIns, 0x61, cKBAbove4GB >> 16);
+    pcbiosCmosWrite(pDevIns, 0x62, cKBAbove4GB >> 24);
+    pcbiosCmosWrite(pDevIns, 0x63, cKBAbove4GB >> 32);
+
+#else  /* old code. */
+    /* base memory. */
+    u32 = pThis->cbRam > 640 ? 640 : (uint32_t)pThis->cbRam / _1K; /* <-- this test is wrong, but it doesn't matter since we never assign less than 1MB */
+    pcbiosCmosWrite(pDevIns, 0x15, u32 & 0xff);                                 /* 15h - Base Memory in K, Low Byte */
+    pcbiosCmosWrite(pDevIns, 0x16, u32 >> 8);                                   /* 16h - Base Memory in K, High Byte */
+
+    /* Extended memory, up to 65MB */
+    u32 = pThis->cbRam >= 65 * _1M ? 0xffff : ((uint32_t)pThis->cbRam - _1M) / _1K;
+    pcbiosCmosWrite(pDevIns, 0x17, u32 & 0xff);                                 /* 17h - Extended Memory in K, Low Byte */
+    pcbiosCmosWrite(pDevIns, 0x18, u32 >> 8);                                   /* 18h - Extended Memory in K, High Byte */
+    pcbiosCmosWrite(pDevIns, 0x30, u32 & 0xff);                                 /* 30h - Extended Memory in K, Low Byte */
+    pcbiosCmosWrite(pDevIns, 0x31, u32 >> 8);                                   /* 31h - Extended Memory in K, High Byte */
+
+    /* Bochs BIOS specific? Anyway, it's the amount of memory above 16MB */
+    if (pThis->cbRam > 16 * _1M)
+    {
+        u32 = (uint32_t)( (pThis->cbRam - 16 * _1M) / _64K );
+        u32 = RT_MIN(u32, 0xffff);
+    }
+    else
+        u32 = 0;
+    pcbiosCmosWrite(pDevIns, 0x34, u32 & 0xff);
+    pcbiosCmosWrite(pDevIns, 0x35, u32 >> 8);
+#endif /* old code */
 
     /*
      * Number of CPUs.
      */
-    pcbiosCmosWrite(pDevIns, 0x60, pThis->u16numCPUs & 0xff);
+    pcbiosCmosWrite(pDevIns, 0x60, pThis->cCpus & 0xff);
 
     /*
@@ -1308 +1343 @@
                               "UUID\0"
                               "IOAPIC\0"
+                              "NumCPUs\0"
                               "DmiBIOSVendor\0"
                               "DmiBIOSVersion\0"
@@ -1332 +1368 @@
                                 N_("Configuration error: Querying \"RamSize\" as integer failed"));
 
-#if 0
-    rc = CFGMR3QueryU16Def(pCfgHandle, "NumCPUs", &pThis->u16numCPUs, 1);
+    rc = CFGMR3QueryU16Def(pCfgHandle, "NumCPUs", &pThis->cCpus, 1);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"NumCPUs\" as integer failed"));
-#else
-    pThis->u16numCPUs = 1;
-#endif
 
     rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &pThis->u8IOAPIC, 1);