|
From: Paul F. <pa...@so...> - 2023-04-17 20:58:28
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=54982ab5c5325a02304eccb0e16a51ad6ef9a0e3 commit 54982ab5c5325a02304eccb0e16a51ad6ef9a0e3 Author: Paul Floyd <pj...@wa...> Date: Mon Apr 17 22:57:39 2023 +0200 Forgot to add the modified file for 374596 Diff: --- VEX/priv/guest_amd64_toIR.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 { |