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

Timestamp:

Dec 4, 2015 9:46:44 PM (9 years ago)

Author:

vboxsync

Message:

HM: Fixes for the VT-x trace points and debug events.

Location:

trunk/src/VBox/VMM/include

Files:

• HMInternal.h (modified) (2 diffs)
• HMInternal.mac (modified) (1 diff)

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

@@ -632 +632 @@
     /** Set when the TLB has been checked until we return from the world switch. */
     volatile bool               fCheckedTLBFlush;
-    /** Whether we're executing a single instruction. */
-    bool                        fSingleInstruction;
-    /** Whether we should use the debug loop because of single stepping or special
-     *  debug breakpoints / events are armed. */
-    bool                        fUseDebugLoop;
-    /** Whether we are currently executing in the debug loop.
-     *  Mainly for assertions. */
-    bool                        fUsingDebugLoop;
-    /** Set if we need to clear the trap flag because of single stepping. */
-    bool                        fClearTrapFlag;
     /** Whether we've completed the inner HM leave function. */
     bool                        fLeaveDone;
@@ -652 +642 @@
     bool                        fLoadSaveGuestXcr0;
 
+    /** Whether we should use the debug loop because of single stepping or special
+     *  debug breakpoints / events are armed. */
+    bool                        fUseDebugLoop;
+    /** Whether we are currently executing in the debug loop.
+     *  Mainly for assertions. */
+    bool                        fUsingDebugLoop;
+    /** Set if we using the debug loop and wish to intercept RDTSC. */
+    bool                        fDebugWantRdTscExit;
+    /** Whether we're executing a single instruction. */
+    bool                        fSingleInstruction;
+    /** Set if we need to clear the trap flag because of single stepping. */
+    bool                        fClearTrapFlag;
+
     /** Whether \#UD needs to be intercepted (required by certain GIM providers). */
     bool                        fGIMTrapXcptUD;
     /** Whether paravirt. hypercalls are enabled. */
     bool                        fHypercallsEnabled;
-    uint8_t                     u8Alignment0[3];
+    uint8_t                     u8Alignment0[2];
 
     /** World switch exit counter. */

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

@@ -67 +67 @@
         .fActive                resb    1
         .fCheckedTLBFlush       resb    1
-        .fSingleInstruction     resb    1
-        .fUseDebugLoop          resb    1
-        .fUsingDebugLoop        resb    1
-        .fClearTrapFlag         resb    1
         .fLeaveDone             resb    1
         .fUsingHyperDR7         resb    1
         .fPreloadGuestFpu       resb    1
         .fLoadSaveGuestXcr0     resb    1
+
+        .fUseDebugLoop          resb    1
+        .fUsingDebugLoop        resb    1
+        .fDebugWantRdTscExit    resb    1
+        .fSingleInstruction     resb    1
+        .fClearTrapFlag         resb    1
+
         .fGIMTrapXcptUD         resb    1
         .fHypercallsEnabled     resb    1
         alignb 8
+
         .cWorldSwitchExits      resd    1
         .fContextUseFlags       resd    1