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

Timestamp:

Nov 22, 2021 6:31:11 PM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Tweaked iemFpuUpdateOpcodeAndIpWorker and iemFpuUpdateDP for long mode. Trouble with bs3-fpustat-1 on NEM/linux. bugref:9044

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (2 diffs)

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

@@ -7079 +7079 @@
         pFpuCtx->FPUIP = pVCpu->cpum.GstCtx.eip | ((uint32_t)pVCpu->cpum.GstCtx.cs.Sel << 4);
     }
-    else
+    else if (!IEM_IS_LONG_MODE(pVCpu))
     {
         pFpuCtx->CS    = pVCpu->cpum.GstCtx.cs.Sel;
         pFpuCtx->FPUIP = pVCpu->cpum.GstCtx.rip;
     }
+    else
+        *(uint64_t *)&pFpuCtx->FPUIP = pVCpu->cpum.GstCtx.rip;
 }
 
@@ -7116 +7118 @@
         pFpuCtx->FPUDP = (uint32_t)GCPtrEff + ((uint32_t)sel << 4);
     }
-    else
+    else if (!IEM_IS_LONG_MODE(pVCpu))
     {
         pFpuCtx->DS    = sel;
         pFpuCtx->FPUDP = GCPtrEff;
     }
+    else
+        *(uint64_t *)&pFpuCtx->FPUDP = GCPtrEff;
 }