Changeset 37443 in vbox for trunk/include/VBox/vmm

Timestamp:

Jun 14, 2011 2:34:11 PM (14 years ago)

Author:

vboxsync

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

72249

Message:

PDM: Implemented the NOP critical section.

Location:

trunk/include/VBox/vmm

Files:

• pdmcritsect.h (modified) (1 diff)
• pdmdev.h (modified) (5 diffs)
• vm.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmcritsect.h

@@ -74 +74 @@
 VMMR3DECL(void)     PDMR3CritSectLeaveAll(PVM pVM);
 
+VMMR3DECL(PPDMCRITSECT)             PDMR3CritSectGetNop(PVM pVM);
+VMMR3DECL(R0PTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopR0(PVM pVM);
+VMMR3DECL(RCPTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopRC(PVM pVM);
+
 /* Strict build: Remap the two enter calls to the debug versions. */
 #ifdef VBOX_STRICT

trunk/include/VBox/vmm/pdmdev.h

@@ -2919 +2919 @@
 
     /**
+     * Gets the NOP critical section.
+     *
+     * @returns The ring-3 address of the NOP critical section.
+     * @param   pDevIns             The device instance.
+     */
+    DECLR3CALLBACKMEMBER(PPDMCRITSECT, pfnCritSectGetNop,(PPDMDEVINS pDevIns));
+
+    /**
+     * Gets the NOP critical section.
+     *
+     * @returns The ring-0 address of the NOP critical section.
+     * @param   pDevIns             The device instance.
+     */
+    DECLR3CALLBACKMEMBER(R0PTRTYPE(PPDMCRITSECT), pfnCritSectGetNopR0,(PPDMDEVINS pDevIns));
+
+    /**
+     * Gets the NOP critical section.
+     *
+     * @returns The raw-mode context address of the NOP critical section.
+     * @param   pDevIns             The device instance.
+     */
+    DECLR3CALLBACKMEMBER(RCPTRTYPE(PPDMCRITSECT), pfnCritSectGetNopRC,(PPDMDEVINS pDevIns));
+
+    /**
      * Creates a PDM thread.
      *
@@ -3398 +3422 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE(0xffe7, 4, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE(0xffe7, 5, 0)
 
 
@@ -3589 +3613 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 1, 0)
+#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 2, 0)
 
 
@@ -3788 +3812 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 1, 0)
+#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 2, 0)
 
 
@@ -4514 +4538 @@
 
 /**
+ * @copydoc PDMDEVHLPR3::pfnCritSectGetNop
+ */
+DECLINLINE(PPDMCRITSECT) PDMDevHlpCritSectGetNop(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pHlpR3->pfnCritSectGetNop(pDevIns);
+}
+
+/**
+ * @copydoc PDMDEVHLPR3::pfnCritSectGetNopR0
+ */
+DECLINLINE(R0PTRTYPE(PPDMCRITSECT)) PDMDevHlpCritSectGetNopR0(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pHlpR3->pfnCritSectGetNopR0(pDevIns);
+}
+
+/**
+ * @copydoc PDMDEVHLPR3::pfnCritSectGetNopRC
+ */
+DECLINLINE(RCPTRTYPE(PPDMCRITSECT)) PDMDevHlpCritSectGetNopRC(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pHlpR3->pfnCritSectGetNopRC(pDevIns);
+}
+
+/**
  * @copydoc PDMDEVHLPR3::pfnThreadCreate
  */

trunk/include/VBox/vmm/vm.h

@@ -969 +969 @@
         struct PDM s;
 #endif
-        uint8_t     padding[1600];      /* multiple of 64 */
+        uint8_t     padding[1920];      /* multiple of 64 */
     } pdm;
 
@@ -1075 +1075 @@
 
     /** Padding for aligning the cpu array on a page boundary. */
-    uint8_t         abAlignment2[1502];
+    uint8_t         abAlignment2[1182];
 
     /* ---- end small stuff ---- */