Changeset 99355 in vbox

Timestamp:

Apr 8, 2023 12:40:56 AM (20 months ago)

Author:

vboxsync

Message:

VMM/IEM: Mojo improvments for IEM_MC_MAYBE_RAISE_FSGSBASE_XCPT. bugref:10369

File:

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

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

@@ -152 +152 @@
 #define IEM_MC_MAYBE_RAISE_FSGSBASE_XCPT() \
     do { \
-        if (RT_LIKELY(   pVCpu->iem.s.enmCpuMode == IEMMODE_64BIT \
-                      && (pVCpu->cpum.GstCtx.cr4 & X86_CR4_FSGSBASE))) \
+        if (RT_LIKELY(   ((pVCpu->cpum.GstCtx.cr4 & X86_CR4_FSGSBASE) | pVCpu->iem.s.enmCpuMode) \
+                      == (X86_CR4_FSGSBASE | IEMMODE_64BIT))) \
         { /* probable */ } \
         else return iemRaiseUndefinedOpcode(pVCpu); \
     } while (0)
+AssertCompile(X86_CR4_FSGSBASE > UINT8_MAX);
 #define IEM_MC_MAYBE_RAISE_NON_CANONICAL_ADDR_GP0(a_u64Addr) \
     do { \