Changeset 46217 in vbox for trunk/src

Timestamp:

May 22, 2013 1:02:37 PM (12 years ago)

Author:

vboxsync

Message:

Fixed the 'r', 'rg' and 'rg32' commands in 64-bit guest code.

Location:

trunk/src/VBox

Files:

• Debugger/DBGCEmulateCodeView.cpp (modified) (2 diffs)
• Debugger/testcase/tstDBGCStubs.cpp (modified) (1 diff)
• VMM/VMMR3/DBGFCpu.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -1394 +1394 @@
 
 /**
- * @interface_method_impl{FNDBCCMD, The 'rg', 'rg64' and 'rg32' commands.}
+ * @interface_method_impl{FNDBCCMD,
+ * The 'rg', 'rg64' and 'rg32' commands, worker for 'r'.}
  */
 static DECLCALLBACK(int) dbgcCmdRegGuest(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs)
@@ -1405 +1406 @@
         PDBGC       pDbgc      = DBGC_CMDHLP2DBGC(pCmdHlp);
         bool const  f64BitMode = !strcmp(pCmd->pszCmd, "rg64")
-                              || (   !strcmp(pCmd->pszCmd, "rg32")
-                                  && CPUMIsGuestIn64BitCode(VMMR3GetCpuByIdU(pUVM, pDbgc->idCpu)));
+                              || (   strcmp(pCmd->pszCmd, "rg32") != 0
+                                  && DBGFR3CpuIsIn64BitCode(pUVM, pDbgc->idCpu));
         char        szDisAndRegs[8192];
         int         rc;

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -303 +303 @@
     return 1;
 }
+VMMR3DECL(bool) DBGFR3CpuIsIn64BitCode(PUVM pUVM, VMCPUID idCpu)
+{
+    return false;
+}
 
 VMMR3DECL(int) DBGFR3CoreWrite(PUVM pUVM, const char *pszFilename, bool fReplaceFile)

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

@@ -71 +71 @@
 
 /**
+ * Wrapper around CPUMIsGuestIn64BitCode.
+ *
+ * @returns VINF_SUCCESS.
+ * @param   pVM             Pointer to the VM.
+ * @param   idCpu           The current CPU ID.
+ * @param   pfIn64BitCode   Where to return the result.
+ */
+static DECLCALLBACK(int) dbgfR3CpuIn64BitCode(PVM pVM, VMCPUID idCpu, bool *pfIn64BitCode)
+{
+    Assert(idCpu == VMMGetCpuId(pVM));
+    PVMCPU pVCpu = VMMGetCpuById(pVM, idCpu);
+    *pfIn64BitCode = CPUMIsGuestIn64BitCode(pVCpu);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Checks if the given CPU is executing 64-bit code or not.
+ *
+ * @returns true / false accordingly.
+ * @param   pUVM        The user mode VM handle.
+ * @param   idCpu       The target CPU ID.
+ */
+VMMR3DECL(bool) DBGFR3CpuIsIn64BitCode(PUVM pUVM, VMCPUID idCpu)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    VM_ASSERT_VALID_EXT_RETURN(pUVM->pVM, false);
+    AssertReturn(idCpu < pUVM->pVM->cCpus, false);
+
+    CPUMMODE fIn64BitCode;
+    int rc = VMR3ReqPriorityCallWaitU(pUVM, idCpu, (PFNRT)dbgfR3CpuIn64BitCode, 3, pUVM->pVM, idCpu, &fIn64BitCode);
+    if (RT_FAILURE(rc))
+        return false;
+    return fIn64BitCode;
+}
+
+
+/**
  * Get the number of CPUs (or threads if you insist).
  *