Changeset 99332 in vbox

Timestamp:

Apr 7, 2023 12:29:10 AM (22 months ago)

Author:

vboxsync

Message:

VMM/IEM: Use IEMOP_HLP_DONE_DECODING_*EX() rather than IEM_MC_MAYBE_RAISE_FSGSBASE_XCPT and firends to do the CPUID check. bugref:10369

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstructionsTwoByte0f.cpp.h (modified) (4 diffs)
• include/IEMMc.h (modified) (1 diff)

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

@@ -9910 +9910 @@
 {
     IEMOP_MNEMONIC(rdfsbase, "rdfsbase Ry");
-    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX_EX(fFsGsBase);
     if (pVCpu->iem.s.enmEffOpSize == IEMMODE_64BIT)
     {
@@ -9938 +9938 @@
 {
     IEMOP_MNEMONIC(rdgsbase, "rdgsbase Ry");
-    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX_EX(fFsGsBase);
     if (pVCpu->iem.s.enmEffOpSize == IEMMODE_64BIT)
     {
@@ -9966 +9966 @@
 {
     IEMOP_MNEMONIC(wrfsbase, "wrfsbase Ry");
-    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX_EX(fFsGsBase);
     if (pVCpu->iem.s.enmEffOpSize == IEMMODE_64BIT)
     {
@@ -9995 +9995 @@
 {
     IEMOP_MNEMONIC(wrgsbase, "wrgsbase Ry");
-    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX_EX(fFsGsBase);
     if (pVCpu->iem.s.enmEffOpSize == IEMMODE_64BIT)
     {

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

@@ -191 +191 @@
     do { \
         if (   pVCpu->iem.s.enmCpuMode != IEMMODE_64BIT \
-            || !IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fFsGsBase \
             || !(pVCpu->cpum.GstCtx.cr4 & X86_CR4_FSGSBASE)) \
             return iemRaiseUndefinedOpcode(pVCpu); \