vbox的更動 47548 路徑 trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

時間撮記:

2013-8-6 上午03:58:21 (11 年 以前)

作者:

vboxsync

訊息:

IEM: Bunch of fixes, mostly DOS related.

檔案:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (修改) (19 筆差異)

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

@@ -1031 +1031 @@
     /* Fetch the descriptor. */
     IEMSELDESC Desc;
-    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uSel);
+    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uSel, X86_XCPT_GP);
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
@@ -1208 +1208 @@
     /* Fetch the descriptor. */
     IEMSELDESC Desc;
-    rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uSel);
+    rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uSel, X86_XCPT_GP);
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
@@ -1434 +1434 @@
     /* Fetch the descriptor. */
     IEMSELDESC DescCs;
-    rcStrict = iemMemFetchSelDesc(pIemCpu, &DescCs, uNewCs);
+    rcStrict = iemMemFetchSelDesc(pIemCpu, &DescCs, uNewCs, X86_XCPT_GP);
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
@@ -1535 +1535 @@
         {
             /* Fetch the descriptor for the new stack segment. */
-            rcStrict = iemMemFetchSelDesc(pIemCpu, &DescSs, uNewOuterSs);
+            rcStrict = iemMemFetchSelDesc(pIemCpu, &DescSs, uNewOuterSs, X86_XCPT_GP);
             if (rcStrict != VINF_SUCCESS)
                 return rcStrict;
@@ -2012 +2012 @@
      * iret throws an exception if VME isn't enabled.
      */
-    if (   pCtx->eflags.Bits.u1VM
+    if (   Efl.Bits.u1VM
+        && Efl.Bits.u2IOPL != 3
         && !(pCtx->cr4 & X86_CR4_VME))
         return iemRaiseGeneralProtectionFault0(pIemCpu);
@@ -2033 +2034 @@
             return rcStrict;
         uNewEip    = uFrame.pu32[0];
+        if (uNewEip > UINT16_MAX)
+            return iemRaiseGeneralProtectionFault0(pIemCpu);
+
         uNewCs     = (uint16_t)uFrame.pu32[1];
         uNewFlags  = uFrame.pu32[2];
@@ -2137 +2141 @@
  * @param   uNewFlags       The new EFLAGS.
  * @param   uNewRsp         The RSP after the initial IRET frame.
+ *
+ * @note    This can only be a 32-bit iret du to the X86_EFL_VM position.
  */
 IEM_CIMPL_DEF_5(iemCImpl_iret_prot_v8086, PCPUMCTX, pCtx, uint32_t, uNewEip, uint16_t, uNewCs,
@@ -2179 +2185 @@
     pCtx->rip      = uNewEip;
     pCtx->rsp      = uNewEsp;
-    pCtx->rflags.u = uNewFlags;
+    uNewFlags &= X86_EFL_LIVE_MASK;
+    uNewFlags |= X86_EFL_RA1_MASK;
+    IEMMISC_SET_EFL(pIemCpu, pCtx, uNewFlags);
     pIemCpu->uCpl  = 3;
 
@@ -2269 +2277 @@
 
     IEMSELDESC DescCS;
-    rcStrict = iemMemFetchSelDesc(pIemCpu, &DescCS, uNewCs);
+    rcStrict = iemMemFetchSelDesc(pIemCpu, &DescCS, uNewCs, X86_XCPT_GP);
     if (rcStrict != VINF_SUCCESS)
     {
@@ -2345 +2353 @@
 
         IEMSELDESC DescSS;
-        rcStrict = iemMemFetchSelDesc(pIemCpu, &DescSS, uNewSS);
+        rcStrict = iemMemFetchSelDesc(pIemCpu, &DescSS, uNewSS, X86_XCPT_GP); /** @todo Correct exception? */
         if (rcStrict != VINF_SUCCESS)
         {
@@ -2431 +2439 @@
         pCtx->ss.u64Base    = X86DESC_BASE(&DescSS.Legacy);
 
-        uint32_t fEFlagsMask = X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF  | X86_EFL_SF
+        uint32_t fEFlagsMask = X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF | X86_EFL_SF
                              | X86_EFL_TF | X86_EFL_DF | X86_EFL_OF | X86_EFL_NT;
         if (enmEffOpSize != IEMMODE_16BIT)
@@ -2487 +2495 @@
         X86EFLAGS NewEfl;
         NewEfl.u = IEMMISC_GET_EFL(pIemCpu, pCtx);
-        uint32_t fEFlagsMask = X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF  | X86_EFL_SF
+        uint32_t fEFlagsMask = X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF | X86_EFL_SF
                              | X86_EFL_TF | X86_EFL_DF | X86_EFL_OF | X86_EFL_NT;
         if (enmEffOpSize != IEMMODE_16BIT)
@@ -2587 +2595 @@
 
     IEMSELDESC DescCS;
-    rcStrict = iemMemFetchSelDesc(pIemCpu, &DescCS, uNewCs);
+    rcStrict = iemMemFetchSelDesc(pIemCpu, &DescCS, uNewCs, X86_XCPT_GP);
     if (rcStrict != VINF_SUCCESS)
     {
@@ -2643 +2651 @@
     else
     {
-        rcStrict = iemMemFetchSelDesc(pIemCpu, &DescSS, uNewSs);
+        rcStrict = iemMemFetchSelDesc(pIemCpu, &DescSS, uNewSs, X86_XCPT_GP); /** @todo Correct exception? */
         if (rcStrict != VINF_SUCCESS)
         {
@@ -2761 +2769 @@
     }
 
-    uint32_t fEFlagsMask = X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF  | X86_EFL_SF
+    uint32_t fEFlagsMask = X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF | X86_EFL_SF
                          | X86_EFL_TF | X86_EFL_DF | X86_EFL_OF | X86_EFL_NT;
     if (enmEffOpSize != IEMMODE_16BIT)
@@ -2797 +2805 @@
      * Call a mode specific worker.
      */
-    if (   pIemCpu->enmCpuMode == IEMMODE_16BIT
-        && IEM_IS_REAL_OR_V86_MODE(pIemCpu))
+    if (IEM_IS_REAL_OR_V86_MODE(pIemCpu))
         return IEM_CIMPL_CALL_1(iemCImpl_iret_real_v8086, enmEffOpSize);
     if (IEM_IS_LONG_MODE(pIemCpu))
@@ -3088 +3095 @@
     /* Fetch the descriptor. */
     IEMSELDESC Desc;
-    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uSel);
+    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uSel, X86_XCPT_GP); /** @todo Correct exception? */
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
@@ -3489 +3496 @@
      */
     IEMSELDESC Desc;
-    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uNewLdt);
+    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uNewLdt, X86_XCPT_GP); /** @todo Correct exception? */
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
@@ -3586 +3593 @@
      */
     IEMSELDESC Desc;
-    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uNewTr);
+    VBOXSTRICTRC rcStrict = iemMemFetchSelDesc(pIemCpu, &Desc, uNewTr, X86_XCPT_GP); /** @todo Correct exception? */
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;