Changeset 19639 in vbox

Timestamp:

May 12, 2009 3:22:14 PM (16 years ago)

Author:

vboxsync

Message:

Disassembler changes for guest SMP

Location:

trunk

Files:

• include/VBox/dbgf.h (modified) (3 diffs)
• src/VBox/VMM/CPUM.cpp (modified) (1 diff)
• src/VBox/VMM/DBGFDisas.cpp (modified) (3 diffs)
• src/VBox/VMM/EM.cpp (modified) (11 diffs)
• src/VBox/VMM/TRPM.cpp (modified) (1 diff)
• src/recompiler/VBoxREMWrapper.cpp (modified) (1 diff)
• src/recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/include/VBox/dbgf.h

@@ -788 +788 @@
 
 VMMR3DECL(int) DBGFR3DisasInstrEx(PVM pVM, VMCPUID idCpu, RTSEL Sel, RTGCPTR GCPtr, unsigned fFlags, char *pszOutput, uint32_t cchOutput, uint32_t *pcbInstr);
-VMMR3DECL(int) DBGFR3DisasInstrCurrent(PVM pVM, char *pszOutput, uint32_t cbOutput);
-VMMR3DECL(int) DBGFR3DisasInstrCurrentLogInternal(PVM pVM, const char *pszPrefix);
+VMMR3DECL(int) DBGFR3DisasInstrCurrent(PVMCPU pVCpu, char *pszOutput, uint32_t cbOutput);
+VMMR3DECL(int) DBGFR3DisasInstrCurrentLogInternal(PVMCPU pVCpu, const char *pszPrefix);
 
 /** @def DBGFR3DisasInstrCurrentLog
@@ -795 +795 @@
  * All registers and data will be displayed. Addresses will be attempted resolved to symbols.
  */
-/** @todo SMP */
 #ifdef LOG_ENABLED
-# define DBGFR3DisasInstrCurrentLog(pVM, pszPrefix) \
+# define DBGFR3DisasInstrCurrentLog(pVCpu, pszPrefix) \
     do { \
         if (LogIsEnabled()) \
-            DBGFR3DisasInstrCurrentLogInternal(pVM, pszPrefix); \
+            DBGFR3DisasInstrCurrentLogInternal(pVCpu, pszPrefix); \
     } while (0)
 #else
-# define DBGFR3DisasInstrCurrentLog(pVM, pszPrefix) do { } while (0)
+# define DBGFR3DisasInstrCurrentLog(pVCpu, pszPrefix) do { } while (0)
 #endif
 
-VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVM pVM, RTSEL Sel, RTGCPTR GCPtr);
+VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVMCPU pVCpu, RTSEL Sel, RTGCPTR GCPtr);
 
 /** @def DBGFR3DisasInstrLog
@@ -814 +813 @@
  */
 #ifdef LOG_ENABLED
-# define DBGFR3DisasInstrLog(pVM, Sel, GCPtr) \
+# define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) \
     do { \
         if (LogIsEnabled()) \
-            DBGFR3DisasInstrLogInternal(pVM, Sel, GCPtr); \
+            DBGFR3DisasInstrLogInternal(pVCpu, Sel, GCPtr); \
     } while (0)
 #else
-# define DBGFR3DisasInstrLog(pVM, Sel, GCPtr) do { } while (0)
+# define DBGFR3DisasInstrLog(pVCpu, Sel, GCPtr) do { } while (0)
 #endif
 

trunk/src/VBox/VMM/CPUM.cpp

