Changeset 9292 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2008 12:09:25 PM (17 years ago)

Author:

vboxsync

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

31498

Message:

DBGDisas: distinguish between 32 & 64 bits modes.

File:

• trunk/src/VBox/VMM/DBGFDisas.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -413 +413 @@
             RTStrPrintf(pszOutput, cchOutput, "%04x:%04x  %s", Sel, (unsigned)GCPtr, szBuf);
         else if (Sel == DBGF_SEL_FLAT)
-            RTStrPrintf(pszOutput, cchOutput, "%VGv  %s", GCPtr, szBuf);
+        {
+            if (enmMode >= PGMMODE_AMD64)
+                RTStrPrintf(pszOutput, cchOutput, "%VGv  %s", GCPtr, szBuf);
+            else
+                RTStrPrintf(pszOutput, cchOutput, "%VRv  %s", (RTRCPTR)GCPtr, szBuf);
+        }
         else
-            RTStrPrintf(pszOutput, cchOutput, "%04x:%VGv  %s", Sel, GCPtr, szBuf);
+        {
+            if (enmMode >= PGMMODE_AMD64)
+                RTStrPrintf(pszOutput, cchOutput, "%04x:%VGv  %s", Sel, GCPtr, szBuf);
+            else
+                RTStrPrintf(pszOutput, cchOutput, "%04x:%VRv  %s", Sel, (RTRCPTR)GCPtr, szBuf);
+        }
     }
     else
@@ -433 +443 @@
                         szBuf);
         else if (Sel == DBGF_SEL_FLAT)
-            RTStrPrintf(pszOutput, cchOutput, "%VGv %.*Vhxs%*s %s",
-                        GCPtr,
-                        cbBits, pau8Bits, cbBits < 8 ? (8 - cbBits) * 3 : 0, "",
-                        szBuf);
+        {
+            if (enmMode >= PGMMODE_AMD64)
+                RTStrPrintf(pszOutput, cchOutput, "%VGv %.*Vhxs%*s %s",
+                            GCPtr,
+                            cbBits, pau8Bits, cbBits < 8 ? (8 - cbBits) * 3 : 0, "",
+                            szBuf);
+            else
+                RTStrPrintf(pszOutput, cchOutput, "%VRv %.*Vhxs%*s %s",
+                            (RTRCPTR)GCPtr,
+                            cbBits, pau8Bits, cbBits < 8 ? (8 - cbBits) * 3 : 0, "",
+                            szBuf);
+        }
         else
-            RTStrPrintf(pszOutput, cchOutput, "%04x:%VGv %.*Vhxs%*s %s",
-                        Sel, GCPtr,
-                        cbBits, pau8Bits, cbBits < 8 ? (8 - cbBits) * 3 : 0, "",
-                        szBuf);
-
+        {
+            if (enmMode >= PGMMODE_AMD64)
+                RTStrPrintf(pszOutput, cchOutput, "%04x:%VGv %.*Vhxs%*s %s",
+                            Sel, GCPtr,
+                            cbBits, pau8Bits, cbBits < 8 ? (8 - cbBits) * 3 : 0, "",
+                            szBuf);
+            else
+                RTStrPrintf(pszOutput, cchOutput, "%04x:%VRv %.*Vhxs%*s %s",
+                            Sel, (RTRCPTR)GCPtr,
+                            cbBits, pau8Bits, cbBits < 8 ? (8 - cbBits) * 3 : 0, "",
+                            szBuf);
+        }
     }