Changeset 100089 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jun 7, 2023 1:39:11 AM (20 months ago)

Author:

vboxsync

Message:

VMM/IEM: Reworking the variations generated by the python script to match part of the fExec mode better. bugref:10369

File:

• trunk/src/VBox/VMM/include/IEMInline.h (modified) (4 diffs)

trunk/src/VBox/VMM/include/IEMInline.h

@@ -1982 +1982 @@
 
 /**
- * Updates the EIP/IP to point to the next instruction - only for 32-bit and
- * 16-bit code.
- *
- * @param   pVCpu               The cross context virtual CPU structure of the calling thread.
- * @param   cbInstr             The number of bytes to add.
- */
-DECL_FORCE_INLINE(void) iemRegAddToEip32(PVMCPUCC pVCpu, uint8_t cbInstr) RT_NOEXCEPT
-{
-    /* See comment in iemRegAddToRip. */
-    uint32_t const uEipPrev = pVCpu->cpum.GstCtx.eip;
-    uint32_t const uEipNext = uEipPrev + cbInstr;
-    if (IEM_GET_TARGET_CPU(pVCpu) >= IEMTARGETCPU_386)
-        pVCpu->cpum.GstCtx.rip = (uint32_t)uEipNext;
-    else
-        pVCpu->cpum.GstCtx.rip = (uint16_t)uEipNext;
-}
-
-
-/**
  * Called by iemRegAddToRipAndFinishingClearingRF and others when any of the
  * following EFLAGS bits are set:
@@ -2112 +2093 @@
  * and CPUMCTX_INHIBIT_SHADOW.
  *
- * Only called from 64-code code.
+ * Only called from 64-bit code.
  *
  * @param   pVCpu               The cross context virtual CPU structure of the calling thread.
@@ -2128 +2109 @@
  * CPUMCTX_INHIBIT_SHADOW.
  *
- * This is never from 64-code code.
+ * This is never from 64-bit code.
  *
  * @param   pVCpu               The cross context virtual CPU structure of the calling thread.
@@ -2135 +2116 @@
 DECL_FORCE_INLINE(VBOXSTRICTRC) iemRegAddToEip32AndFinishingClearingRF(PVMCPUCC pVCpu, uint8_t cbInstr) RT_NOEXCEPT
 {
-    iemRegAddToEip32(pVCpu, cbInstr);
+    pVCpu->cpum.GstCtx.rip = (uint32_t)(pVCpu->cpum.GstCtx.eip + cbInstr);
+    return iemRegFinishClearingRF(pVCpu);
+}
+
+
+/**
+ * Updates the IP to point to the next instruction and clears EFLAGS.RF and
+ * CPUMCTX_INHIBIT_SHADOW.
+ *
+ * This is only ever used from 16-bit code on a pre-386 CPU.
+ *
+ * @param   pVCpu               The cross context virtual CPU structure of the calling thread.
+ * @param   cbInstr             The number of bytes to add.
+ */
+DECL_FORCE_INLINE(VBOXSTRICTRC) iemRegAddToIp16AndFinishingClearingRF(PVMCPUCC pVCpu, uint8_t cbInstr) RT_NOEXCEPT
+{
+    pVCpu->cpum.GstCtx.rip = (uint16_t)(pVCpu->cpum.GstCtx.ip + cbInstr);
     return iemRegFinishClearingRF(pVCpu);
 }