Changeset 98827 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Mar 3, 2023 12:01:42 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156149

Message:

VMM/IEM: Implement adcx/adox instructions emulation, bugref:9898

File:

• trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -1049 +1049 @@
     CPUMISAEXTCFG   enmRdSeed;
     CPUMISAEXTCFG   enmSha;
+    CPUMISAEXTCFG   enmAdx;
     CPUMISAEXTCFG   enmCLFlushOpt;
     CPUMISAEXTCFG   enmFsGsBase;
@@ -1846 +1847 @@
                                //| RT_BIT(17) - reserved
                                | PASSTHRU_FEATURE_TODO(pConfig->enmRdSeed, X86_CPUID_STEXT_FEATURE_EBX_RDSEED)
-                               //| X86_CPUID_STEXT_FEATURE_EBX_ADX               RT_BIT(19)
+                               | PASSTHRU_FEATURE(pConfig->enmAdx, pHstFeat->fAdx, X86_CPUID_STEXT_FEATURE_EBX_ADX)
                                //| X86_CPUID_STEXT_FEATURE_EBX_SMAP              RT_BIT(20)
                                //| RT_BIT(21) - reserved
@@ -1889 +1890 @@
                     PORTABLE_DISABLE_FEATURE_BIT(    1, pCurLeaf->uEbx, AVX512F,    X86_CPUID_STEXT_FEATURE_EBX_AVX512F);
                     PORTABLE_DISABLE_FEATURE_BIT_CFG(1, pCurLeaf->uEbx, RDSEED,     X86_CPUID_STEXT_FEATURE_EBX_RDSEED, pConfig->enmRdSeed);
+                    PORTABLE_DISABLE_FEATURE_BIT_CFG(1, pCurLeaf->uEbx, ADX,        X86_CPUID_STEXT_FEATURE_EBX_ADX, pConfig->enmAdx);
                     PORTABLE_DISABLE_FEATURE_BIT_CFG(1, pCurLeaf->uEbx, CLFLUSHOPT, X86_CPUID_STEXT_FEATURE_EBX_RDSEED, pConfig->enmCLFlushOpt);
                     PORTABLE_DISABLE_FEATURE_BIT(    1, pCurLeaf->uEbx, AVX512PF,   X86_CPUID_STEXT_FEATURE_EBX_AVX512PF);
@@ -1912 +1914 @@
                 if (pConfig->enmRdSeed == CPUMISAEXTCFG_ENABLED_ALWAYS)
                     pCurLeaf->uEbx |= X86_CPUID_STEXT_FEATURE_EBX_RDSEED;
+                if (pConfig->enmAdx == CPUMISAEXTCFG_ENABLED_ALWAYS)
+                    pCurLeaf->uEbx |= X86_CPUID_STEXT_FEATURE_EBX_ADX;
                 if (pConfig->enmCLFlushOpt == CPUMISAEXTCFG_ENABLED_ALWAYS)
                     pCurLeaf->uEbx |= X86_CPUID_STEXT_FEATURE_EBX_CLFLUSHOPT;
@@ -2749 +2753 @@
                                   "|RDRAND"
                                   "|RDSEED"
+                                  "|ADX"
                                   "|CLFLUSHOPT"
                                   "|SHA"
@@ -2878 +2883 @@
      */
     rc = cpumR3CpuIdReadIsaExtCfg(pVM, pIsaExts, "RDSEED", &pConfig->enmRdSeed, fNestedPagingAndFullGuestExec);
+    AssertLogRelRCReturn(rc, rc);
+
+    /** @cfgm{/CPUM/IsaExts/ADX, isaextcfg, depends}
+     * Whether to expose the ADX instructions to the guest.  For the time being
+     * the default is to only do this for VMs with nested paging and AMD-V or
+     * unrestricted guest mode.
+     */
+    rc = cpumR3CpuIdReadIsaExtCfg(pVM, pIsaExts, "ADX", &pConfig->enmAdx, fNestedPagingAndFullGuestExec);
     AssertLogRelRCReturn(rc, rc);