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

Timestamp:

Jun 28, 2023 11:48:08 PM (19 months ago)

Author:

vboxsync

Message:

VMM/IEM: Fixed a problem with 'pop [rsp/esp]' that showed up in bs2-test-1 among other places. bugref:10369

File:

• trunk/src/VBox/VMM/include/IEMMc.h (modified) (1 diff)

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

@@ -1066 +1066 @@
 /** Calculate efficient address from R/M. */
 #ifndef IEM_WITH_SETJMP
-# define IEM_MC_CALC_RM_EFF_ADDR(a_GCPtrEff, bRm, cbImm) \
-    IEM_MC_RETURN_ON_FAILURE(iemOpHlpCalcRmEffAddr(pVCpu, (bRm), (cbImm), &(a_GCPtrEff)))
+# define IEM_MC_CALC_RM_EFF_ADDR(a_GCPtrEff, a_bRm, a_cbImmAndRspOffset) \
+    IEM_MC_RETURN_ON_FAILURE(iemOpHlpCalcRmEffAddr(pVCpu, (a_bRm), (a_cbImmAndRspOffset), &(a_GCPtrEff)))
 #else
-# define IEM_MC_CALC_RM_EFF_ADDR(a_GCPtrEff, bRm, cbImm) \
-    ((a_GCPtrEff) = iemOpHlpCalcRmEffAddrJmp(pVCpu, (bRm), (cbImm)))
+# define IEM_MC_CALC_RM_EFF_ADDR(a_GCPtrEff, a_bRm, a_cbImmAndRspOffset) \
+    ((a_GCPtrEff) = iemOpHlpCalcRmEffAddrJmp(pVCpu, (a_bRm), (a_cbImmAndRspOffset)))
 #endif