Rework WASM Imports and Fix Typos (#1666)

* Cleanup: add missing space in a description string

* Cleanup: ignore a derived example file

* Cleanup: sort WASM type import lists

examples/linux/.gitignore

@@ -3,6 +3,7 @@ basic
 crackme
 crackme.c
 fclose
+fileio
 helloworld
 ibranch
 indexhell

manticore/utils/helpers.py

@@ -15,7 +15,7 @@
 consts.add(
     "compress_states",
     default=True,
-    description="Seamlessly compress state files on disk. Reduces space usage and improves performance on slow disks,"
+    description="Seamlessly compress state files on disk. Reduces space usage and improves performance on slow disks, "
     "at the cost of some slight [de]compression overhead.",
 )
 

manticore/wasm/executor.py

@@ -1,25 +1,25 @@
 import struct
 from ctypes import c_int32
 from .types import (
-    I32,
-    I64,
+    ConcretizeStack,
+    CurGrowMemImm,
     F32,
+    F32ConstImm,
     F64,
-    Value_t,
-    UnreachableInstructionTrap,
-    ConcretizeStack,
-    ZeroDivisionTrap,
-    OverflowDivisionTrap,
-    InvalidConversionTrap,
-    OutOfBoundsMemoryTrap,
+    F64ConstImm,
+    GlobalVarXsImm,
+    I32,
     I32ConstImm,
+    I64,
     I64ConstImm,
-    F32ConstImm,
-    F64ConstImm,
+    InvalidConversionTrap,
     LocalVarXsImm,
-    GlobalVarXsImm,
     MemoryImm,
-    CurGrowMemImm,
+    OutOfBoundsMemoryTrap,
+    OverflowDivisionTrap,
+    UnreachableInstructionTrap,
+    Value_t,
+    ZeroDivisionTrap,
 )
 from ..core.smtlib import Operators, BitVec, issymbolic
 from ..utils.event import Eventful

manticore/wasm/structure.py

@@ -7,41 +7,41 @@
 from collections import deque
 from math import ceil
 from .types import (
-    U32,
-    I32,
-    I64,
+    BranchImm,
+    BranchTableImm,
+    CallImm,
+    CallIndirectImm,
+    ConcretizeStack,
+    convert_instructions,
+    debug,
     F32,
     F64,
-    Value,
-    Value_t,
-    ValType,
-    FunctionType,
-    Name,
-    TypeIdx,
     FuncIdx,
-    TableIdx,
-    MemIdx,
+    FunctionType,
     GlobalIdx,
-    WASMExpression,
-    Instruction,
-    TableType,
-    MemoryType,
     GlobalType,
+    I32,
+    I64,
+    Instruction,
     LimitType,
-    convert_instructions,
-    debug,
-    Trap,
-    ZeroDivisionTrap,
-    OverflowDivisionTrap,
+    MemIdx,
+    MemoryType,
+    MissingExportException,
+    Name,
     NonExistentFunctionCallTrap,
-    TypeMismatchTrap,
     OutOfBoundsMemoryTrap,
-    MissingExportException,
-    ConcretizeStack,
-    BranchImm,
-    BranchTableImm,
-    CallImm,
-    CallIndirectImm,
+    OverflowDivisionTrap,
+    TableIdx,
+    TableType,
+    Trap,
+    TypeIdx,
+    TypeMismatchTrap,
+    U32,
+    ValType,
+    Value,
+    Value_t,
+    WASMExpression,
+    ZeroDivisionTrap,
 )
 from .state import State
 from ..core.smtlib import BitVec, Bool, issymbolic, Operators, Expression