Changeset 102698 in vbox for trunk/src

Timestamp:

Dec 25, 2023 10:09:59 PM (13 months ago)

Author:

vboxsync

Message:

VMM/IEM: Added missing xSP clobbering annoation for return instructions. bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllInstOneByte.cpp.h (modified) (5 diffs)

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

@@ -8300 +8300 @@
     {
         case IEMMODE_16BIT:
-            IEM_MC_DEFER_TO_CIMPL_1_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK, 0, iemCImpl_retn_iw_16, u16Imm);
+            IEM_MC_DEFER_TO_CIMPL_1_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK,
+                                        RT_BIT_64(kIemNativeGstReg_GprFirst + X86_GREG_xSP), iemCImpl_retn_iw_16, u16Imm);
         case IEMMODE_32BIT:
-            IEM_MC_DEFER_TO_CIMPL_1_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK, 0, iemCImpl_retn_iw_32, u16Imm);
+            IEM_MC_DEFER_TO_CIMPL_1_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK,
+                                        RT_BIT_64(kIemNativeGstReg_GprFirst + X86_GREG_xSP), iemCImpl_retn_iw_32, u16Imm);
         case IEMMODE_64BIT:
-            IEM_MC_DEFER_TO_CIMPL_1_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK, 0, iemCImpl_retn_iw_64, u16Imm);
+            IEM_MC_DEFER_TO_CIMPL_1_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK,
+                                        RT_BIT_64(kIemNativeGstReg_GprFirst + X86_GREG_xSP), iemCImpl_retn_iw_64, u16Imm);
         IEM_NOT_REACHED_DEFAULT_CASE_RET();
     }
@@ -8321 +8324 @@
     {
         case IEMMODE_16BIT:
-            IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK, 0, iemCImpl_retn_16);
+            IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK,
+                                        RT_BIT_64(kIemNativeGstReg_GprFirst + X86_GREG_xSP), iemCImpl_retn_16);
         case IEMMODE_32BIT:
-            IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK, 0, iemCImpl_retn_32);
+            IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK,
+                                        RT_BIT_64(kIemNativeGstReg_GprFirst + X86_GREG_xSP), iemCImpl_retn_32);
         case IEMMODE_64BIT:
-            IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK, 0, iemCImpl_retn_64);
+            IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_STACK,
+                                        RT_BIT_64(kIemNativeGstReg_GprFirst + X86_GREG_xSP), iemCImpl_retn_64);
         IEM_NOT_REACHED_DEFAULT_CASE_RET();
     }
@@ -8617 +8623 @@
     IEM_MC_DEFER_TO_CIMPL_2_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_FAR | IEM_CIMPL_F_BRANCH_STACK
                                 | IEM_CIMPL_F_MODE,
-                                  RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_DS)
+                                  RT_BIT_64(kIemNativeGstReg_GprFirst      + X86_GREG_xSP)
+                                | RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_DS)
                                 | RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_ES)
                                 | RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_FS)
@@ -8642 +8649 @@
     IEM_MC_DEFER_TO_CIMPL_2_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_FAR | IEM_CIMPL_F_BRANCH_STACK
                                 | IEM_CIMPL_F_MODE,
-                                  RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_DS)
+                                  RT_BIT_64(kIemNativeGstReg_GprFirst      + X86_GREG_xSP)
+                                | RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_DS)
                                 | RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_ES)
                                 | RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_FS)
@@ -8710 +8718 @@
     IEM_MC_DEFER_TO_CIMPL_1_RET(IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_FAR | IEM_CIMPL_F_BRANCH_STACK_FAR
                                 | IEM_CIMPL_F_MODE | IEM_CIMPL_F_RFLAGS | IEM_CIMPL_F_CHECK_IRQ_BEFORE | IEM_CIMPL_F_VMEXIT,
-                                  RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_DS)
+                                  RT_BIT_64(kIemNativeGstReg_GprFirst      + X86_GREG_xSP)
+                                | RT_BIT_64(kIemNativeGstReg_SegSelFirst   + X86_SREG_DS)
                                 | RT_BIT_64(kIemNativeGstReg_SegBaseFirst  + X86_SREG_DS)
                                 | RT_BIT_64(kIemNativeGstReg_SegLimitFirst + X86_SREG_DS)