Changeset 72581 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

Timestamp:

Jun 16, 2018 4:14:16 PM (6 years ago)

Author:

vboxsync

Message:

IEM: Logging adjust.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (15 diffs)

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

@@ -13529 +13529 @@
  *
  *                      The @a fSameCtx parameter is now misleading and obsolete.
- */
-IEM_STATIC void iemLogCurInstr(PVMCPU pVCpu, bool fSameCtx)
+ * @param   pszFunction The IEM function doing the execution.
+ */
+IEM_STATIC void iemLogCurInstr(PVMCPU pVCpu, bool fSameCtx, const char *pszFunction)
 {
 # ifdef IN_RING3
@@ -13560 +13561 @@
 
         PCX86FXSTATE pFpuCtx = &pVCpu->cpum.GstCtx.CTX_SUFF(pXState)->x87;
-        Log2(("****\n"
+        Log2(("**** %s\n"
               " eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\n"
               " eip=%08x esp=%08x ebp=%08x iopl=%d tr=%04x\n"
@@ -13566 +13567 @@
               " fsw=%04x fcw=%04x ftw=%02x mxcsr=%04x/%04x\n"
               " %s\n"
-              ,
+              , pszFunction,
               pVCpu->cpum.GstCtx.eax, pVCpu->cpum.GstCtx.ebx, pVCpu->cpum.GstCtx.ecx, pVCpu->cpum.GstCtx.edx, pVCpu->cpum.GstCtx.esi, pVCpu->cpum.GstCtx.edi,
               pVCpu->cpum.GstCtx.eip, pVCpu->cpum.GstCtx.esp, pVCpu->cpum.GstCtx.ebp, pVCpu->cpum.GstCtx.eflags.Bits.u2IOPL, pVCpu->cpum.GstCtx.tr.Sel,
@@ -13579 +13580 @@
     else
 # endif
-        LogFlow(("IEMExecOne: cs:rip=%04x:%08RX64 ss:rsp=%04x:%08RX64 EFL=%06x\n",
-                 pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.ss.Sel, pVCpu->cpum.GstCtx.rsp, pVCpu->cpum.GstCtx.eflags.u));
+        LogFlow(("%s: cs:rip=%04x:%08RX64 ss:rsp=%04x:%08RX64 EFL=%06x\n", pszFunction, pVCpu->cpum.GstCtx.cs.Sel,
+                 pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.ss.Sel, pVCpu->cpum.GstCtx.rsp, pVCpu->cpum.GstCtx.eflags.u));
     RT_NOREF_PV(pVCpu); RT_NOREF_PV(fSameCtx);
 }
@@ -13678 +13679 @@
  *                      POP SS and MOV SS,GR.
  */
-DECLINLINE(VBOXSTRICTRC) iemExecOneInner(PVMCPU pVCpu, bool fExecuteInhibit)
+DECLINLINE(VBOXSTRICTRC) iemExecOneInner(PVMCPU pVCpu, bool fExecuteInhibit, const char *pszFunction)
 {
     AssertMsg(pVCpu->iem.s.aMemMappings[0].fAccess == IEM_ACCESS_INVALID, ("0: %#x %RGp\n", pVCpu->iem.s.aMemMappings[0].fAccess, pVCpu->iem.s.aMemBbMappings[0].GCPhysFirst));
     AssertMsg(pVCpu->iem.s.aMemMappings[1].fAccess == IEM_ACCESS_INVALID, ("1: %#x %RGp\n", pVCpu->iem.s.aMemMappings[1].fAccess, pVCpu->iem.s.aMemBbMappings[1].GCPhysFirst));
     AssertMsg(pVCpu->iem.s.aMemMappings[2].fAccess == IEM_ACCESS_INVALID, ("2: %#x %RGp\n", pVCpu->iem.s.aMemMappings[2].fAccess, pVCpu->iem.s.aMemBbMappings[2].GCPhysFirst));
+    RT_NOREF_PV(pszFunction);
 
 #ifdef IEM_WITH_SETJMP
@@ -13727 +13729 @@
         {
 #ifdef LOG_ENABLED
-            iemLogCurInstr(pVCpu, false);
+            iemLogCurInstr(pVCpu, false, pszFunction);
 #endif
 #ifdef IEM_WITH_SETJMP
@@ -13807 +13809 @@
 {
 #ifdef LOG_ENABLED
-    iemLogCurInstr(pVCpu, true);
+    iemLogCurInstr(pVCpu, true, "IEMExecOne");
 #endif
 
@@ -13815 +13817 @@
     VBOXSTRICTRC rcStrict = iemInitDecoderAndPrefetchOpcodes(pVCpu, false);
     if (rcStrict == VINF_SUCCESS)
-        rcStrict = iemExecOneInner(pVCpu, true);
+        rcStrict = iemExecOneInner(pVCpu, true, "IEMExecOne");
     else if (pVCpu->iem.s.cActiveMappings > 0)
         iemMemRollback(pVCpu);
@@ -13837 +13839 @@
     if (rcStrict == VINF_SUCCESS)
     {
-        rcStrict = iemExecOneInner(pVCpu, true);
+        rcStrict = iemExecOneInner(pVCpu, true, "IEMExecOneEx");
         if (pcbWritten)
             *pcbWritten = pVCpu->iem.s.cbWritten - cbOldWritten;
@@ -13876 +13878 @@
         rcStrict = iemInitDecoderAndPrefetchOpcodes(pVCpu, false);
     if (rcStrict == VINF_SUCCESS)
-        rcStrict = iemExecOneInner(pVCpu, true);
+        rcStrict = iemExecOneInner(pVCpu, true, "IEMExecOneWithPrefetchedByPC");
     else if (pVCpu->iem.s.cActiveMappings > 0)
         iemMemRollback(pVCpu);
@@ -13895 +13897 @@
     if (rcStrict == VINF_SUCCESS)
     {
-        rcStrict = iemExecOneInner(pVCpu, false);
+        rcStrict = iemExecOneInner(pVCpu, false, "IEMExecOneBypassEx");
         if (pcbWritten)
             *pcbWritten = pVCpu->iem.s.cbWritten - cbOldWritten;
@@ -13934 +13936 @@
         rcStrict = iemInitDecoderAndPrefetchOpcodes(pVCpu, true);
     if (rcStrict == VINF_SUCCESS)
-        rcStrict = iemExecOneInner(pVCpu, false);
+        rcStrict = iemExecOneInner(pVCpu, false, "IEMExecOneBypassWithPrefetchedByPC");
     else if (pVCpu->iem.s.cActiveMappings > 0)
         iemMemRollback(pVCpu);
@@ -13986 +13988 @@
     if (rcStrict == VINF_SUCCESS)
     {
-        rcStrict = iemExecOneInner(pVCpu, false);
+        rcStrict = iemExecOneInner(pVCpu, false, "IEMExecOneBypassWithPrefetchedByPCWritten");
         if (pcbWritten)
             *pcbWritten = pVCpu->iem.s.cbWritten - cbOldWritten;
@@ -14058 +14060 @@
                  */
 #ifdef LOG_ENABLED
-                iemLogCurInstr(pVCpu, true);
+                iemLogCurInstr(pVCpu, true, "IEMExecLots");
 #endif
 
@@ -14203 +14205 @@
                  */
 #ifdef LOG_ENABLED
-                iemLogCurInstr(pVCpu, true);
+                iemLogCurInstr(pVCpu, true, "IEMExecForExits");
 #endif