Changeset 41671 in vbox for trunk/src/VBox/VMM/VMMR3/CSAM.cpp

Timestamp:

Jun 12, 2012 3:22:43 PM (12 years ago)

Author:

vboxsync

Message:

DISInstr* -> DISInstrToStr + cbOutput argument.

File:

• trunk/src/VBox/VMM/VMMR3/CSAM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -762 +762 @@
 
 DECLINLINE(int) CSAMR3DISInstr(PVM pVM, RTRCPTR InstrGC, uint8_t *InstrHC, DISCPUMODE enmCpuMode,
-                               PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput)
+                               PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput)
 {
     (pCpu)->apvUserData[1] = InstrHC;
     (pCpu)->apvUserData[2] = (void *)(uintptr_t)InstrGC; Assert(sizeof(InstrGC) <= sizeof(pCpu->apvUserData[0]));
 #ifdef DEBUG
-    return DISInstrEx(InstrGC, 0, enmCpuMode, CSAMR3ReadBytes, pVM, OPTYPE_ALL,
-                      pCpu, pcbInstr, pszOutput);
+    return DISInstrToStrEx(InstrGC, enmCpuMode, CSAMR3ReadBytes, pVM, OPTYPE_ALL,
+                           pCpu, pcbInstr, pszOutput, cbOutput);
 #else
     /* We are interested in everything except harmless stuff */
-    return DISInstrEx(InstrGC, 0, enmCpuMode, CSAMR3ReadBytes, pVM, ~(OPTYPE_INVALID | OPTYPE_HARMLESS | OPTYPE_RRM_MASK),
-                      pCpu, pcbInstr, pszOutput);
+    if (pszOutput)
+        return DISInstrToStrEx(InstrGC, enmCpuMode, CSAMR3ReadBytes, pVM, ~(OPTYPE_INVALID | OPTYPE_HARMLESS | OPTYPE_RRM_MASK),
+                               pCpu, pcbInstr, pszOutput, cbOutput);
+    return DISCoreOneExEx(InstrGC, enmCpuMode, CSAMR3ReadBytes, pVM, ~(OPTYPE_INVALID | OPTYPE_HARMLESS | OPTYPE_RRM_MASK),
+                          pCpu, pcbInstr);
 #endif
 }
@@ -869 +872 @@
 
                 rc = CSAMR3DISInstr(pVM, pCurInstrGC, pCurInstrHC, (fCode32) ? CPUMODE_32BIT : CPUMODE_16BIT,
-                                    &cpu, &opsize, NULL);
+                                    &cpu, &opsize, NULL, 0);
             }
             AssertRC(rc);
@@ -1052 +1055 @@
 #ifdef DEBUG
                 rc2 = CSAMR3DISInstr(pVM, pCurInstrGC, pCurInstrHC, (fCode32) ? CPUMODE_32BIT : CPUMODE_16BIT,
-                                     &cpu, &opsize, szOutput);
+                                     &cpu, &opsize, szOutput, sizeof(szOutput));
                 if (RT_SUCCESS(rc2)) Log(("CSAM Call Analysis: %s", szOutput));
 #else
                 rc2 = CSAMR3DISInstr(pVM, pCurInstrGC, pCurInstrHC, (fCode32) ? CPUMODE_32BIT : CPUMODE_16BIT,
-                                     &cpu, &opsize, NULL);
+                                     &cpu, &opsize, NULL, 0);
 #endif
                 STAM_PROFILE_STOP(&pVM->csam.s.StatTimeDisasm, a);
@@ -1265 +1268 @@
 #ifdef DEBUG
             rc2 = CSAMR3DISInstr(pVM, pCurInstrGC, pCurInstrHC, fCode32 ? CPUMODE_32BIT : CPUMODE_16BIT,
-                                 &cpu, &opsize, szOutput);
+                                 &cpu, &opsize, szOutput, sizeof(szOutput));
             if (RT_SUCCESS(rc2)) Log(("CSAM Analysis: %s", szOutput));
 #else
             rc2 = CSAMR3DISInstr(pVM, pCurInstrGC, pCurInstrHC, fCode32 ? CPUMODE_32BIT : CPUMODE_16BIT,
-                                 &cpu, &opsize, NULL);
+                                 &cpu, &opsize, NULL, 0);
 #endif
             STAM_PROFILE_STOP(&pVM->csam.s.StatTimeDisasm, a);