Changeset 55292 in vbox for trunk/src/VBox

Timestamp:

Apr 15, 2015 3:31:51 PM (10 years ago)

Author:

vboxsync

Message:

HM,CPUM,IEM: XSETBV fixes and adjustments.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMAll/IEMAll.cpp (modified) (8 diffs)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2164 +2164 @@
     {
         pVCpu->cpum.s.Guest.aXcr[0] = uNewValue;
-        pVCpu->cpum.s.Guest.fXStateMask = uNewValue;
+        pVCpu->cpum.s.Guest.fXStateMask |= uNewValue;
         return VINF_SUCCESS;
     }

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -11016 +11016 @@
 
 
+/**
+ * Macro used by the IEMExec* method to check the given instruction length.
+ *
+ * Will return on failure!
+ *
+ * @param   a_cbInstr   The given instruction length.
+ * @param   a_cbMin     The minimum length.
+ */
+#define IEMEXEC_ASSERT_INSTR_LEN_RETURN(a_cbInstr, a_cbMin) \
+    AssertMsgReturn((unsigned)(a_cbInstr) - (unsigned)(a_cbMin) <= (unsigned)15 - (unsigned)(a_cbMin), \
+                    ("cbInstr=%u cbMin=%u\n", (a_cbInstr), (a_cbMin)), VERR_IEM_INVALID_INSTR_LENGTH)
+
 
 /**
@@ -11037 +11049 @@
 {
     AssertMsgReturn(iEffSeg < X86_SREG_COUNT, ("%#x\n", iEffSeg), VERR_IEM_INVALID_EFF_SEG);
-    AssertReturn(cbInstr - 1U <= 14U, VERR_IEM_INVALID_INSTR_LENGTH);
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 1);
 
     /*
@@ -11154 +11166 @@
                                                bool fRepPrefix, uint8_t cbInstr)
 {
-    AssertReturn(cbInstr - 1U <= 14U, VERR_IEM_INVALID_INSTR_LENGTH);
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 1);
 
     /*
@@ -11267 +11279 @@
 VMM_INT_DECL(VBOXSTRICTRC) IEMExecDecodedMovCRxWrite(PVMCPU pVCpu, uint8_t cbInstr, uint8_t iCrReg, uint8_t iGReg)
 {
-    AssertReturn(cbInstr - 2U <= 15U - 2U, VERR_IEM_INVALID_INSTR_LENGTH);
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 2);
     Assert(iCrReg < 16);
     Assert(iGReg < 16);
@@ -11291 +11303 @@
 VMM_INT_DECL(VBOXSTRICTRC) IEMExecDecodedMovCRxRead(PVMCPU pVCpu, uint8_t cbInstr, uint8_t iGReg, uint8_t iCrReg)
 {
-    AssertReturn(cbInstr - 2U <= 15U - 2U, VERR_IEM_INVALID_INSTR_LENGTH);
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 2);
     Assert(iCrReg < 16);
     Assert(iGReg < 16);
@@ -11313 +11325 @@
 VMM_INT_DECL(VBOXSTRICTRC) IEMExecDecodedClts(PVMCPU pVCpu, uint8_t cbInstr)
 {
-    AssertReturn(cbInstr - 2U <= 15U - 2U, VERR_IEM_INVALID_INSTR_LENGTH);
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 2);
 
     PIEMCPU pIemCpu = &pVCpu->iem.s;
@@ -11334 +11346 @@
 VMM_INT_DECL(VBOXSTRICTRC) IEMExecDecodedLmsw(PVMCPU pVCpu, uint8_t cbInstr, uint16_t uValue)
 {
-    AssertReturn(cbInstr - 3U <= 15U - 3U, VERR_IEM_INVALID_INSTR_LENGTH);
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 3);
 
     PIEMCPU pIemCpu = &pVCpu->iem.s;
@@ -11357 +11369 @@
 VMM_INT_DECL(VBOXSTRICTRC) IEMExecDecodedXsetbv(PVMCPU pVCpu, uint8_t cbInstr)
 {
-    AssertReturn(cbInstr - 3U <= 15U - 3U, VERR_IEM_INVALID_INSTR_LENGTH);
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 3);
 
     PIEMCPU pIemCpu = &pVCpu->iem.s;

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -10642 +10642 @@
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS();
 
-    int rc = hmR0VmxReadEntryInstrLenVmcs(pVmxTransient);
+    int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc |= hmR0VmxSaveGuestRegsForIemExec(pVCpu, pMixedCtx, false /*fMemory*/, false /*fNeedRsp*/);
     rc |= hmR0VmxSaveGuestCR4(pVCpu, pMixedCtx);