From f333e232e4261e55e4f9a4ee715d4f45e39464c3 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 4 Oct 2013 22:31:48 +0000 Subject: [PATCH] Fix guest_amd64_toIR xbegin and xtest to match cpuid given for AVX hwcaps. Otherwise valgrind none/tests/amd64/tm1.vgtest might fail on amd64-avx. git-svn-id: svn://svn.valgrind.org/vex/trunk@2782 --- VEX/priv/guest_amd64_toIR.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VEX/priv/guest_amd64_toIR.c b/VEX/priv/guest_amd64_toIR.c index a29e175182..c4210075ba 100644 --- a/VEX/priv/guest_amd64_toIR.c +++ b/VEX/priv/guest_amd64_toIR.c @@ -20067,7 +20067,7 @@ Long dis_ESC_NONE ( } /* BEGIN HACKY SUPPORT FOR xbegin */ if (modrm == 0xF8 && !have66orF2orF3(pfx) && sz == 4 - && (archinfo->hwcaps & VEX_HWCAPS_AMD64_AVX2)) { + && (archinfo->hwcaps & VEX_HWCAPS_AMD64_AVX)) { delta++; /* mod/rm byte */ d64 = getSDisp(4,delta); delta += 4; @@ -20725,7 +20725,7 @@ Long dis_ESC_0F ( } /* BEGIN HACKY SUPPORT FOR xtest */ /* 0F 01 D6 = XTEST */ - if (modrm == 0xD6 && (archinfo->hwcaps & VEX_HWCAPS_AMD64_AVX2)) { + if (modrm == 0xD6 && (archinfo->hwcaps & VEX_HWCAPS_AMD64_AVX)) { /* Sets ZF because there never is a transaction, and all CF, OF, SF, PF and AF are always cleared by xtest. */ delta += 1; -- 2.47.2