Changeset 62645 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/TRPM.cpp (modified) (4 diffs)
• include/TRPMInternal.h (modified) (3 diffs)
• include/TRPMInternal.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/TRPM.cpp

@@ -895 +895 @@
     }
     SSMR3PutBool(pSSM,      HMIsEnabled(pVM));
-    PVMCPU pVCpu = &pVM->aCpus[0];  /* raw mode implies 1 VCPU */
+    PVMCPU pVCpu = &pVM->aCpus[0];          /* raw mode implies 1 VCPU */
     SSMR3PutUInt(pSSM,      VM_WHEN_RAW_MODE(VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_TRPM_SYNC_IDT), 0));
     SSMR3PutMem(pSSM,       &pTrpm->au32IdtPatched[0], sizeof(pTrpm->au32IdtPatched));
-    SSMR3PutU32(pSSM, ~0);              /* separator. */
+    SSMR3PutU32(pSSM, UINT32_MAX);          /* separator. */
 
     /*
@@ -913 +913 @@
     }
 
-    return SSMR3PutU32(pSSM, ~0);       /* terminator */
+    return SSMR3PutU32(pSSM, UINT32_MAX);   /* terminator */
 }
 
@@ -1226 +1226 @@
  * Check if address is a gate handler (interrupt or trap).
  *
- * @returns gate nr or ~0 is not found
+ * @returns gate nr or UINT32_MAX is not found
  *
  * @param   pVM         The cross context VM structure.
@@ -1250 +1250 @@
         }
     }
-    return ~0;
+    return UINT32_MAX;
 }
 

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