Changeset 72866 in vbox

Timestamp:

Jul 4, 2018 10:42:51 AM (7 years ago)

Author:

vboxsync

Message:

IEM,CPUM: Can use LogRel in ring-0 too now and have it go to VBox.log.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllMsrs.cpp (modified) (1 diff)
• VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)
• include/IEMInternal.h (modified) (1 diff)
• testcase/tstVMStruct.h (modified) (1 diff)

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

@@ -645 +645 @@
         return VINF_SUCCESS;
     }
-#ifdef IN_RING3
     LogRel(("CPUM: IA32_SYSENTER_EIP not canonical! %#llx\n", uValue));
-#else
-    Log(("CPUM: IA32_SYSENTER_EIP not canonical! %#llx\n", uValue));
-#endif
     RT_NOREF_PV(idMsr); RT_NOREF_PV(pRange); RT_NOREF_PV(uRawValue);
     return VERR_CPUM_RAISE_GP_0;

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -6254 +6254 @@
         return rcStrict;
     }
-#else /* IN_RING3 */
+#endif
+
     /* Often a unimplemented MSR or MSR bit, so worth logging. */
-    static uint32_t s_cTimes = 0;
-    if (s_cTimes++ < 10)
+    if (pVCpu->iem.s.cLogRelRdMsr < 32)
+    {
+        pVCpu->iem.s.cLogRelRdMsr++;
         LogRel(("IEM: rdmsr(%#x) -> #GP(0)\n", pVCpu->cpum.GstCtx.ecx));
+    }
     else
-#endif
-        Log(("IEM: rdmsr(%#x) -> #GP(0)\n", pVCpu->cpum.GstCtx.ecx));
+        Log((   "IEM: rdmsr(%#x) -> #GP(0)\n", pVCpu->cpum.GstCtx.ecx));
     AssertMsgReturn(rcStrict == VERR_CPUM_RAISE_GP_0, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)), VERR_IPE_UNEXPECTED_STATUS);
     return iemRaiseGeneralProtectionFault0(pVCpu);
@@ -6318 +6320 @@
         return rcStrict;
     }
-#else /* IN_RING3 */
+#endif
+
     /* Often a unimplemented MSR or MSR bit, so worth logging. */
-    static uint32_t s_cTimes = 0;
-    if (s_cTimes++ < 10)
+    if (pVCpu->iem.s.cLogRelWrMsr < 32)
+    {
+        pVCpu->iem.s.cLogRelWrMsr++;
         LogRel(("IEM: wrmsr(%#x,%#x`%08x) -> #GP(0)\n", pVCpu->cpum.GstCtx.ecx, uValue.s.Hi, uValue.s.Lo));
+    }
     else
-#endif
-        Log(("IEM: wrmsr(%#x,%#x`%08x) -> #GP(0)\n", pVCpu->cpum.GstCtx.ecx, uValue.s.Hi, uValue.s.Lo));
+        Log((   "IEM: wrmsr(%#x,%#x`%08x) -> #GP(0)\n", pVCpu->cpum.GstCtx.ecx, uValue.s.Hi, uValue.s.Lo));
     AssertMsgReturn(rcStrict == VERR_CPUM_RAISE_GP_0, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)), VERR_IPE_UNEXPECTED_STATUS);
     return iemRaiseGeneralProtectionFault0(pVCpu);

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

@@ -598 +598 @@
     /** @} */
 
-    uint32_t                au32Alignment8[HC_ARCH_BITS == 64 ? 4 + 8 : 4]; /**< Alignment padding. */
+    /** Counts RDMSR \#GP(0) LogRel(). */
+    uint8_t                 cLogRelRdMsr;
+    /** Counts WRMSR \#GP(0) LogRel(). */
+    uint8_t                 cLogRelWrMsr;
+    /** Alignment padding. */
+    uint8_t                 abAlignment8[HC_ARCH_BITS == 64 ? 46 : 14];
 
     /** Data TLB.

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -305 +305 @@
     GEN_CHECK_OFF(IEMCPU, aMemBbMappings);
     GEN_CHECK_OFF(IEMCPU, aMemBbMappings[1]);
+    GEN_CHECK_OFF(IEMCPU, cLogRelRdMsr);
+    GEN_CHECK_OFF(IEMCPU, cLogRelWrMsr);
     GEN_CHECK_OFF(IEMCPU, DataTlb);
     GEN_CHECK_OFF(IEMCPU, CodeTlb);