|
From: <sv...@va...> - 2013-10-04 22:31:59
|
Author: mjw
Date: Fri Oct 4 22:31:48 2013
New Revision: 2782
Log:
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.
Modified:
trunk/priv/guest_amd64_toIR.c
Modified: trunk/priv/guest_amd64_toIR.c
==============================================================================
--- trunk/priv/guest_amd64_toIR.c (original)
+++ trunk/priv/guest_amd64_toIR.c Fri Oct 4 22:31:48 2013
@@ -20067,7 +20067,7 @@
}
/* 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 @@
}
/* 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;
|