Changeset 61066 in vbox

Timestamp:

May 20, 2016 12:09:38 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107333

Message:

CPUMIsGuestFPUStateActive: Fixed 64-on-32 regression from r107325, need to include CPUM_SYNC_FPU_STATE in the 'active' term.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (1 diff)
• include/VBox/vmm/em.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -1366 +1366 @@
 VMMDECL(bool)           CPUMIsHostUsingSysCall(PVM pVM);
 VMMDECL(bool)           CPUMIsGuestFPUStateActive(PVMCPU pVCpu);
+VMMDECL(bool)           CPUMIsGuestFPUStateLoaded(PVMCPU pVCpu);
 VMMDECL(bool)           CPUMIsHostFPUStateSaved(PVMCPU pVCpu);
 VMMDECL(bool)           CPUMIsGuestDebugStateActive(PVMCPU pVCpu);

trunk/include/VBox/vmm/em.h

@@ -179 +179 @@
 VMM_INT_DECL(VBOXSTRICTRC)      EMInterpretInstructionEx(PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbWritten);
 VMM_INT_DECL(VBOXSTRICTRC)      EMInterpretInstructionDisasState(PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pCoreCtx,
-                                                                 RTGCPTR pvFault, EMCODETYPE enmCodeType);
+                                                                 RTGCPTR pvFault, EMCODETYPE enmCodeType, int iCaller);
 
 #ifdef IN_RC

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

@@ -2632 +2632 @@
  * Checks if we activated the FPU/XMM state of the guest OS.
  *
- * @returns true if we did.
- * @returns false if not.
+ * This differs from CPUMIsGuestFPUStateLoaded() in that it refers to the next
+ * time we'll be executing guest code, so it may return true for 64-on-32 when
+ * we still haven't actually loaded the FPU status, just scheduled it to be
+ * loaded the next time we go thru the world switcher (CPUM_SYNC_FPU_STATE).
+ *
+ * @returns true / false.
  * @param   pVCpu   The cross context virtual CPU structure.
  */
 VMMDECL(bool) CPUMIsGuestFPUStateActive(PVMCPU pVCpu)
+{
+    return RT_BOOL(pVCpu->cpum.s.fUseFlags & (CPUM_USED_FPU_GUEST | CPUM_SYNC_FPU_STATE));
+}
+
+
+/**
+ * Checks if we've really loaded the FPU/XMM state of the guest OS.
+ *
+ * @returns true / false.
+ * @param   pVCpu   The cross context virtual CPU structure.
+ */
+VMMDECL(bool) CPUMIsGuestFPUStateLoaded(PVMCPU pVCpu)
 {
     return RT_BOOL(pVCpu->cpum.s.fUseFlags & CPUM_USED_FPU_GUEST);