Changeset 9844 in vbox

Timestamp:

Jun 20, 2008 9:50:13 AM (17 years ago)

Author:

vboxsync

Message:

Correction

File:

• trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (2 diffs)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -1430 +1430 @@
                         pszPrefix, pCtx->msrSFMASK,
                         pszPrefix, pCtx->msrKERNELGSBASE);
-
-                    /*
-                    * Disassemble one instruction at cs:eip.
-                    */
-                    return pCmdHlp->pfnExec(pCmdHlp, "u %016x L 0", pCtx->rip);
             }
             else
@@ -1465 +1460 @@
                     pszPrefix, pCtx->SysEnter.cs, pCtx->SysEnter.eip, pCtx->SysEnter.esp,
                     pszPrefix, pCtx->fpu.FCW, pszPrefix, pCtx->fpu.FSW, pszPrefix, pCtx->fpu.FTW);
-
-                    /*
-                    * Disassemble one instruction at cs:eip.
-                    */
-                    return pCmdHlp->pfnExec(pCmdHlp, "u %04x:%08x L 0", pCtx->cs, pCtx->eip);
+        }
+        if (CPUMIsGuestIn64BitCodeEx(pCtx))
+        {
+            /*
+             * Disassemble one instruction at cs:rip.
+             */
+            return pCmdHlp->pfnExec(pCmdHlp, "u %016x L 0", pCtx->rip);
+        }
+        else
+        {
+            /*
+             * Disassemble one instruction at cs:eip.
+             */
+            return pCmdHlp->pfnExec(pCmdHlp, "u %04x:%08x L 0", pCtx->cs, pCtx->eip);
         }
     }