Changeset 41147 in vbox for trunk/src/VBox/VMM/include

Timestamp:

May 3, 2012 8:15:27 PM (13 years ago)

Author:

vboxsync

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

77764

Message:

SUPDrv,VMM: Tracepoints in raw-mode.

Location:

trunk/src/VBox/VMM/include

Files:

• VMMInternal.h (modified) (3 diffs)
• VMMInternal.mac (modified) (2 diffs)

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

@@ -20 +20 @@
 
 #include <VBox/cdefs.h>
+#include <VBox/sup.h>
 #include <VBox/vmm/stam.h>
 #include <VBox/log.h>
@@ -425 +426 @@
      *  attempts at recursive rendezvous. */
     bool volatile               fInRendezvous;
-    bool                        afPadding[HC_ARCH_BITS == 32 ? 7 : 3];
+    bool                        afPadding[HC_ARCH_BITS == 32 ? 3 : 7];
     /** @} */
+
+    /** @name Raw-mode context tracting data.
+     * @{ */
+    SUPDRVTRACERUSRCTX          TracerCtx;
+    /** @} */
+
+    /** Alignment padding, making sure u64CallRing3Arg is nicly aligned. */
+    uint32_t                    u32Padding1;
 
     /** @name Call Ring-3
@@ -439 +448 @@
     /** The argument to the operation. */
     uint64_t                    u64CallRing3Arg;
-    /** The Ring-0 jmp buffer. */
+    /** 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;
     /** @} */
 
 } VMMCPU;
+AssertCompileMemberAlignment(VMMCPU, TracerCtx, 8);
 /** Pointer to VMMCPU. */
 typedef VMMCPU *PVMMCPU;

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

@@ -17 +17 @@
 
 %include "VBox/asmdefs.mac"
+%include "VBox/sup.mac"
 
 ;
@@ -95 +96 @@
 endstruc
 
+
+struc VMMCPU
+                                
+        .offVMCPU               resd 1
+        .iLastGZRc              resd 1
+        .pbEMTStackR3           RTR3PTR_RES 1
+        .pbEMTStackRC           RTRCPTR_RES 1
+        .pbEMTStackBottomRC     RTRCPTR_RES 1
+%ifdef LOG_ENABLED
+        .pR0LoggerR3            RTR3PTR_RES 1
+        .pR0LoggerR0            RTR0PTR_RES 1
+%endif
+
+        .fInRendezvous          resb 1
+%if HC_ARCH_BITS == 32
+        .afPadding              resb 7
+%else
+        .afPadding              resb 3
+%endif
+
+        alignb 8
+        .TracerCtx              resb SUPDRVTRACERUSRCTX64_size
+
+
+        .cCallRing3Disabled     resd 1
+        .enmCallRing3Operation  resd 1
+        .rcCallRing3            resd 1
+        .u64CallRing3Arg        resq 1
+        ; .CallRing3JmpBufR0    resb no-can-do
+
+endstruc
+