Changeset 49719 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Nov 29, 2013 10:58:29 AM (11 years ago)

Author:

vboxsync

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

91011

Message:

HMSVM: Do not fall back on FERR emulation (see #6117).

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -5012 +5012 @@
     if (!(pCtx->cr0 & X86_CR0_NE))
     {
-        /* Old-style FPU error reporting needs some extra work. */
-        /** @todo don't fall back to the recompiler, but do it manually. */
-        return VERR_EM_INTERPRETER;
+        PVM         pVM  = pVCpu->CTX_SUFF(pVM);
+        PDISSTATE   pDis = &pVCpu->hm.s.DisState;
+        unsigned    cbOp;
+        int rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, &cbOp);
+        if (RT_SUCCESS(rc))
+        {
+            /* Convert a #MF into a FERR -> IRQ 13. */
+            rc = PDMIsaSetIrq(pVCpu->CTX_SUFF(pVM), 13, 1, 0 /*uTagSrc*/);
+            if (RT_SUCCESS(rc))
+                pCtx->rip += cbOp;
+        }
+        else
+            Log4(("hmR0SvmExitXcptMF: EMInterpretDisasCurrent returned %Rrc uOpCode=%#x\n", rc, pDis->pCurInstr->uOpcode));
+        return rc;
     }