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

Timestamp:

Jul 28, 2016 9:47:09 PM (9 years ago)

Author:

vboxsync

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

109218

Message:

TRPM: Fixed ancient TRPMCPU structure misalignment caught by MSC warning. Stupid #pragma pack(4).

Location:

trunk/src/VBox/VMM/include

Files:

• TRPMInternal.h (modified) (3 diffs)
• TRPMInternal.mac (modified) (1 diff)

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

@@ -177 +177 @@
 #endif
 } TRPM;
+#pragma pack()
 
 /** Pointer to TRPM Data. */
@@ -228 +229 @@
     RTGCUINT                uSavedVector; /**< @todo don't use RTGCUINT */
 
+    /** Saved errorcode. */
+    RTGCUINT                uSavedErrorCode;
+
+    /** Saved cr2. */
+    RTGCUINTPTR             uSavedCR2;
+
     /** Saved trap type. */
     TRPMEVENT               enmSavedType;
-
-    /** Saved errorcode. */
-    RTGCUINT                uSavedErrorCode;
-
-    /** Saved cr2. */
-    RTGCUINTPTR             uSavedCR2;
-
-    /** Previous trap vector # - for debugging. */
-    RTGCUINT                uPrevVector;
 
     /** Instruction length for software interrupts and software exceptions
@@ -249 +247 @@
     /** Padding. */
     uint8_t                 au8Padding[2];
+
+    /** Previous trap vector # - for debugging. */
+    RTGCUINT                uPrevVector;
 } TRPMCPU;
 
 /** Pointer to TRPMCPU Data. */
 typedef TRPMCPU *PTRPMCPU;
-
-#pragma pack()
 
 

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

@@ -75 +75 @@
     .uActiveCR2         RTGCPTR_RES 1
     .uSavedVector       RTGCPTR_RES 1
-    .enmSavedType       resd 1
     .uSavedErrorCode    RTGCPTR_RES 1
     .uSavedCR2          RTGCPTR_RES 1
-    .uPrevVector        RTGCPTR_RES 1
+    .enmSavedType       resd 1
     .cbInstr            resb 1
     .cbSavedInstr       resb 1
     .au8Padding         resb 2
+    .uPrevVector        RTGCPTR_RES 1
 endstruc