@@ -1437 +1437 @@
 {
     char szInstruction[256];
-    int rc = DBGFR3DisasInstrCurrent(pVM, szInstruction, sizeof(szInstruction));
+    /* @todo SMP support! */
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    if (!pVCpu)
+        pVCpu = &pVM->aCpus[0];
+
+    int rc = DBGFR3DisasInstrCurrent(pVCpu, szInstruction, sizeof(szInstruction));
     if (RT_SUCCESS(rc))
         pHlp->pfnPrintf(pHlp, "\nCPUM: %s\n\n", szInstruction);

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -582 +582 @@
  *
  * @returns VBox status code.
- * @param   pVM             VM handle.
+ * @param   pVCpu           VMCPU handle.
  * @param   pszOutput       Output buffer.
  * @param   cchOutput       Size of the output buffer.
  */
-VMMR3DECL(int) DBGFR3DisasInstrCurrent(PVM pVM, char *pszOutput, uint32_t cchOutput)
+VMMR3DECL(int) DBGFR3DisasInstrCurrent(PVMCPU pVCpu, char *pszOutput, uint32_t cchOutput)
 {
     *pszOutput = '\0';
-    PVMCPU pVCpu = VMMGetCpu(pVM);
     AssertReturn(pVCpu, VERR_INVALID_CONTEXT);
-    return DBGFR3DisasInstrEx(pVM, pVCpu->idCpu, 0, 0, DBGF_DISAS_FLAGS_CURRENT_GUEST,
+    return DBGFR3DisasInstrEx(pVCpu->pVMR3, pVCpu->idCpu, 0, 0, DBGF_DISAS_FLAGS_CURRENT_GUEST,
                               pszOutput, cchOutput, NULL);
 }
@@ -601 +600 @@
  *
  * @returns VBox status code.
- * @param   pVM             VM handle.
+ * @param   pVCpu           VMCPU handle.
  * @param   pszPrefix       Short prefix string to the dissassembly string. (optional)
  */
-VMMR3DECL(int) DBGFR3DisasInstrCurrentLogInternal(PVM pVM, const char *pszPrefix)
+VMMR3DECL(int) DBGFR3DisasInstrCurrentLogInternal(PVMCPU pVCpu, const char *pszPrefix)
 {
     char szBuf[256];
     szBuf[0] = '\0';
-    int rc = DBGFR3DisasInstrCurrent(pVM, &szBuf[0], sizeof(szBuf));
+    int rc = DBGFR3DisasInstrCurrent(pVCpu, &szBuf[0], sizeof(szBuf));
     if (RT_FAILURE(rc))
         RTStrPrintf(szBuf, sizeof(szBuf), "DBGFR3DisasInstrCurrentLog failed with rc=%Rrc\n", rc);
@@ -631 +630 @@
  * @param   GCPtr           The code address relative to the base of Sel.
  */
-VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVM pVM, RTSEL Sel, RTGCPTR GCPtr)
-{
-    PVMCPU pVCpu = VMMGetCpu(pVM);
-    AssertReturn(pVCpu, VERR_INVALID_CONTEXT);
-
+VMMR3DECL(int) DBGFR3DisasInstrLogInternal(PVMCPU pVCpu, RTSEL Sel, RTGCPTR GCPtr)
+{
     char szBuf[256];
     szBuf[0] = '\0';
-    int rc = DBGFR3DisasInstrEx(pVM, pVCpu->idCpu, Sel, GCPtr, 0, &szBuf[0], sizeof(szBuf), NULL);
+    int rc = DBGFR3DisasInstrEx(pVCpu->pVMR3, pVCpu->idCpu, Sel, GCPtr, 0, &szBuf[0], sizeof(szBuf), NULL);
     if (RT_FAILURE(rc))
         RTStrPrintf(szBuf, sizeof(szBuf), "DBGFR3DisasInstrLog(, %RTsel, %RGv) failed with rc=%Rrc\n", Sel, GCPtr, rc);

trunk/src/VBox/VMM/EM.cpp

@@ -1246 +1246 @@
     {
         DBGFR3PrgStep(pVCpu);
-        DBGFR3DisasInstrCurrentLog(pVM, "RSS: ");
+        DBGFR3DisasInstrCurrentLog(pVCpu, "RSS: ");
         rc = emR3RawStep(pVM, pVCpu);
         if (rc != VINF_SUCCESS)
@@ -1268 +1268 @@
     {
         DBGFR3PrgStep(pVCpu);
-        DBGFR3DisasInstrCurrentLog(pVM, "RSS: ");
+        DBGFR3DisasInstrCurrentLog(pVCpu, "RSS: ");
         rc = emR3HwAccStep(pVM, pVCpu);
         if (    rc != VINF_SUCCESS
@@ -1291 +1291 @@
     {
         DBGFR3PrgStep(pVCpu);
-        DBGFR3DisasInstrCurrentLog(pVM, "RSS: ");
+        DBGFR3DisasInstrCurrentLog(pVCpu, "RSS: ");
         emR3RemStep(pVM, pVCpu);
         if (emR3Reschedule(pVM, pVCpu, pVCpu->em.s.pCtx) != EMSTATE_REM)
@@ -1340 +1340 @@
     {
         DBGFR3InfoLog(pVM, "cpumguest", pszPrefix);
-        DBGFR3DisasInstrCurrentLog(pVM, pszPrefix);
+        DBGFR3DisasInstrCurrentLog(pVCpu, pszPrefix);
     }
 #endif /* LOG_ENABLED */
@@ -1619 +1619 @@
 #ifdef LOGGING_ENABLED
         DBGFR3InfoLog(pVM, "cpumguest", "Guest trap");
-        DBGFR3DisasInstrCurrentLog(pVM, "Guest trap");
+        DBGFR3DisasInstrCurrentLog(pVCpu, "Guest trap");
 #endif
         return VINF_EM_RESCHEDULE_HWACC;
@@ -1742 +1742 @@
 #ifdef LOG_ENABLED
     DBGFR3InfoLog(pVM, "cpumguest", "Guest trap");
-    DBGFR3DisasInstrCurrentLog(pVM, "Guest trap");
+    DBGFR3DisasInstrCurrentLog(pVCpu, "Guest trap");
 
     /* Get guest page information. */
@@ -1793 +1793 @@
                 if (RT_SUCCESS(rc))
                 {
-                    DBGFR3DisasInstrCurrentLog(pVM, "Patched sysenter instruction");
+                    DBGFR3DisasInstrCurrentLog(pVCpu, "Patched sysenter instruction");
                     return VINF_EM_RESCHEDULE_RAW;
                 }
@@ -1877 +1877 @@
 #ifdef LOG_ENABLED
         DBGFR3InfoLog(pVM, "cpumguest", "Trap in patch code");
-        DBGFR3DisasInstrCurrentLog(pVM, "Patch code");
+        DBGFR3DisasInstrCurrentLog(pVCpu, "Patch code");
 
         DISCPUSTATE Cpu;
@@ -2049 +2049 @@
                 DBGFR3InfoLog(pVM, "cpumguest", "PRIV");
 #endif
-                DBGFR3DisasInstrCurrentLog(pVM, "Patched privileged instruction");
+                DBGFR3DisasInstrCurrentLog(pVCpu, "Patched privileged instruction");
                 return VINF_SUCCESS;
             }
@@ -2059 +2059 @@
     {
         DBGFR3InfoLog(pVM, "cpumguest", "PRIV");
-        DBGFR3DisasInstrCurrentLog(pVM, "Privileged instr: ");
+        DBGFR3DisasInstrCurrentLog(pVCpu, "Privileged instr: ");
     }
 #endif
@@ -2201 +2201 @@
                     {
                         DBGFR3InfoLog(pVM, "cpumguest", "PRIV");
-                        DBGFR3DisasInstrCurrentLog(pVM, "Privileged instr: ");
+                        DBGFR3DisasInstrCurrentLog(pVCpu, "Privileged instr: ");
                     }
 #endif

trunk/src/VBox/VMM/TRPM.cpp

@@ -1451 +1451 @@
 # ifdef LOG_ENABLED
         DBGFR3InfoLog(pVM, "cpumguest", "TRPMInject");
-        DBGFR3DisasInstrCurrentLog(pVM, "TRPMInject");
+        DBGFR3DisasInstrCurrentLog(pVCpu, "TRPMInject");
 # endif
 

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -567 +567 @@
 static const REMPARMDESC g_aArgsDBGFR3DisasInstrCurrentLogInternal[] =
 {
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVMCPU), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(char *), NULL }
 };

trunk/src/recompiler/VBoxRecompiler.c

@@ -3616 +3616 @@
      */
     if (fLog)
-        rc = DBGFR3DisasInstrCurrentLogInternal(pVM, pszPrefix);
+        rc = DBGFR3DisasInstrCurrentLogInternal(env->pVCpu, pszPrefix);
 
     return RT_SUCCESS(rc);