Changeset 45097 in vbox

Timestamp:

Mar 19, 2013 7:05:53 PM (12 years ago)

Author:

vboxsync

Message:

Alignment.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (2 diffs)
• include/VBox/vmm/vm.mac (modified) (1 diff)
• include/VBox/vmm/vmm.h (modified) (1 diff)
• src/VBox/VMM/VMMRZ/VMMRZ.cpp (modified) (1 diff)
• src/VBox/VMM/include/VMMInternal.h (modified) (2 diffs)
• src/VBox/VMM/include/VMMInternal.mac (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -190 +190 @@
         struct VMMCPU       s;
 #endif
-        uint8_t             padding[640];       /* multiple of 64 */
+        uint8_t             padding[704];       /* multiple of 64 */
     } vmm;
 
@@ -222 +222 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[1024 - 320 - 128];
+    uint8_t                 abAlignment2[1024 - 320 - 128 - 64];
 
     /** PGM part. */

trunk/include/VBox/vmm/vm.mac

@@ -138 +138 @@
     .trpm                   resb 128
     .tm                     resb 384
-    .vmm                    resb 640
+    .vmm                    resb 704
     .pdm                    resb 128
     .iom                    resb 512

trunk/include/VBox/vmm/vmm.h

@@ -515 +515 @@
 VMMRZDECL(void)     VMMRZCallRing3Enable(PVMCPU pVCpu);
 VMMRZDECL(bool)     VMMRZCallRing3IsEnabled(PVMCPU pVCpu);
-VMMRZDECL(int)      VMMRZCallRing3SetNotification(PVMCPU pVCpu, PFNVMMR0CALLRING3NOTIFICATION pfnCallback, void *pvUser);
+VMMRZDECL(int)      VMMRZCallRing3SetNotification(PVMCPU pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser);
 VMMRZDECL(void)     VMMRZCallRing3RemoveNotification(PVMCPU pVCpu);
 /** @} */

trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

@@ -187 +187 @@
  * @return VBox status code.
  */
-VMMRZDECL(int) VMMRZCallRing3SetNotification(PVMCPU pVCpu, PFNVMMR0CALLRING3NOTIFICATION pfnCallback, void *pvUser)
+VMMRZDECL(int) VMMRZCallRing3SetNotification(PVMCPU pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser)
 {
     AssertReturn(pVCpu, VERR_INVALID_POINTER);

trunk/src/VBox/VMM/include/VMMInternal.h

@@ -432 +432 @@
     /** @} */
 
-    /** Alignment padding, making sure u64CallRing3Arg is nicly aligned. */
+    /** Alignment padding, making sure u64CallRing3Arg is nicely aligned. */
     uint32_t                    au32Padding1[3];
 
@@ -446 +446 @@
     /** The argument to the operation. */
     uint64_t                    u64CallRing3Arg;
+    /** The Ring-0 notification callback. */
+    R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION)   pfnCallRing3CallbackR0;
+    /** The Ring-0 notification callback user argument. */
+    R0PTRTYPE(void *)           pvCallRing3CallbackUserR0;
     /** The Ring-0 jmp buffer.
      * @remarks The size of this type isn't stable in assembly, so don't put
      *          anything that needs to be accessed from assembly after it. */
     VMMR0JMPBUF                 CallRing3JmpBufR0;
-    /** The Ring-0 notification callback. */
-    PFNVMMR0CALLRING3NOTIFICATION   pfnCallRing3CallbackR0;
-    /** The Ring-0 notification callback user argument. */
-    void                       *pvCallRing3CallbackUserR0;
     /** @} */
 } VMMCPU;

trunk/src/VBox/VMM/include/VMMInternal.mac

@@ -124 +124 @@
         .rcCallRing3            resd 1
         .u64CallRing3Arg        resq 1
+        .pfnCallRing3CallbackR0         RTR0PTR_RES 1
+        .pvCallRing3CallbackUserR0      RTR0PTR_RES 1
         ; .CallRing3JmpBufR0    resb no-can-do
-        ; .pfnCallRing3CallbackR0
-        ; .pvCallRing3CallbackUserR0
 endstruc