Changeset 94220 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 14, 2022 12:55:45 PM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Adjusted the RCL and RCR intel versions to match the 10980xe behaviour. bugref:9898

File:

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

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

@@ -2341 +2341 @@
 { \
     cShift &= a_cBitsWidth >= 32 ? a_cBitsWidth - 1 : 31; \
+    if (a_cBitsWidth < 32 && a_fIntelFlags) \
+        cShift %= a_cBitsWidth + 1; \
     if (cShift) \
     { \
-        if (a_cBitsWidth < 32) \
+        if (a_cBitsWidth < 32 && !a_fIntelFlags) \
             cShift %= a_cBitsWidth + 1; \
         a_uType const uDst    = *puDst; \
@@ -2365 +2367 @@
             fEfl |= ((uResult >> (a_cBitsWidth - 1)) ^ fOutCarry) << X86_EFL_OF_BIT; \
         else                /* Intel 10980XE: According to the first sub-shift: */ \
-            fEfl |= X86_EFL_GET_OF_ ## a_cBitsWidth(uDst ^ (uDst << 1) ); \
+            fEfl |= X86_EFL_GET_OF_ ## a_cBitsWidth(uDst ^ (uDst << 1)); \
         *pfEFlags = fEfl; \
     } \
@@ -2402 +2404 @@
 { \
     cShift &= a_cBitsWidth >= 32 ? a_cBitsWidth - 1 : 31; \
+    if (a_cBitsWidth < 32 && a_fIntelFlags) \
+        cShift %= a_cBitsWidth + 1; \
     if (cShift) \
     { \
-        if (a_cBitsWidth < 32) \
+        if (a_cBitsWidth < 32 && !a_fIntelFlags) \
             cShift %= a_cBitsWidth + 1; \
         a_uType const uDst    = *puDst; \