Merge pull request #64 from sgraham/fix-win32-warnings
Fix a couple warnings when building on win32
diff --git a/m4/cython.m4 b/m4/cython.m4
index ba6b3ca..e56bfba 100644
--- a/m4/cython.m4
+++ b/m4/cython.m4
@@ -2,13 +2,14 @@
dnl be set before this function is called.
dnl CYTHON_CHECK_VERSION([MIN-VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE])
AC_DEFUN([CYTHON_CHECK_VERSION],
- [prog="import sys
+ [prog="import re, sys
from Cython.Compiler.Version import version
def get_int(arg):
- try:
- return int(arg)
- except ValueError:
+ matched = re.match(r'\d+', arg)
+ if matched is None:
return 0
+ else:
+ return int(matched.group(0))
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
ver = map(get_int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [[0, 0, 0]]
diff --git a/modules/arch/x86/gen_x86_insn.py b/modules/arch/x86/gen_x86_insn.py
index 6b7a333..7524d78 100755
--- a/modules/arch/x86/gen_x86_insn.py
+++ b/modules/arch/x86/gen_x86_insn.py
@@ -7677,7 +7677,7 @@
add_insn("vphaddubq", "vphaddsub", modifiers=[0xD3])
add_insn("vphadduwd", "vphaddsub", modifiers=[0xD6])
add_insn("vphadduwq", "vphaddsub", modifiers=[0xD7])
-add_insn("vphaddudq", "vphaddsub", modifiers=[0xD8])
+add_insn("vphaddudq", "vphaddsub", modifiers=[0xDB])
add_insn("vphsubbw", "vphaddsub", modifiers=[0xE1])
add_insn("vphsubwd", "vphaddsub", modifiers=[0xE2])
@@ -8120,7 +8120,7 @@
add_insn("pfsubr", "now3d", modifiers=[0xAA])
add_insn("pi2fd", "now3d", modifiers=[0x0D])
add_insn("pi2fw", "now3d", modifiers=[0x0C], cpu=["Athlon", "3DNow"])
-add_insn("pmulhrwa", "now3d", modifiers=[0xB7])
+add_insn("pmulhrw", "now3d", modifiers=[0xB7])
add_insn("pswapd", "now3d", modifiers=[0xBB], cpu=["Athlon", "3DNow"])
#####################################################################
diff --git a/modules/arch/x86/tests/xop-all.hex b/modules/arch/x86/tests/xop-all.hex
index 1d03cbe..ee9fd7f 100644
--- a/modules/arch/x86/tests/xop-all.hex
+++ b/modules/arch/x86/tests/xop-all.hex
@@ -500,19 +500,19 @@
8f
e9
78
-d8
+db
ca
8f
e9
78
-d8
+db
0e
00
00
8f
e9
78
-d8
+db
0e
00
00
