From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Mon, 17 Apr 2023 20:57:39 +0000 (+0200)
Subject: Forgot to add the modified file for 374596
X-Git-Tag: VALGRIND_3_21_0~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54982ab5c5325a02304eccb0e16a51ad6ef9a0e3;p=thirdparty%2Fvalgrind.git

Forgot to add the modified file for 374596
---

diff --git a/VEX/priv/guest_amd64_toIR.c b/VEX/priv/guest_amd64_toIR.c
index f7c3d34ce7..bb1563dc41 100644
--- a/VEX/priv/guest_amd64_toIR.c
+++ b/VEX/priv/guest_amd64_toIR.c
@@ -22061,9 +22061,15 @@ Long dis_ESC_0F (
          /* This is a Core-i5-2300-like machine */
       }
       else if ((archinfo->hwcaps & VEX_HWCAPS_AMD64_SSSE3) &&
-               (archinfo->hwcaps & VEX_HWCAPS_AMD64_CX16)) {
+               (archinfo->hwcaps & VEX_HWCAPS_AMD64_CX16) &&
+               (archinfo->hwcaps & VEX_HWCAPS_AMD64_RDTSCP)) {
          fName = "amd64g_dirtyhelper_CPUID_sse42_and_cx16";
          fAddr = &amd64g_dirtyhelper_CPUID_sse42_and_cx16;
+      }
+      else if ((archinfo->hwcaps & VEX_HWCAPS_AMD64_SSSE3) &&
+               (archinfo->hwcaps & VEX_HWCAPS_AMD64_CX16)) {
+         fName = "amd64g_dirtyhelper_CPUID_sse3_and_cx16";
+         fAddr = &amd64g_dirtyhelper_CPUID_sse3_and_cx16;
          /* This is a Core-i5-670-like machine */
       }
       else {