Changeset 47319 in vbox

Timestamp:

Jul 22, 2013 4:53:15 PM (11 years ago)

Author:

vboxsync

Message:

IEM: More 64-bit fixes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IEMAllAImpl.asm (modified) (1 diff)
• IEMAllCImpl.cpp.h (modified) (4 diffs)

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

@@ -2466 +2466 @@
     if (RT_UNLIKELY(rcStrict != VINF_SUCCESS))
         return rcStrict;
-    Log(("iemiemRaiseXcptOrIntInLongMode: vec=%#x P=%u DPL=%u DT=%u:%u IST=%u %04x:%08x%04x%04x\n",
+    Log(("iemRaiseXcptOrIntInLongMode: vec=%#x P=%u DPL=%u DT=%u:%u IST=%u %04x:%08x%04x%04x\n",
          u8Vector, Idte.Gate.u1Present, Idte.Gate.u2Dpl, Idte.Gate.u1DescType, Idte.Gate.u4Type,
          Idte.Gate.u3IST, Idte.Gate.u16Sel, Idte.Gate.u32OffsetTop, Idte.Gate.u16OffsetHigh, Idte.Gate.u16OffsetLow));

trunk/src/VBox/VMM/VMMAll/IEMAllAImpl.asm

@@ -883 +883 @@
         PROLOGUE_4_ARGS
         IEM_MAYBE_LOAD_FLAGS A3, (X86_EFL_ZF | X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_SF | X86_EFL_OF), 0 ; clobbers T0 (eax)
-        mov     ax, [A1]
+        mov     rax, [A1]
         %1 cmpxchg [A0], A2
-        mov     [A1], ax
+        mov     [A1], rax
         IEM_SAVE_FLAGS       A3, (X86_EFL_ZF | X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_SF | X86_EFL_OF), 0 ; clobbers T0+T1 (eax, r11/edi)
         EPILOGUE_4_ARGS

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

@@ -1851 +1851 @@
     /* Calculate the intermediate RSP from RBP and the stack attributes. */
     RTUINT64U       NewRsp;
-    if (pCtx->ss.Attr.n.u1Long)
+    if (pCtx->ss.Attr.n.u1Long || pCtx->ss.Attr.n.u1Unusable)
         NewRsp.u = pCtx->rbp;
     else if (pCtx->ss.Attr.n.u1DefBig)
@@ -2488 +2488 @@
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
+    Log2(("iretq stack: cs:rip=%04x:%016RX16 rflags=%016RX16 ss:rsp=%04x:%016RX16\n",
+          uNewCs, uNewRip, uNewFlags, uNewSs, uNewRsp));
 
     /*
@@ -2663 +2665 @@
         pCtx->ss.u32Limit   = UINT32_MAX;
         pCtx->ss.u64Base    = 0;
+        Log2(("iretq new SS: NULL\n"));
     }
     else
@@ -2670 +2673 @@
         pCtx->ss.u32Limit   = cbLimitSs;
         pCtx->ss.u64Base    = X86DESC_BASE(&DescSS.Legacy);
+        Log2(("iretq new SS: base=%#RX64 lim=%#x attr=%#x\n", pCtx->ss.u64Base, pCtx->ss.u32Limit, pCtx->ss.Attr.u));
     }