Changeset 41810 in vbox for trunk/src/VBox

Timestamp:

Jun 18, 2012 8:32:43 AM (13 years ago)

Author:

vboxsync

Message:

csamR3DISInstr: forgot to update the calls to pass DisInfo.

File:

• trunk/src/VBox/VMM/VMMR3/CSAM.cpp (modified) (1 diff)

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

@@ -799 +799 @@
     CSAMDISINFO DisInfo = { pVM, InstrHC };
 #ifdef DEBUG
-    return DISInstrToStrEx(InstrGC, enmCpuMode, csamR3ReadBytes, pVM, DISOPTYPE_ALL,
+    return DISInstrToStrEx(InstrGC, enmCpuMode, csamR3ReadBytes, &DisInfo, DISOPTYPE_ALL,
                            pCpu, pcbInstr, pszOutput, cbOutput);
 #else
     /* We are interested in everything except harmless stuff */
     if (pszOutput)
-        return DISInstrToStrEx(InstrGC, enmCpuMode, csamR3ReadBytes, pVM, ~(DISOPTYPE_INVALID | DISOPTYPE_HARMLESS | DISOPTYPE_RRM_MASK),
+        return DISInstrToStrEx(InstrGC, enmCpuMode, csamR3ReadBytes, &DisInfo,
+                               ~(DISOPTYPE_INVALID | DISOPTYPE_HARMLESS | DISOPTYPE_RRM_MASK),
                                pCpu, pcbInstr, pszOutput, cbOutput);
-    return DISInstEx(InstrGC, enmCpuMode, ~(DISOPTYPE_INVALID | DISOPTYPE_HARMLESS | DISOPTYPE_RRM_MASK), csamR3ReadBytes, pVM,
-                     pCpu, pcbInstr);
+    return DISInstEx(InstrGC, enmCpuMode, ~(DISOPTYPE_INVALID | DISOPTYPE_HARMLESS | DISOPTYPE_RRM_MASK),
+                     csamR3ReadBytes, &DisInfo, pCpu, pcbInstr);
 #endif
 }