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

Timestamp:

Mar 23, 2013 8:36:23 PM (12 years ago)

Author:

vboxsync

Message:

PDMCritSectRw: Early morphing stage - untested, ring-3 only.

Location:

trunk/include/VBox/vmm

Files:

• pdm.h (modified) (2 diffs)
• pdmcritsect.h (modified) (2 diffs)
• uvm.h (modified) (1 diff)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (1 diff)

trunk/include/VBox/vmm/pdm.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include <VBox/vmm/pdmqueue.h>
 #include <VBox/vmm/pdmcritsect.h>
+#include <VBox/vmm/pdmcritsectrw.h>
 #include <VBox/vmm/pdmthread.h>
 #include <VBox/vmm/pdmifs.h>

trunk/include/VBox/vmm/pdmcritsect.h

@@ -52 +52 @@
 } PDMCRITSECT;
 
+VMMR3_INT_DECL(int)     PDMR3CritSectBothTerm(PVM pVM);
+VMMR3_INT_DECL(void)    PDMR3CritSectLeaveAll(PVM pVM);
+VMM_INT_DECL(void)      PDMCritSectBothFF(PVMCPU pVCpu);
+
+
+VMMR3DECL(uint32_t) PDMR3CritSectCountOwned(PVM pVM, char *pszNames, size_t cbNames);
+
 VMMR3DECL(int)      PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL, const char *pszNameFmt, ...);
+VMMR3DECL(int)      PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallRing3);
+VMMR3DECL(bool)     PDMR3CritSectYield(PPDMCRITSECT pCritSect);
+VMMR3DECL(const char *) PDMR3CritSectName(PCPDMCRITSECT pCritSect);
+VMMR3DECL(int)      PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal);
+VMMR3DECL(int)      PDMR3CritSectDelete(PPDMCRITSECT pCritSect);
+
 VMMDECL(int)        PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
 VMMDECL(int)        PDMCritSectEnterDebug(PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 VMMDECL(int)        PDMCritSectTryEnter(PPDMCRITSECT pCritSect);
 VMMDECL(int)        PDMCritSectTryEnterDebug(PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
-VMMR3DECL(int)      PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallRing3);
 VMMDECL(int)        PDMCritSectLeave(PPDMCRITSECT pCritSect);
+
 VMMDECL(bool)       PDMCritSectIsOwner(PCPDMCRITSECT pCritSect);
 VMMDECL(bool)       PDMCritSectIsOwnerEx(PCPDMCRITSECT pCritSect, PVMCPU pVCpu);
@@ -64 +77 @@
 VMMDECL(bool)       PDMCritSectHasWaiters(PCPDMCRITSECT pCritSect);
 VMMDECL(uint32_t)   PDMCritSectGetRecursion(PCPDMCRITSECT pCritSect);
-VMMR3DECL(bool)     PDMR3CritSectYield(PPDMCRITSECT pCritSect);
-VMMR3DECL(const char *) PDMR3CritSectName(PCPDMCRITSECT pCritSect);
-VMMR3DECL(int)      PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal);
-VMMR3DECL(int)      PDMR3CritSectDelete(PPDMCRITSECT pCritSect);
-VMMDECL(int)        PDMR3CritSectTerm(PVM pVM);
-VMMDECL(void)       PDMCritSectFF(PVMCPU pVCpu);
-VMMR3DECL(uint32_t) PDMR3CritSectCountOwned(PVM pVM, char *pszNames, size_t cbNames);
-VMMR3DECL(void)     PDMR3CritSectLeaveAll(PVM pVM);
 
 VMMR3DECL(PPDMCRITSECT)             PDMR3CritSectGetNop(PVM pVM);

trunk/include/VBox/vmm/uvm.h

@@ -125 +125 @@
         struct PDMUSERPERVM     s;
 #endif
-        uint8_t                 padding[128];
+        uint8_t                 padding[256];
     } pdm;
 

trunk/include/VBox/vmm/vm.h

@@ -199 +199 @@
         struct PDMCPU       s;
 #endif
-        uint8_t             padding[128];       /* multiple of 64 */
+        uint8_t             padding[256];       /* multiple of 64 */
     } pdm;
 
@@ -222 +222 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[1024 - 320 - 128 - 64];
+    uint8_t                 abAlignment2[448 - 64];
 
     /** PGM part. */

trunk/include/VBox/vmm/vm.mac

@@ -139 +139 @@
     .tm                     resb 384
     .vmm                    resb 704
-    .pdm                    resb 128
+    .pdm                    resb 256
     .iom                    resb 512
     .dbgf                   resb 64