Merge branch 'master' into fix-emulate-step

trailofbits · Oct 14, 2020 · fcbc2de · fcbc2de
2 parents 8d6134f + 2152023
commit fcbc2de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/manticore/native/cpu/x86.py b/manticore/native/cpu/x86.py
@@ -961,6 +961,10 @@ def CPUID(cpu):
                 0x0: (0x00000000, 0x00000000, 0x00000000, 0x00000000),
                 0x1: (0x00000000, 0x00000000, 0x00000000, 0x00000000),
             },
+            # CPUID with EAX=80000000h returns the highest supported extended function
+            # query in EAX. We don't currently support any other than 80000000h itself,
+            # so just return it back.
+            0x80000000: (0x80000000, 0x00000000, 0x00000000, 0x00000000),
         }
 
         if cpu.EAX not in conf:

diff --git a/manticore/wasm/structure.py b/manticore/wasm/structure.py
@@ -348,7 +348,7 @@ def load(cls, filename: str):
         :param filename: name of the WASM module
         :return: Module
         """
-        type_map = {-16: types.FunctionType, -4: F64, -3: F32, -2: I64, -1: I32}
+        type_map = {-16: FunctionType, -4: F64, -3: F32, -2: I64, -1: I32}
 
         m: Module = cls()
         with open(filename, "rb") as wasm_file:

diff --git a/tests/ethereum/test_general.py b/tests/ethereum/test_general.py
@@ -91,6 +91,9 @@ def test_propverif(self):
 
     def test_propverif_external(self) -> None:
         cli_version = subprocess.check_output(("manticore-verifier", "--version")).decode("utf-8")
+        cli_version = cli_version.split(
+            "Manticore is only supported on Linux. Proceed at your own risk!\n"
+        )[-1]
         py_version = f"Manticore {pkg_resources.get_distribution('manticore').version}\n"
         self.assertEqual(cli_version, py_version)