Changeset 9790 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 18, 2008 2:51:45 PM (17 years ago)

Author:

vboxsync

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

32159

Message:

Disassemble the current guest instruction when dumping the guest state.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (3 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -1030 +1030 @@
     pHlp->pfnPrintf(pHlp, "Guest CPUM state: %s\n", pszComment);
     cpumR3InfoOne(pVM, &pVM->cpum.s.Guest, CPUMCTX2CORE(&pVM->cpum.s.Guest), pHlp, enmType, "");
+
+    char szInstruction[256];
+    int rc = DBGFR3DisasInstrCurrent(pVM, szInstruction, sizeof(szInstruction));
+    if (VBOX_SUCCESS(rc))
+        pHlp->pfnPrintf(pHlp, "\nCPUM: %s\n\n", szInstruction);
 }
 
@@ -1258 +1263 @@
 
         pHlp->pfnPrintf(pHlp,
-                        "Family:                          %d  \tExtended: %d \tEffectiv: %d\n"
-                        "Model:                           %d  \tExtended: %d \tEffectiv: %d\n"
+                        "Family:                          %d  \tExtended: %d \tEffective: %d\n"
+                        "Model:                           %d  \tExtended: %d \tEffective: %d\n"
                         "Stepping:                        %d\n"
                         "APIC ID:                         %#04x\n"
@@ -1435 +1440 @@
         uint32_t uEAX = Guest.eax;
         pHlp->pfnPrintf(pHlp,
-                        "Family:                          %d  \tExtended: %d \tEffectiv: %d\n"
-                        "Model:                           %d  \tExtended: %d \tEffectiv: %d\n"
+                        "Family:                          %d  \tExtended: %d \tEffective: %d\n"
+                        "Model:                           %d  \tExtended: %d \tEffective: %d\n"
                         "Stepping:                        %d\n"
                         "Brand ID:                        %#05x\n",

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

@@ -90 +90 @@
             rc = EMInterpretDisasOne(pVM, pRegFrame, &Cpu, &cbOp);
             if (     RT_SUCCESS(rc)
-                &&   Cpu.mode == CPUMODE_32BIT
+                &&   Cpu.mode == CPUMODE_32BIT  /* @todo why does this matter? */
                 &&  !(Cpu.prefix & (PREFIX_REPNE | PREFIX_REP | PREFIX_SEG)))
             {