Changeset 46384 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 4, 2013 2:07:49 PM (12 years ago)

Author:

vboxsync

Message:

IEM: Long mode debugging.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (3 diffs)
• IEMAllCImpl.cpp.h (modified) (3 diffs)

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

@@ -758 +758 @@
     pIemCpu->enmDefAddrMode     = enmMode;  /** @todo check if this is correct... */
     pIemCpu->enmEffAddrMode     = enmMode;
-    pIemCpu->enmDefOpSize       = enmMode;  /** @todo check if this is correct... */
-    pIemCpu->enmEffOpSize       = enmMode;
+    if (enmMode != IEMMODE_64BIT)
+    {
+        pIemCpu->enmDefOpSize   = enmMode;  /** @todo check if this is correct... */
+        pIemCpu->enmEffOpSize   = enmMode;
+    }
+    else
+    {
+        pIemCpu->enmDefOpSize   = IEMMODE_32BIT;
+        pIemCpu->enmEffOpSize   = IEMMODE_32BIT;
+    }
     pIemCpu->fPrefixes          = 0;
     pIemCpu->uRexReg            = 0;
@@ -7348 +7356 @@
 
                         /* Get the index and scale it. */
-                        switch (((bSib & X86_SIB_INDEX_SHIFT) >> X86_SIB_INDEX_SMASK) | pIemCpu->uRexIndex)
+                        switch (((bSib >> X86_SIB_INDEX_SHIFT) & X86_SIB_INDEX_SMASK) | pIemCpu->uRexIndex)
                         {
                             case  0: u64EffAddr = pCtx->rax; break;
@@ -7540 +7548 @@
 #if 0 /* NT4SP1 - frstor [ecx] */
             || (pOrgCtx->cs.Sel == 8 && pOrgCtx->rip == 0x8013d11f)
+#endif
+#if 0 /* xxxxxx - All long mode code. */
+            || (pOrgCtx->msrEFER & MSR_K6_EFER_LMA)
 #endif
            )

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -605 +605 @@
             }
             case IEMMODE_32BIT:
-            case IEMMODE_64BIT:
                 rcStrict = iemMemStackPopU32(pIemCpu, &fEflNew);
                 if (rcStrict != VINF_SUCCESS)
                     return rcStrict;
                 break;
+            case IEMMODE_64BIT:
+            {
+                uint64_t u64Value;
+                rcStrict = iemMemStackPopU64(pIemCpu, &u64Value);
+                if (rcStrict != VINF_SUCCESS)
+                    return rcStrict;
+                fEflNew = u64Value;  /** @todo testcase: Check exactly what happens if high bits are set. */
+                break;
+            }
             IEM_NOT_REACHED_DEFAULT_CASE_RET();
         }
@@ -3256 +3264 @@
                 uint64_t NewEFER = pCtx->msrEFER;
                 if (uNewCrX & X86_CR0_PG)
-                    NewEFER |= MSR_K6_EFER_LME;
+                    NewEFER |= MSR_K6_EFER_LMA;
                 else
-                    NewEFER &= ~MSR_K6_EFER_LME;
+                    NewEFER &= ~MSR_K6_EFER_LMA;
 
                 if (!IEM_FULL_VERIFICATION_ENABLED(pIemCpu))
@@ -3806 +3814 @@
     uValue.s.Hi = pCtx->edx;
 
-    int rc = CPUMSetGuestMsr(IEMCPU_TO_VMCPU(pIemCpu), pCtx->ecx, uValue.u);
+    int rc;
+    if (!IEM_VERIFICATION_ENABLED(pIemCpu))
+        rc = CPUMSetGuestMsr(IEMCPU_TO_VMCPU(pIemCpu), pCtx->ecx, uValue.u);
+    else
+    {
+        CPUMCTX CtxTmp = *pCtx;
+        rc = CPUMSetGuestMsr(IEMCPU_TO_VMCPU(pIemCpu), pCtx->ecx, uValue.u);
+        PCPUMCTX pCtx2 = CPUMQueryGuestCtxPtr(IEMCPU_TO_VMCPU(pIemCpu));
+        *pCtx = *pCtx2;
+        *pCtx2 = CtxTmp;
+    }
     if (rc != VINF_SUCCESS)
     {