Changeset 9651 in vbox

Timestamp:

Jun 12, 2008 9:57:20 AM (17 years ago)

Author:

vboxsync

Message:

64 bits DRx move emulation.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1905 +1905 @@
     int rc = CPUMGetGuestDRx(pVM, SrcRegDrx, &val64);
     AssertMsgRCReturn(rc, ("CPUMGetGuestDRx %d failed\n", SrcRegDrx), VERR_EM_INTERPRETER);
-    rc = DISWriteReg32(pRegFrame, DestRegGen, (uint32_t)val64);
+    if (CPUMIsGuestInLongMode(pVM))
+    {
+        rc = DISWriteReg64(pRegFrame, DestRegGen, val64);
+    }
+    else
+        rc = DISWriteReg32(pRegFrame, DestRegGen, (uint32_t)val64);
+
     if (VBOX_SUCCESS(rc))
         return VINF_SUCCESS;
+
     return VERR_EM_INTERPRETER;
 }
@@ -1915 +1922 @@
     int rc = VERR_EM_INTERPRETER;
 
-    if(pCpu->param1.flags == USE_REG_GEN32 && pCpu->param2.flags == USE_REG_DBG)
+    if((pCpu->param1.flags == USE_REG_GEN32 || pCpu->param1.flags == USE_REG_GEN64) && pCpu->param2.flags == USE_REG_DBG)
     {
         rc = EMInterpretDRxRead(pVM, pRegFrame, pCpu->param1.base.reg_gen, pCpu->param2.base.reg_dbg);
     }
     else
-    if(pCpu->param1.flags == USE_REG_DBG && pCpu->param2.flags == USE_REG_GEN32)
+    if(pCpu->param1.flags == USE_REG_DBG && (pCpu->param2.flags == USE_REG_GEN32 || pCpu->param2.flags == USE_REG_GEN64))
     {
         rc = EMInterpretDRxWrite(pVM, pRegFrame, pCpu->param1.base.reg_dbg, pCpu->param2.base.reg_gen);
@@ -1926 +1933 @@
     else
         AssertMsgFailed(("Unexpected debug register move\n"));
+
     return rc;
 }