commit 75ba1300092d44f42971d3e09da93b5feca8392f
author florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Thu Jan 29 15:21:47 2015 +0000
committer florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Thu Jan 29 15:21:47 2015 +0000
tree bf6a9b512b676d8e4fc28e0d45e390d61e3cea91
parent d8a2bcb35f34b91f8e4596f115071cefcceb9b14

Fix hwcaps validity checking for x86.
Capabilities  x86-mmxext-sse1-sse2-sse3-lzcnt were rejected as invalid.


git-svn-id: svn://svn.valgrind.org/vex/trunk@3080 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/main_main.c

diff --git a/priv/main_main.c b/priv/main_main.c
index b607d14..71c8bf6 100644
--- a/priv/main_main.c
+++ b/priv/main_main.c
@@ -1570,8 +1570,9 @@
          for (i = 0; i < sizeof extras / sizeof extras[0]; ++i) {
             caps |= extras[i];
             if (caps == hwcaps) return;
+            /* For SSE2 or later LZCNT is optional */
             if ((caps & VEX_HWCAPS_X86_SSE2) != 0) {
-               if ((caps & VEX_HWCAPS_X86_LZCNT) != 0) return;
+               if ((caps | VEX_HWCAPS_X86_LZCNT) == hwcaps) return;
             }
          }
          invalid_hwcaps(arch, hwcaps, "Cannot handle capabilities\n");