Changeset 61385 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Timestamp:

Jun 1, 2016 6:34:57 PM (9 years ago)

Author:

vboxsync

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

107696

Message:

bs3-fpustate-1: Extended the tests to force the ring-0 and raw-mode VMM code to do interesting things.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-rm-InitMemory.c (modified) (3 diffs)
• bs3kit.h (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitMemory.c

@@ -32 +32 @@
 #include "bs3-cmn-memory.h"
 #include <iprt/asm.h>
+#include <VBox/VMMDevTesting.h>
 
 
@@ -248 +249 @@
 BS3_DECL(void) BS3_FAR_CODE Bs3InitMemory_rm_far(void)
 {
-    uint16_t        i;
-    uint16_t        cPages;
-    uint32_t        u32;
-    INT15E820ENTRY  Entry;
+    uint16_t            i;
+    uint16_t            cPages;
+    uint32_t            u32;
+    INT15E820ENTRY      Entry;
+    uint32_t BS3_FAR   *pu32Mmio;
 
     /*
@@ -332 +334 @@
 
     /*
+     * Check if we've got the VMMDev MMIO testing memory mapped above 1MB.
+     */
+    pu32Mmio = (uint32_t BS3_FAR *)BS3_FP_MAKE(VMMDEV_TESTING_MMIO_RM_SEL,
+                                               VMMDEV_TESTING_MMIO_RM_OFF2(VMMDEV_TESTING_MMIO_OFF_NOP));
+    if (*pu32Mmio == VMMDEV_TESTING_NOP_RET)
+    {
+        Bs3Printf("Memory: Found VMMDev MMIO testing region\n");
+        if (!ASMBitTestAndSet(g_Bs3Mem4KUpperTiled.Core.bmAllocated, 1))
+            g_Bs3Mem4KUpperTiled.Core.cFreeChunks--;
+
+    }
+
+    /*
      * Initialize the slab lists.
      */

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -3164 +3164 @@
  * Basic CPU detection.
  *
- * This sets the #g_bBs3CpuDetected global variable to the return value.
+ * This sets the #g_uBs3CpuDetected global variable to the return value.
  *
  * @returns BS3CPU_XXX value with the BS3CPU_F_CPUID flag set depending on