Changeset 97615 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2022 11:54:13 PM (2 years ago)

Author:

vboxsync

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

154659

Message:

VMM/IEM: Single stepping of far return. bugref:9898

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp (modified) (3 diffs)

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

@@ -2300 +2300 @@
         pVCpu->cpum.GstCtx.cs.fFlags     = CPUMSELREG_FLAGS_VALID;
         pVCpu->cpum.GstCtx.cs.u64Base    = (uint32_t)uNewCs << 4;
-        pVCpu->cpum.GstCtx.eflags.Bits.u1RF = 0;
         if (cbPop)
             iemRegAddToRsp(pVCpu, cbPop);
-        return VINF_SUCCESS;
+        return iemRegFinishClearingRF(pVCpu);
     }
 
@@ -2563 +2562 @@
         if (cbPop)
             iemRegAddToRsp(pVCpu, cbPop);
-        pVCpu->cpum.GstCtx.eflags.Bits.u1RF = 0;
-
-        /* Done! */
     }
     /*
@@ -2633 +2629 @@
         if (cbPop)
             iemRegAddToRsp(pVCpu, cbPop);
-        pVCpu->cpum.GstCtx.eflags.Bits.u1RF = 0;
     }
 
     /* Flush the prefetch buffer. */
     IEM_FLUSH_PREFETCH_HEAVY(pVCpu, cbInstr); /** @todo use light flush for same privlege? */
-    return VINF_SUCCESS;
+
+    return iemRegFinishClearingRF(pVCpu);
 }