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

Timestamp:

Sep 25, 2019 9:12:34 AM (5 years ago)

Author:

vboxsync

Message:

VMM: bugref:9566 TRPM enhancements and cleanup. Bumps TRPM saved-state version.

File:

• trunk/src/VBox/VMM/include/TRPMInternal.h (modified) (2 diffs)

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

@@ -72 +72 @@
 
     /** Errorcode for the active interrupt/trap. */
-    RTGCUINT                uActiveErrorCode; /**< @todo don't use RTGCUINT */
-
-    /** CR2 at the time of the active exception. */
-    RTGCUINTPTR             uActiveCR2;
-
-    /** Saved trap vector number. */
-    RTGCUINT                uSavedVector; /**< @todo don't use RTGCUINT */
-
-    /** Saved errorcode. */
-    RTGCUINT                uSavedErrorCode;
-
-    /** Saved cr2. */
-    RTGCUINTPTR             uSavedCR2;
-
-    /** Saved trap type. */
-    TRPMEVENT               enmSavedType;
+    uint32_t                uActiveErrorCode;
 
     /** Instruction length for software interrupts and software exceptions
@@ -93 +78 @@
     uint8_t                 cbInstr;
 
-    /** Saved instruction length. */
-    uint8_t                 cbSavedInstr;
+    /** Whether this \#DB trap is caused due to INT1/ICEBP. */
+    bool                    fIcebp;
 
-    /** Padding. */
-    uint8_t                 au8Padding[2];
-
-    /** Previous trap vector # - for debugging. */
-    RTGCUINT                uPrevVector;
+    /** CR2 at the time of the active exception. */
+    RTGCUINTPTR             uActiveCR2;
 } TRPMCPU;
 
 /** Pointer to TRPMCPU Data. */
 typedef TRPMCPU *PTRPMCPU;
+/** Pointer to const TRPMCPU Data. */
+typedef const TRPMCPU *PCTRPMCPU;
 
 /** @} */