add reference types test to test suite

.gitignore

@@ -8,5 +8,3 @@ dist-newstyle/
 doc/
 setup-config
 wasm-*-docs.tar.gz
-cache
-packagedb

README.md

@@ -20,10 +20,9 @@
   * [ ] Text Representation pretty-printer
   * [ ] Command line tool for calling interpreter/compiler/validator
   * [ ] Codegen interface for type enforced generating valid WASM code
-  * [ ] Support for building if, loop, block
 
 ## Development
-Clone sources to directory and use `stack` for running tests:
+Clond sources to directory and use `stack` for running tests:
 ```
 stack build && stack test
 ```

src/Language/Wasm/Binary.hs

@@ -244,13 +244,7 @@ instance Serialize FuncType where
 
 instance Serialize ElemType where
     put FuncRef = putWord8 0x70
-    put ExternRef = putWord8 0x6F
+    get = byteGuard 0x70 >> return FuncRef
-    get = do
-        op <- getWord8
-        case op of
-            0x70 -> return FuncRef
-            0x69 -> return ExternRef
-            _ -> fail "unknown reference type"
 
 instance Serialize Limit where
     put (Limit min Nothing) = putWord8 0x00 >> putULEB128 min
@@ -326,12 +320,6 @@ instance Serialize Index where
     put (Index idx) = putULEB128 idx
     get = Index <$> getULEB128 32
 
-newtype Expr = Expr { unExpr :: Expression } deriving (Show, Eq)
-
-instance Serialize Expr where
-    put (Expr expr) = putExpression expr
-    get = Expr <$> getExpression
-
 instance Serialize MemArg where
     put MemArg { align, offset } = putULEB128 align >> putULEB128 offset
     get = do
@@ -365,50 +353,16 @@ instance Serialize (Instruction Natural) where
     put (BrTable labels label) = putWord8 0x0E >> putVec (map Index labels) >> putULEB128 label
     put Return = putWord8 0x0F
     put (Call funcIdx) = putWord8 0x10 >> putULEB128 funcIdx
-    put (CallIndirect tableIdx typeIdx) = putWord8 0x11 >> putULEB128 typeIdx >> putULEB128 tableIdx
+    put (CallIndirect typeIdx) = putWord8 0x11 >> putULEB128 typeIdx >> putWord8 0x00
-    -- Reference instructions
-    put (RefNull refType) = putWord8 0xD0 >> put refType
-    put RefIsNull = putWord8 0xD1
-    put (RefFunc index) = putWord8 0xD2 >> putULEB128 index
     -- Parametric instructions
     put Drop = putWord8 0x1A
-    put (Select Nothing) = putWord8 0x1B
+    put Select = putWord8 0x1B
-    put (Select (Just types)) = putWord8 0x1C >> putVec types
     -- Variable instructions
     put (GetLocal idx) = putWord8 0x20 >> putULEB128 idx
     put (SetLocal idx) = putWord8 0x21 >> putULEB128 idx
     put (TeeLocal idx) = putWord8 0x22 >> putULEB128 idx
     put (GetGlobal idx) = putWord8 0x23 >> putULEB128 idx
     put (SetGlobal idx) = putWord8 0x24 >> putULEB128 idx
-    -- Table instructions
-    put (TableGet idx) = putWord8 0x25 >> putULEB128 idx
-    put (TableSet idx) = putWord8 0x26 >> putULEB128 idx
-    put (TableInit tableIdx elemIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x0C :: Word32)
-        putULEB128 tableIdx
-        putULEB128 elemIdx
-    put (ElemDrop elemIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x0D :: Word32)
-        putULEB128 elemIdx
-    put (TableCopy fromIdx toIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x0E :: Word32)
-        putULEB128 fromIdx
-        putULEB128 toIdx
-    put (TableGrow tableIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x0F :: Word32)
-        putULEB128 tableIdx
-    put (TableSize tableIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x10 :: Word32)
-        putULEB128 tableIdx
-    put (TableFill tableIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x11 :: Word32)
-        putULEB128 tableIdx
     -- Memory instructions
     put (I32Load memArg) = putWord8 0x28 >> put memArg
     put (I64Load memArg) = putWord8 0x29 >> put memArg
@@ -433,26 +387,8 @@ instance Serialize (Instruction Natural) where
     put (I64Store8 memArg) = putWord8 0x3C >> put memArg
     put (I64Store16 memArg) = putWord8 0x3D >> put memArg
     put (I64Store32 memArg) = putWord8 0x3E >> put memArg
-    put MemorySize = putWord8 0x3F >> putWord8 0x00
+    put CurrentMemory = putWord8 0x3F >> putWord8 0x00
-    put MemoryGrow = putWord8 0x40 >> putWord8 0x00
+    put GrowMemory = putWord8 0x40 >> putWord8 0x00
-    put (MemoryInit dataIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x08 :: Word32)
-        putULEB128 dataIdx
-        putWord8 0
-    put (DataDrop dataIdx) = do
-        putWord8 0xFC
-        putULEB128 (0x09 :: Word32)
-        putULEB128 dataIdx
-    put MemoryCopy = do
-        putWord8 0xFC
-        putULEB128 (0x0A :: Word32)
-        putWord8 0
-        putWord8 0
-    put MemoryFill = do
-        putWord8 0xFC
-        putULEB128 (0x0B :: Word32)
-        putWord8 0
     -- Numeric instructions
     put (I32Const val) = putWord8 0x41 >> putSLEB128 (asInt32 val)
     put (I64Const val) = putWord8 0x42 >> putSLEB128 (asInt64 val)
@@ -617,15 +553,11 @@ instance Serialize (Instruction Natural) where
             0x10 -> Call <$> getULEB128 32
             0x11 -> do
                 typeIdx <- getULEB128 32
-                tableIdx <- getULEB128 32
+                byteGuard 0x00
-                return $ CallIndirect tableIdx typeIdx
+                return $ CallIndirect typeIdx
-            -- Reference instructions
-            0xD0 -> RefNull <$> get
-            0xD1 -> return RefIsNull
-            0xD2 -> RefFunc <$> getULEB128 32
             -- Parametric instructions
             0x1A -> return $ Drop
-            0x1B -> return $ Select Nothing
+            0x1B -> return $ Select
             -- Variable instructions
             0x20 -> GetLocal <$> getULEB128 32
             0x21 -> SetLocal <$> getULEB128 32
@@ -656,8 +588,8 @@ instance Serialize (Instruction Natural) where
             0x3C -> I64Store8 <$> get
             0x3D -> I64Store16 <$> get
             0x3E -> I64Store32 <$> get
-            0x3F -> byteGuard 0x00 >> (return $ MemorySize)
+            0x3F -> byteGuard 0x00 >> (return $ CurrentMemory)
-            0x40 -> byteGuard 0x00 >> (return $ MemoryGrow)
+            0x40 -> byteGuard 0x00 >> (return $ GrowMemory)
             -- Numeric instructions
             0x41 -> I32Const <$> getSLEB128 32
             0x42 -> I64Const <$> getSLEB128 64
@@ -803,7 +735,7 @@ instance Serialize (Instruction Natural) where
                     0x06 -> return $ ITruncSatFS BS64 BS64
                     0x07 -> return $ ITruncSatFU BS64 BS64
                     _ -> fail "Unknown byte value after misc instruction byte"
-            byte -> fail $ "Unknown byte value in place of instruction opcode: " ++ (show byte)
+            _ -> fail "Unknown byte value in place of instruction opcode"
 
 putExpression :: Expression -> Put
 putExpression expr = do
@@ -861,56 +793,11 @@ instance Serialize Export where
     get = Export <$> getName <*> get
 
 instance Serialize ElemSegment where
-    put (ElemSegment elemType Passive elements) = do
+    put (ElemSegment tableIndex offset funcIndexes) = do
-        putWord8 0x05
-        put elemType
-        putVec $ map Expr elements
-    put (ElemSegment elemType (Active tableIndex offset) elements) = do
-        putWord8 0x06
         putULEB128 tableIndex
         putExpression offset
-        put elemType
+        putVec $ map Index funcIndexes
-        putVec $ map Expr elements
+    get = ElemSegment <$> getULEB128 32 <*> getExpression <*> (map unIndex <$> getVec)
-    put (ElemSegment elemType Declarative elements) = do
-        putWord8 0x07
-        put elemType
-        putVec $ map Expr elements
-
-    get = do
-        let funcIndexes = map ((:[]) . RefFunc . unIndex) <$> getVec
-        let elemKind = byteGuard 0x00 >> return FuncRef
-        op <- getULEB128 32
-        case (op :: Word8) of
-            0x00 -> do
-                offset <- getExpression
-                ElemSegment FuncRef (Active 0 offset) <$> funcIndexes
-            0x01 -> do
-                elemType <- elemKind
-                ElemSegment elemType Passive <$> funcIndexes
-            0x02 -> do
-                tableIndex <- getULEB128 32
-                offset <- getExpression
-                elemType <- elemKind
-                ElemSegment elemType (Active tableIndex offset) <$> funcIndexes
-            0x03 -> do
-                elemType <- elemKind
-                ElemSegment elemType Declarative <$> funcIndexes
-            0x04 -> do
-                offset <- getExpression
-                ElemSegment FuncRef (Active 0 offset) <$> funcIndexes
-            0x05 -> do
-                elemType <- get
-                ElemSegment elemType Passive . map unExpr <$> getVec
-            0x06 -> do
-                tableIndex <- getULEB128 32
-                offset <- getExpression
-                elemType <- get
-                ElemSegment elemType (Active tableIndex offset) <$> getVec
-            0x07 -> do
-                elemType <- get
-                ElemSegment elemType Declarative <$> getVec
-            _ ->
-                fail "unknown element segment type"
 
 data LocalTypeRange = LocalTypeRange Natural ValueType deriving (Show, Eq)
 
@@ -937,35 +824,17 @@ instance Serialize Function where
         return $ Function 0 locals body
 
 instance Serialize DataSegment where
-    put (DataSegment (ActiveData memIdx offset) init) = do
+    put (DataSegment memIdx offset init) = do
-        putWord8 0x02
         putULEB128 memIdx
         putExpression offset
         putULEB128 $ LBS.length init
         putLazyByteString init
-    put (DataSegment PassiveData init) = do
-        putWord8 0x01
-        putULEB128 $ LBS.length init
-        putLazyByteString init
     get = do
-        op <- getULEB128 32
+        memIdx <- getULEB128 32
-        case (op :: Word8) of
+        offset <- getExpression
-            0x00 -> do
+        len <- getULEB128 32
-                offset <- getExpression
+        init <- getLazyByteString len
-                len <- getULEB128 32
+        return $ DataSegment memIdx offset init
-                init <- getLazyByteString len
-                return $ DataSegment (ActiveData 0 offset) init
-            0x01 -> do
-                len <- getULEB128 32
-                init <- getLazyByteString len
-                return $ DataSegment PassiveData init 
-            0x02 -> do
-                memIdx <- getULEB128 32
-                offset <- getExpression
-                len <- getULEB128 32
-                init <- getLazyByteString len
-                return $ DataSegment (ActiveData memIdx offset) init
-            byte -> fail $ "unknown data segment type: " ++ show byte 
 
 instance Serialize Module where
     put mod = do

src/Language/Wasm/Builder.hs

@@ -197,7 +197,7 @@ select pred a b = select' (produce pred) (produce a) (produce b)
             a
             res <- b
             pred
-            appendExpr [Select Nothing]
+            appendExpr [Select]
             return res
 
 iBinOp :: (Producer a, Producer b, OutType a ~ OutType b, IsInt (OutType a) ~ True) => IBinOp -> a -> b -> GenFun (OutType a)
@@ -643,10 +643,10 @@ store32 addr val offset align = do
     appendExpr [I64Store32 $ MemArg (fromIntegral offset) (fromIntegral align)]
 
 memorySize :: GenFun (Proxy I32)
-memorySize = appendExpr [MemorySize] >> return Proxy
+memorySize = appendExpr [CurrentMemory] >> return Proxy
 
 growMemory :: (Producer size, OutType size ~ Proxy I32) => size -> GenFun ()
-growMemory size = produce size >> appendExpr [MemoryGrow]
+growMemory size = produce size >> appendExpr [GrowMemory]
 
 call :: (Returnable res) => Fn res -> [GenFun a] -> GenFun res
 call (Fn idx) args = sequence_ args >> appendExpr [Call idx] >> return returnableValue
@@ -655,7 +655,7 @@ callIndirect :: (Producer index, OutType index ~ Proxy I32, Returnable res) => T
 callIndirect (TypeDef idx) index args = do
     sequence_ args
     produce index
-    appendExpr [CallIndirect 0 idx]
+    appendExpr [CallIndirect idx]
     return returnableValue
 
 br :: Label t -> GenFun ()
@@ -975,7 +975,7 @@ table min max = do
 dataSegment :: (Producer offset, OutType offset ~ Proxy I32) => offset -> LBS.ByteString -> GenMod ()
 dataSegment offset bytes =
     modify $ \(st@GenModState { target = m }) -> st {
-        target = m { datas = datas m ++ [DataSegment (ActiveData 0 (genExpr 0 (produce offset))) bytes] }
+        target = m { datas = datas m ++ [DataSegment 0 (genExpr 0 (produce offset)) bytes] }
     }
 
 asWord32 :: Int32 -> Word32

src/Language/Wasm/Interpreter.hs

@@ -10,11 +10,8 @@ module Language.Wasm.Interpreter (
     ExternalValue(..),
     ExportInstance(..),
     GlobalInstance(..),
-    MemoryInstance(..),
-    MemoryStore,
     Imports,
     HostItem(..),
-    Address,
     instantiate,
     invoke,
     invokeExport,
@@ -23,8 +20,7 @@ module Language.Wasm.Interpreter (
     emptyImports,
     makeHostModule,
     makeMutGlobal,
-    makeConstGlobal, 
+    makeConstGlobal
-    getMemory
 ) where
 
 import qualified Data.Map as Map
@@ -34,8 +30,6 @@ import Data.Maybe (fromMaybe, isNothing)
 
 import Data.Vector (Vector, (!), (!?), (//))
 import qualified Data.Vector as Vector
-import Data.Vector.Mutable (IOVector)
-import qualified Data.Vector.Mutable as MVector
 import qualified Data.Primitive.ByteArray as ByteArray
 import qualified Data.Primitive.Types as Primitive
 import qualified Control.Monad.Primitive as Primitive
@@ -71,15 +65,11 @@ import Language.Wasm.FloatUtils (
         doubleToWord
     )
 
-import Debug.Trace as Debug
-
 data Value =
     VI32 Word32
     | VI64 Word64
     | VF32 Float
     | VF64 Double
-    | RF (Maybe Natural)
-    | RE (Maybe Natural)
     deriving (Eq, Show)
 
 asInt32 :: Word32 -> Int32
@@ -172,11 +162,9 @@ data Label = Label ResultType deriving (Show, Eq)
 
 type Address = Int
 
-type TableStore = IORef (IOVector (Maybe Address))
-
 data TableInstance = TableInstance {
-    t :: TableType,
+    lim :: Limit,
-    items :: TableStore
+    elements :: Vector (Maybe Address)
 }
 
 type MemoryStore = ByteArray.MutableByteArray (Primitive.PrimState IO)
@@ -199,8 +187,6 @@ getValueType (VI32 _) = I32
 getValueType (VI64 _) = I64
 getValueType (VF32 _) = F32
 getValueType (VF64 _) = F64
-getValueType (RF _) = Func
-genValueType (RE _) = Extern
 
 data ExportInstance = ExportInstance TL.Text ExternalValue deriving (Eq, Show)
 
@@ -222,30 +208,11 @@ data FunctionInstance =
         hostCode :: HostFunction
     }
 
-data ElemInstance = ElemInstance {
-        eiMode :: ElemMode,
-        eiType :: ElemType,
-        eiItems :: Vector Value,
-        isDropped :: IORef Bool
-    }
-
-isDeclarative :: ElemMode -> Bool 
-isDeclarative Declarative = True
-isDeclarative _           = False
-
-data DataInstance = DataInstance {
-        dMode :: DataMode,
-        isDropped :: IORef Bool,
-        bytes :: LBS.ByteString
-    }
-
 data Store = Store {
     funcInstances :: Vector FunctionInstance,
     tableInstances :: Vector TableInstance,
     memInstances :: Vector MemoryInstance,
-    globalInstances :: Vector GlobalInstance,
+    globalInstances :: Vector GlobalInstance
-    elemInstances :: Vector ElemInstance,
-    dataInstances :: Vector DataInstance
 }
 
 emptyStore :: Store
@@ -253,9 +220,7 @@ emptyStore = Store {
     funcInstances = Vector.empty,
     tableInstances = Vector.empty,
     memInstances = Vector.empty,
-    globalInstances = Vector.empty,
+    globalInstances = Vector.empty
-    elemInstances = Vector.empty,
-    dataInstances = Vector.empty
 }
 
 type HostFunction = [Value] -> IO [Value]
@@ -319,8 +284,8 @@ makeHostModule st items = do
         makeHostTables :: (Store, ModuleInstance) -> IO (Store, ModuleInstance)
         makeHostTables (st, inst) = do
             let tableLen = Vector.length $ tableInstances st
-            let (names, tables) = unzip [(name, Table (TableType lim FuncRef)) | (name, HostTable lim) <- items]
+            let (names, tables) = unzip [(name, Table (TableType lim FuncRef)) | (name, (HostTable lim)) <- items]
-            instances <- allocTables tables
+            let instances = allocTables tables
             let exps = Vector.fromList $ zipWith (\name i -> ExportInstance name (ExternTable i)) names [tableLen..]
             let inst' = inst {
                     tableaddrs = Vector.fromList [tableLen..tableLen + length instances - 1],
@@ -335,8 +300,6 @@ data ModuleInstance = ModuleInstance {
     tableaddrs :: Vector Address,
     memaddrs :: Vector Address,
     globaladdrs :: Vector Address,
-    elemaddrs :: Vector Address,
-    dataaddrs :: Vector Address,
     exports :: Vector ExportInstance
 } deriving (Eq, Show)
 
@@ -347,20 +310,15 @@ emptyModInstance = ModuleInstance {
     tableaddrs = Vector.empty,
     memaddrs = Vector.empty,
     globaladdrs = Vector.empty,
-    elemaddrs = Vector.empty,
-    dataaddrs = Vector.empty,
     exports = Vector.empty
 }
 
 calcInstance :: Store -> Imports -> Module -> Initialize ModuleInstance
-calcInstance (Store fs ts ms gs es ds) imps mod = do
+calcInstance (Store fs ts ms gs) imps Module {functions, types, tables, mems, globals, exports, imports} = do
-    let Module {functions, types, tables, mems, globals, exports, imports, elems, datas} = mod
     let funLen = length fs
     let tableLen = length ts
     let memLen = length ms
     let globalLen = length gs
-    let elemLen = length es
-    let dataLen = length ds
     funImps <- mapM checkImportType $ filter isFuncImport imports
     tableImps <- mapM checkImportType $ filter isTableImport imports
     memImps <- mapM checkImportType $ filter isMemImport imports
@@ -384,8 +342,6 @@ calcInstance (Store fs ts ms gs es ds) imps mod = do
         tableaddrs = tbls,
         memaddrs = memories,
         globaladdrs = globs,
-        elemaddrs = Vector.fromList [elemLen..elemLen + length elems - 1],
-        dataaddrs = Vector.fromList [dataLen..dataLen + length datas - 1],
         exports = Vector.fromList $ map refExport exports
     }
     where
@@ -401,7 +357,7 @@ calcInstance (Store fs ts ms gs es ds) imps mod = do
             funcAddr <- case idx of
                 ExternFunction funcAddr -> return funcAddr
                 other -> throwError "incompatible import type"
-            let expectedType = types mod !! fromIntegral typeIdx
+            let expectedType = types !! fromIntegral typeIdx
             let actualType = Language.Wasm.Interpreter.funcType $ fs ! funcAddr
             if expectedType == actualType
             then return idx
@@ -423,18 +379,17 @@ calcInstance (Store fs ts ms gs es ds) imps mod = do
             memAddr <- case idx of
                 ExternMemory memAddr -> return memAddr
                 _ -> throwError "incompatible import type"
-            let MemoryInstance { lim = Limit _ limMax, memory = mem } = ms ! memAddr
+            let MemoryInstance { lim } = ms ! memAddr
-            size <- liftIO $ (`quot` pageSize) <$> (readIORef mem >>= ByteArray.getSizeofMutableByteArray)
+            if limitMatch lim limit
-            if limitMatch (Limit (fromIntegral size) limMax) limit
             then return idx
             else throwError "incompatible import type"
-        checkImportType imp@(Import _ _ (ImportTable (TableType limit et))) = do
+        checkImportType imp@(Import _ _ (ImportTable (TableType limit _))) = do
             idx <- getImpIdx imp
             tableAddr <- case idx of
                 ExternTable tableAddr -> return tableAddr
                 _ -> throwError "incompatible import type"
-            let TableInstance { t = TableType lim et' } = ts ! tableAddr
+            let TableInstance { lim } = ts ! tableAddr
-            if limitMatch lim limit && et == et'
+            if limitMatch lim limit
             then return idx
             else throwError "incompatible import type"
     
@@ -467,9 +422,6 @@ evalConstExpr _ _ [I32Const v] = return $ VI32 v
 evalConstExpr _ _ [I64Const v] = return $ VI64 v
 evalConstExpr _ _ [F32Const v] = return $ VF32 v
 evalConstExpr _ _ [F64Const v] = return $ VF64 v
-evalConstExpr _ _ [RefNull FuncRef] = return $ RF Nothing
-evalConstExpr _ _ [RefNull ExternRef] = return $ RE Nothing
-evalConstExpr inst _ [RefFunc idx] = return $ RF $ Just $ fromIntegral $ funcaddrs inst ! fromIntegral idx
 evalConstExpr inst store [GetGlobal i] = getGlobalValue inst store i
 evalConstExpr _ _ instrs = error $ "Global initializer contains unsupported instructions: " ++ show instrs
 
@@ -487,13 +439,15 @@ allocAndInitGlobals inst store globs = Vector.fromList <$> mapM allocGlob globs
             val <- runIniter initer
             GIMut vt <$> newIORef val
 
-allocTables :: [Table] -> IO (Vector TableInstance)
+allocTables :: [Table] -> Vector TableInstance
-allocTables = fmap Vector.fromList . mapM allocTable
+allocTables tables = Vector.fromList $ map allocTable tables
     where
-        allocTable :: Table -> IO TableInstance
+        allocTable :: Table -> TableInstance
-        allocTable (Table t@(TableType lim@(Limit from to) _)) =
+        allocTable (Table (TableType lim@(Limit from to) _)) =
-            let elements = MVector.replicate (fromIntegral from) Nothing in
+            TableInstance {
-            TableInstance t <$> (elements >>= newIORef)
+                lim,
+                elements = Vector.fromList $ replicate (fromIntegral from) Nothing
+            }
 
 defaultBudget :: Natural
 defaultBudget = 300
@@ -515,108 +469,73 @@ allocMems mems = Vector.fromList <$> mapM allocMem mems
                 memory
             }
 
-allocElems :: ModuleInstance -> Store -> [ElemSegment] -> IO (Vector ElemInstance)
-allocElems inst st = fmap Vector.fromList . mapM allocElem
-    where
-        allocElem :: ElemSegment -> IO ElemInstance
-        allocElem (ElemSegment t mode refs) = do
-            indexes <- flip mapM refs $ \refExpr -> do
-                evalConstExpr inst st refExpr
-            ElemInstance mode t (Vector.fromList indexes)
-                <$> newIORef False -- is dropped
-
-allocDatas :: [DataSegment] -> IO (Vector DataInstance)
-allocDatas datas = Vector.fromList <$> Monad.forM datas (\DataSegment {dataMode, chunk} -> do
-    isDropped <- newIORef False
-    return $ DataInstance dataMode isDropped chunk)
-
 type Initialize = ExceptT String (State.StateT Store IO)
 
 initialize :: ModuleInstance -> Module -> Initialize ()
 initialize inst Module {elems, datas, start} = do
     checkedMems <- mapM checkData datas
-    checkedTables <- mapM checkElem $ filter isActiveElem $ zip [0..] elems
+    checkedTables <- mapM checkElem elems
     mapM_ initData checkedMems
     mapM_ initElem checkedTables
     st <- State.get
     case start of
         Just (StartFunction idx) -> do
             let funInst = funcInstances st ! (funcaddrs inst ! fromIntegral idx)
-            mainRes <- liftIO $ eval defaultBudget st inst funInst []
+            mainRes <- liftIO $ eval defaultBudget st funInst []
             case mainRes of
                 Just [] -> return ()
                 _ -> throwError "Start function terminated with trap"
         Nothing -> return ()
     where
-        isActiveElem :: (Int, ElemSegment) -> Bool
+        checkElem :: ElemSegment -> Initialize (Address, Int, [Address])
-        isActiveElem (_, ElemSegment _ (Active _ _) _) = True
+        checkElem ElemSegment {tableIndex, offset, funcIndexes} = do
-        isActiveElem _ = False
-
-        checkElem :: (Int, ElemSegment) -> Initialize (Address, Address, Int, [Maybe Address])
-        checkElem (elemN, ElemSegment {elemType, mode, elements}) = do
-            (tableIndex, offset) <- case mode of {
-                Active idx off -> return (idx, off);
-                _ -> throwError "only active mode element can be initialized"
-            }
             st <- State.get
             VI32 val <- liftIO $ evalConstExpr inst st offset
             let from = fromIntegral val
-            refs <- liftIO $ mapM (evalConstExpr inst st) elements
+            let funcs = map ((funcaddrs inst !) . fromIntegral) funcIndexes
-            let toStoreIndex ref = case ref of
-                    RF idx -> fromIntegral <$> idx
-                    RE idx -> fromIntegral <$> idx
-            let funcs = map toStoreIndex refs
             let idx = tableaddrs inst ! fromIntegral tableIndex
-            return (idx, elemaddrs inst ! elemN, from, funcs)
+            let last = from + length funcs
+            let TableInstance lim elems = tableInstances st ! idx
+            let len = Vector.length elems
+            Monad.when (last > len) $ throwError "elements segment does not fit"
+            return (idx, from, funcs)
 
-        initElem :: (Address, Address, Int, [Maybe Address]) -> Initialize ()
+        initElem :: (Address, Int, [Address]) -> Initialize ()
-        initElem (tableIdx, elemIdx, from, funcs) = do
+        initElem (idx, from, funcs) = State.modify $ \st ->
-            Store {tableInstances, elemInstances} <- State.get
+            let TableInstance lim elems = tableInstances st ! idx in
-            elems <- liftIO $ readIORef $ items $ tableInstances ! tableIdx
+            let table = TableInstance lim (elems // zip [from..] (map Just funcs)) in
-            if from + length funcs > MVector.length elems
+            st { tableInstances = tableInstances st Vector.// [(idx, table)] }
-            then throwError "out of bounds table access"
-            else do
-                let ElemInstance {isDropped} = elemInstances ! elemIdx
-                liftIO $ writeIORef isDropped True
-                Monad.forM_ (zip [from..] funcs) $ uncurry $ MVector.unsafeWrite elems
 
-        checkData :: DataSegment -> Initialize (Maybe (Int, MemoryStore, LBS.ByteString))
+        checkData :: DataSegment -> Initialize (Int, MemoryStore, LBS.ByteString)
-        checkData DataSegment {dataMode = ActiveData memIndex offset, chunk} = do
+        checkData DataSegment {memIndex, offset, chunk} = do
             st <- State.get
             VI32 val <- liftIO $ evalConstExpr inst st offset
             let from = fromIntegral val
             let idx = memaddrs inst ! fromIntegral memIndex
+            let last = from + (fromIntegral $ LBS.length chunk)
             let MemoryInstance _ memory = memInstances st ! idx
             mem <- liftIO $ readIORef memory
-            return $ Just (from, mem, chunk)
-        checkData DataSegment {dataMode = PassiveData, chunk} =
-            return Nothing
-        
-        initData :: Maybe (Int, MemoryStore, LBS.ByteString) -> Initialize ()
-        initData Nothing = return ()
-        initData (Just (from, mem, chunk)) = do
-            let last = from + (fromIntegral $ LBS.length chunk)
             len <- ByteArray.getSizeofMutableByteArray mem
-            Monad.when (last > len) $ throwError "out of bounds memory access"
+            Monad.when (last > len) $ throwError "data segment does not fit"
+            return (from, mem, chunk)
+        
+        initData :: (Int, MemoryStore, LBS.ByteString) -> Initialize ()
+        initData (from, mem, chunk) =
             mapM_ (\(i,b) -> ByteArray.writeByteArray mem i b) $ zip [from..] $ LBS.unpack chunk
 
 instantiate :: Store -> Imports -> Valid.ValidModule -> IO (Either String ModuleInstance, Store)
 instantiate st imps mod = flip State.runStateT st $ runExceptT $ do
     let m = Valid.getModule mod
     inst <- calcInstance st imps m
-    let functions = funcInstances st <> allocFunctions inst (Struct.functions m)
+    let functions = funcInstances st <> (allocFunctions inst $ Struct.functions m)
-    globals <- liftIO $ (globalInstances st <>) <$> allocAndInitGlobals inst st (Struct.globals m)
+    globals <- liftIO $ (globalInstances st <>) <$> (allocAndInitGlobals inst st $ Struct.globals m)
-    tables <- (tableInstances st <>) <$> liftIO (allocTables (Struct.tables m))
+    let tables = tableInstances st <> (allocTables $ Struct.tables m)
-    mems <- liftIO $ (memInstances st <>) <$> allocMems (Struct.mems m)
+    mems <- liftIO $ (memInstances st <>) <$> (allocMems $ Struct.mems m)
-    elems <- liftIO $ (elemInstances st <>) <$> allocElems inst st (Struct.elems m)
-    datas <- liftIO $ (dataInstances st <>) <$> allocDatas (Struct.datas m)
     State.put $ st {
         funcInstances = functions,
         tableInstances = tables,
         memInstances = mems,
-        globalInstances = globals,
+        globalInstances = globals
-        elemInstances = elems,
-        dataInstances = datas
     }
     initialize inst m
     return inst
@@ -636,9 +555,9 @@ data EvalResult =
     | ReturnFn [Value]
     deriving (Show, Eq)
 
-eval :: Natural -> Store -> ModuleInstance -> FunctionInstance -> [Value] -> IO (Maybe [Value])
+eval :: Natural -> Store -> FunctionInstance -> [Value] -> IO (Maybe [Value])
-eval 0 _ _ _ _ = return Nothing
+eval 0 _ _ _ = return Nothing
-eval budget store inst FunctionInstance { funcType, moduleInstance, code = Function { localTypes, body} } args = do
+eval budget store FunctionInstance { funcType, moduleInstance, code = Function { localTypes, body} } args = do
     case sequence $ zipWith checkValType (params funcType) args of
         Just checkedArgs -> do
             let initialContext = EvalCtx {
@@ -660,8 +579,6 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
         checkValType I64 (VI64 v) = Just $ VI64 v
         checkValType F32 (VF32 v) = Just $ VF32 v
         checkValType F64 (VF64 v) = Just $ VF64 v
-        checkValType Func (RF v)  = Just $ RF v
-        checkValType Extern (RE v) = Just $ RE v
         checkValType _   _        = Nothing
 
         initLocal :: ValueType -> Value
@@ -777,47 +694,32 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
             let args = params ft
             case sequence $ zipWith checkValType args $ reverse $ take (length args) $ stack ctx of
                 Just params -> do
-                    res <- eval (budget - 1) store inst funInst params
+                    res <- eval (budget - 1) store funInst params
                     case res of
                         Just res -> return $ Done ctx { stack = reverse res ++ (drop (length args) $ stack ctx) }
                         Nothing -> return Trap
                 Nothing -> return Trap
-        step ctx@EvalCtx{ stack = (VI32 v): rest } (CallIndirect tableIdx typeIdx) = do
+        step ctx@EvalCtx{ stack = (VI32 v): rest } (CallIndirect typeIdx) = do
             let funcType = funcTypes moduleInstance ! fromIntegral typeIdx
-            let TableInstance { items } = tableInstances store ! (tableaddrs moduleInstance ! fromIntegral tableIdx)
+            let TableInstance { elements } = tableInstances store ! (tableaddrs moduleInstance ! 0)
-            let pos = fromIntegral v
+            let checks = do
-            funcs <- readIORef items
+                    addr <- Monad.join $ elements !? fromIntegral v
-            if pos >= MVector.length funcs
+                    let funcInst = funcInstances store ! addr
-            then return Trap
+                    let targetType = Language.Wasm.Interpreter.funcType funcInst
-            else do
+                    Monad.guard $ targetType == funcType
-                maybeAddr <- MVector.unsafeRead funcs pos
+                    let args = params targetType
-                let checks = do
+                    Monad.guard $ length args <= length rest
-                        addr <- maybeAddr
+                    params <- sequence $ zipWith checkValType args $ reverse $ take (length args) rest
-                        let funcInst = funcInstances store ! addr
+                    return (funcInst, params)
-                        let targetType = Language.Wasm.Interpreter.funcType funcInst
+            case checks of
-                        Monad.guard $ targetType == funcType
+                Just (funcInst, params) -> do
-                        let args = params targetType
+                    res <- eval (budget - 1) store funcInst params
-                        Monad.guard $ length args <= length rest
+                    case res of
-                        params <- sequence $ zipWith checkValType args $ reverse $ take (length args) rest
+                        Just res -> return $ Done ctx { stack = reverse res ++ (drop (length params) rest) }
-                        return (funcInst, params)
+                        Nothing -> return Trap
-                case checks of
+                Nothing -> return Trap
-                    Just (funcInst, params) -> do
-                        res <- eval (budget - 1) store inst funcInst params
-                        case res of
-                            Just res -> return $ Done ctx { stack = reverse res ++ (drop (length params) rest) }
-                            Nothing -> return Trap
-                    Nothing -> return Trap
-        step ctx@EvalCtx{ stack = st } (RefNull FuncRef) =
-            return $ Done ctx { stack = RF Nothing : st }
-        step ctx@EvalCtx{ stack = st } (RefNull ExternRef) =
-            return $ Done ctx { stack = RE Nothing : st }
-        step ctx@EvalCtx{ stack = v:rest } RefIsNull =
-            let r = case v of { RE Nothing -> 1; RF Nothing -> 1; _ -> 0 } in
-            return $ Done ctx { stack = VI32 r : rest }
-        step ctx@EvalCtx{ stack = st } (RefFunc index) =
-            return $ Done ctx { stack =  (RF $ Just $ fromIntegral $ funcaddrs inst ! fromIntegral index) : st }
         step ctx@EvalCtx{ stack = (_:rest) } Drop = return $ Done ctx { stack = rest }
-        step ctx@EvalCtx{ stack = (VI32 test:val2:val1:rest) } (Select _) =
+        step ctx@EvalCtx{ stack = (VI32 test:val2:val1:rest) } Select =
             if test == 0
             then return $ Done ctx { stack = val2 : rest }
             else return $ Done ctx { stack = val1 : rest }
@@ -897,12 +799,12 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
             makeStoreInstr @Word16 ctx { stack = rest } offset 2 $ fromIntegral v
         step ctx@EvalCtx{ stack = (VI64 v:rest) } (I64Store32 MemArg { offset }) =
             makeStoreInstr @Word32 ctx { stack = rest } offset 4 $ fromIntegral v
-        step ctx@EvalCtx{ stack = st } MemorySize = do
+        step ctx@EvalCtx{ stack = st } CurrentMemory = do
             let MemoryInstance { memory = memoryRef } = memInstances store ! (memaddrs moduleInstance ! 0)
             memory <- readIORef memoryRef
             size <- ((`quot` pageSize) . fromIntegral) <$> ByteArray.getSizeofMutableByteArray memory
             return $ Done ctx { stack = VI32 (fromIntegral size) : st }
-        step ctx@EvalCtx{ stack = (VI32 n:rest) } MemoryGrow = do
+        step ctx@EvalCtx{ stack = (VI32 n:rest) } GrowMemory = do
             let MemoryInstance { lim = limit@(Limit _ maxLen), memory = memoryRef } = memInstances store ! (memaddrs moduleInstance ! 0)
             memory <- readIORef memoryRef
             size <- (`quot` pageSize) <$> ByteArray.getSizeofMutableByteArray memory
@@ -920,161 +822,6 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
                     else return $ -1
                 )
             return $ Done ctx { stack = VI32 (asWord32 $ fromIntegral result) : rest }
-        step ctx@EvalCtx{ stack = (VI32 n:VI32 v:VI32 d:rest) } MemoryFill = do
-            let MemoryInstance { memory = memoryRef } = memInstances store ! (memaddrs moduleInstance ! 0)
-            memory <- readIORef memoryRef
-            size <- ByteArray.getSizeofMutableByteArray memory
-            let dest = fromIntegral d
-            let len = fromIntegral n
-            if dest + len > size
-            then return Trap
-            else do
-                ByteArray.setByteArray @Word8 memory dest len $ fromIntegral v
-                return $ Done ctx { stack = rest }
-        step ctx@EvalCtx{ stack = (VI32 n:VI32 s:VI32 d:rest) } MemoryCopy = do
-            let MemoryInstance { memory = memoryRef } = memInstances store ! (memaddrs moduleInstance ! 0)
-            memory <- readIORef memoryRef
-            size <- ByteArray.getSizeofMutableByteArray memory
-            let src = fromIntegral s
-            let dest = fromIntegral d
-            let len = fromIntegral n
-            if dest + len > size || src + len > size
-            then return Trap
-            else do
-                ByteArray.copyMutableByteArray memory dest memory src len
-                return $ Done ctx { stack = rest }
-        step ctx@EvalCtx{ stack = (VI32 n:VI32 s:VI32 d:rest) } (MemoryInit dataIdx) = do
-            let DataInstance {bytes, isDropped} = dataInstances store ! (dataaddrs moduleInstance ! fromIntegral dataIdx)
-            let MemoryInstance { memory = memoryRef } = memInstances store ! (memaddrs moduleInstance ! 0)
-            memory <- readIORef memoryRef
-            size <- fromIntegral <$> ByteArray.getSizeofMutableByteArray memory
-            let src = fromIntegral s
-            let dest = fromIntegral d
-            let len = fromIntegral n
-            dropped <- readIORef isDropped
-            if (dropped && len > 0) || src + len > LBS.length bytes || dest + len > size
-            then return Trap
-            else do
-                mapM_ (uncurry $ ByteArray.writeByteArray memory) $ zip [fromIntegral d..] $
-                    LBS.unpack $ LBS.take len $ LBS.drop src bytes
-                return $ Done ctx { stack = rest }
-        step ctx (DataDrop dataIdx) = do
-            let DataInstance {isDropped} = dataInstances store ! (dataaddrs moduleInstance ! fromIntegral dataIdx)
-            writeIORef isDropped True
-            return $ Done ctx
-        step ctx@EvalCtx{ stack = (VI32 n:VI32 s:VI32 d:rest) } (TableInit tableIdx elemIdx) = do
-            let tableAddr = tableaddrs moduleInstance ! fromIntegral tableIdx
-            let TableInstance { items } = tableInstances store ! tableAddr
-            let elemAddr = elemaddrs moduleInstance ! fromIntegral elemIdx
-            let ElemInstance {
-                    eiItems = refs,
-                    eiMode = mode,
-                    isDropped = dropFlag
-                } = elemInstances store ! elemAddr
-            let src = fromIntegral s
-            let dst = fromIntegral d
-            let len = fromIntegral n
-            els <- readIORef items
-            isDropped <- readIORef dropFlag
-            if src + len > Vector.length refs
-                || dst + len > MVector.length els
-                || (isDropped && len > 0)
-                || isDeclarative mode
-            then return Trap
-            else do
-                Vector.iforM_ (Vector.slice src len refs) $ \idx (RF fn) -> do
-                    MVector.unsafeWrite els (dst + idx) (fromIntegral <$> fn)
-                return $ Done ctx { stack = rest }
-        step ctx@EvalCtx{ stack = (VI32 n:VI32 s:VI32 d:rest) } (TableCopy toIdx fromIdx) = do
-            let fromAddr = tableaddrs moduleInstance ! fromIntegral fromIdx
-            let TableInstance { items = fromItems } = tableInstances store ! fromAddr
-            let toAddr = tableaddrs moduleInstance ! fromIntegral toIdx
-            let TableInstance { items = toItems } = tableInstances store ! toAddr
-            let src = fromIntegral s
-            let dst = fromIntegral d
-            let len = fromIntegral n
-            fromEls <- readIORef fromItems
-            toEls <- readIORef toItems
-            if src + len > MVector.length fromEls || dst + len > MVector.length toEls
-            then return Trap
-            else do
-                let range = if dst <= src then [0..len - 1] else reverse [0..len - 1]
-                flip mapM_ range $ \off -> do
-                    el <- MVector.unsafeRead fromEls (src + off)
-                    MVector.unsafeWrite toEls (dst + off) el
-                return $ Done ctx { stack = rest }
-        step ctx@EvalCtx{ stack = (VI32 n:ref:VI32 i:rest) } (TableFill tableIdx) = do
-            let tableAddr = tableaddrs moduleInstance ! fromIntegral tableIdx
-            let TableInstance { items, t } = tableInstances store ! tableAddr
-            let TableType (Limit _ max) _ = t
-            let inc = fromIntegral n
-            let from = fromIntegral i
-            let val = case ref of
-                    RE extRef -> fromIntegral <$> extRef
-                    RF fnRef -> fromIntegral <$> fnRef
-                    v -> error "Impossible due to validation"
-            els <- readIORef items
-            if from + inc > MVector.length els
-            then return Trap
-            else do
-                Monad.forM_ [0..inc - 1] $ \off ->
-                    MVector.unsafeWrite els (from + off) val
-                return $ Done ctx { stack = rest }
-        step ctx@EvalCtx{ stack } (TableSize tableIdx) = do
-            let tableAddr = tableaddrs moduleInstance ! fromIntegral tableIdx
-            let TableInstance { items } = tableInstances store ! tableAddr
-            len <- MVector.length <$> readIORef items
-            return $ Done ctx { stack = VI32 (fromIntegral len) : stack }
-        step ctx@EvalCtx{ stack = (VI32 growBy:ref:rest) } (TableGrow tableIdx) = do
-            let tableAddr = tableaddrs moduleInstance ! fromIntegral tableIdx
-            let TableInstance { items, t } = tableInstances store ! tableAddr
-            let TableType (Limit _ max) _ = t
-            let inc = fromIntegral growBy
-            let val = case ref of
-                    RE extRef -> extRef
-                    RF fnRef -> fnRef
-                    v -> error "Impossible due to validation"
-            els <- readIORef items
-            let currLen = MVector.length els
-            let newLen = currLen + inc
-            if maybe False ((newLen >) . fromIntegral) max || newLen > 0xFFFFFFFF
-            then return $ Done ctx { stack = VI32 (asWord32 $ -1):rest }
-            else do
-                newEls <- MVector.grow els inc
-                writeIORef items newEls
-                Monad.forM_ [0..inc - 1] $ \off ->
-                    MVector.unsafeWrite newEls (currLen + off) (fromIntegral <$> val)
-                return $ Done ctx { stack = VI32 (fromIntegral currLen):rest }
-        step ctx@EvalCtx{ stack = (ref:VI32 offset:rest) } (TableSet tableIdx) = do
-            let tableAddr = tableaddrs moduleInstance ! fromIntegral tableIdx
-            let TableInstance { items } = tableInstances store ! tableAddr
-            let dst = fromIntegral offset
-            let val = case ref of
-                    RE extRef -> fromIntegral <$> extRef
-                    RF fnRef -> fromIntegral <$> fnRef
-                    v -> error "Impossible due to validation"
-            els <- readIORef items
-            if dst >= MVector.length els
-            then return Trap
-            else do
-                MVector.unsafeWrite els dst val
-                return $ Done ctx { stack = rest }
-        step ctx@EvalCtx{ stack = (VI32 offset:rest) } (TableGet tableIdx) = do
-            let tableAddr = tableaddrs moduleInstance ! fromIntegral tableIdx
-            let TableInstance { t = TableType _ et, items } = tableInstances store ! tableAddr
-            let dst = fromIntegral offset
-            els <- readIORef items
-            if dst >= MVector.length els
-            then return Trap
-            else do
-                v <- MVector.unsafeRead els dst
-                let val = (case et of {FuncRef -> RF; ExternRef -> RE}) (fromIntegral <$> v)
-                return $ Done ctx { stack = val : rest }
-        step ctx (ElemDrop elemIdx) = do
-            let elemAddr = elemaddrs moduleInstance ! fromIntegral elemIdx
-            let ElemInstance {isDropped} = elemInstances store ! elemAddr
-            writeIORef isDropped True
-            return $ Done ctx
         step ctx (I32Const v) = return $ Done ctx { stack = VI32 v : stack ctx }
         step ctx (I64Const v) = return $ Done ctx { stack = VI64 v : stack ctx }
         step ctx (F32Const v) = return $ Done ctx { stack = VF32 v : stack ctx }
@@ -1440,15 +1187,15 @@ eval budget store inst FunctionInstance { funcType, moduleInstance, code = Funct
         step ctx@EvalCtx{ stack = (VI64 v:rest) } (FReinterpretI BS64) =
             return $ Done ctx { stack = VF64 (wordToDouble v) : rest }
         step EvalCtx{ stack } instr = error $ "Error during evaluation of instruction: " ++ show instr ++ ". Stack " ++ show stack
-eval _ _ _ HostInstance { funcType, hostCode } args = Just <$> hostCode args
+eval _ _ HostInstance { funcType, hostCode } args = Just <$> hostCode args
 
-invoke :: Store -> ModuleInstance -> Address -> [Value] -> IO (Maybe [Value])
+invoke :: Store -> Address -> [Value] -> IO (Maybe [Value])
-invoke st inst funcIdx = eval defaultBudget st inst $ funcInstances st ! funcIdx
+invoke st funcIdx = eval defaultBudget st $ funcInstances st ! funcIdx
 
 invokeExport :: Store -> ModuleInstance -> TL.Text -> [Value] -> IO (Maybe [Value])
-invokeExport st inst@ModuleInstance { exports } name args =
+invokeExport st ModuleInstance { exports } name args =
     case Vector.find (\(ExportInstance n _) -> n == name) exports of
-        Just (ExportInstance _ (ExternFunction addr)) -> invoke st inst addr args
+        Just (ExportInstance _ (ExternFunction addr)) -> invoke st addr args
         _ -> error $ "Function with name " ++ show name ++ " was not found in module's exports"
 
 getGlobalValueByName :: Store -> ModuleInstance -> TL.Text -> IO Value
@@ -1460,8 +1207,3 @@ getGlobalValueByName store ModuleInstance { exports } name =
                 GIConst _ v -> return v
                 GIMut _ ref -> readIORef ref
         _ -> error $ "Function with name " ++ show name ++ " was not found in module's exports"
-
--- | Retrieve mutable memory from the 'Store'
-getMemory :: Store -> Address -> Maybe MemoryInstance
-getMemory Store{memInstances} address = memInstances !? address
-

src/Language/Wasm/Lexer.x

@@ -5,8 +5,6 @@ module Language.Wasm.Lexer (
     Lexeme(..),
     Token(..),
     AlexPosn(..),
-    FloatRep(..),
-    NaN(..),
     scanner,
     asFloat,
     asDouble,
@@ -24,8 +22,6 @@ import Data.List (isPrefixOf)
 import Text.Read (readEither)
 import Data.Bits
 import Numeric (showHex)
-import Control.DeepSeq (NFData)
-import GHC.Generics (Generic)
 
 }
 
@@ -299,9 +295,7 @@ endBlockComment _inp _len = do
     alexMonadScan
 
 startStringLiteral :: AlexAction Lexeme
-startStringLiteral (_, prev, _, _) _len = do
+startStringLiteral _inp _len = do
-    when (prev `notElem` "() \x09\x0A\x0D")
-        $ alexError "string literal should start after space or parent character"
     alexSetStartCode stringLiteral
     setLexerStringFlag True
     alexMonadScan

src/Language/Wasm/Parser.y

@@ -93,8 +93,6 @@ import Language.Wasm.Lexer (
         ),
         Lexeme(..),
         AlexPosn(..),
-        FloatRep(..),
-        NaN(..),
         asFloat,
         asDouble,
         doubleFromInteger
@@ -121,8 +119,6 @@ import Language.Wasm.Lexer (
 'f64'                 { Lexeme _ (TKeyword "f64") }
 'mut'                 { Lexeme _ (TKeyword "mut") }
 'funcref'             { Lexeme _ (TKeyword "funcref") }
-'externref'           { Lexeme _ (TKeyword "externref") }
-'extern'              { Lexeme _ (TKeyword "extern") }
 'type'                { Lexeme _ (TKeyword "type") }
 'unreachable'         { Lexeme _ (TKeyword "unreachable") }
 'nop'                 { Lexeme _ (TKeyword "nop") }
@@ -132,10 +128,6 @@ import Language.Wasm.Lexer (
 'return'              { Lexeme _ (TKeyword "return") }
 'call'                { Lexeme _ (TKeyword "call") }
 'call_indirect'       { Lexeme _ (TKeyword "call_indirect") }
-'ref.null'            { Lexeme _ (TKeyword "ref.null") }
-'ref.is_null'         { Lexeme _ (TKeyword "ref.is_null") }
-'ref.func'            { Lexeme _ (TKeyword "ref.func") }
-'ref.extern'          { Lexeme _ (TKeyword "ref.extern") }
 'drop'                { Lexeme _ (TKeyword "drop") }
 'select'              { Lexeme _ (TKeyword "select") }
 'get_local'           { Lexeme _ (TKeyword "local.get") }
@@ -168,18 +160,6 @@ import Language.Wasm.Lexer (
 'i64.store32'         { Lexeme _ (TKeyword "i64.store32") }
 'memory.size'         { Lexeme _ (TKeyword "memory.size") }
 'memory.grow'         { Lexeme _ (TKeyword "memory.grow") }
-'memory.fill'         { Lexeme _ (TKeyword "memory.fill") }
-'memory.copy'         { Lexeme _ (TKeyword "memory.copy") }
-'memory.init'         { Lexeme _ (TKeyword "memory.init") }
-'data.drop'           { Lexeme _ (TKeyword "data.drop") }
-'table.init'          { Lexeme _ (TKeyword "table.init") }
-'table.copy'          { Lexeme _ (TKeyword "table.copy") }
-'table.fill'          { Lexeme _ (TKeyword "table.fill") }
-'table.size'          { Lexeme _ (TKeyword "table.size") }
-'table.grow'          { Lexeme _ (TKeyword "table.grow") }
-'table.get'           { Lexeme _ (TKeyword "table.get") }
-'table.set'           { Lexeme _ (TKeyword "table.set") }
-'elem.drop'           { Lexeme _ (TKeyword "elem.drop") }
 'i32.const'           { Lexeme _ (TKeyword "i32.const") }
 'i64.const'           { Lexeme _ (TKeyword "i64.const") }
 'f32.const'           { Lexeme _ (TKeyword "f32.const") }
@@ -333,8 +313,6 @@ import Language.Wasm.Lexer (
 'export'              { Lexeme _ (TKeyword "export") }
 'local'               { Lexeme _ (TKeyword "local") }
 'elem'                { Lexeme _ (TKeyword "elem") }
-'item'                { Lexeme _ (TKeyword "item") }
-'declare'             { Lexeme _ (TKeyword "declare") }
 'data'                { Lexeme _ (TKeyword "data") }
 'offset'              { Lexeme _ (TKeyword "offset") }
 'start'               { Lexeme _ (TKeyword "start") }
@@ -385,8 +363,6 @@ valtype :: { ValueType }
     | 'i64' { I64 }
     | 'f32' { F32 }
     | 'f64' { F64 }
-    | 'funcref' { Func }
-    | 'externref' { Extern }
 
 index :: { Index }
     : u32 { Index $1 }
@@ -413,23 +389,23 @@ int64 :: { Integer }
         else Left ("Int literal value is out of signed int64 boundaries: " ++ show $1)
     }
 
-float32 :: { FloatRep }
+float32 :: { Float }
     : int {%
         let maxInt = 340282356779733623858607532500980858880 in
         if $1 <= maxInt && $1 >= -maxInt
-        then return $ BinRep $ fromIntegral $1
+        then return $ fromIntegral $1
         else Left "constant out of range"
     }
-    | f64 { $1 }
+    | f64 {% asFloat $1 }
 
-float64 :: { FloatRep }
+float64 :: { Double }
     : int {%
         let maxInt = round (maxFinite :: Double) in
         if $1 <= maxInt && $1 >= -maxInt
-        then fmap BinRep $ doubleFromInteger $1
+        then doubleFromInteger $1
         else Left "constant out of range"
     }
-    | f64 { $1 }
+    | f64 {% asDouble $1 }
 
 plaininstr :: { PlainInstr }
     -- control instructions
@@ -441,11 +417,7 @@ plaininstr :: { PlainInstr }
     | 'return'                       { Return }
     | 'call' index                   { Call $2 }
     | 'drop'                         { Drop }
-    -- reference instructions
+    | 'select'                       { Select }
-    | 'ref.null' heaptype            { RefNull $2 }
-    | 'ref.is_null'                  { RefIsNull }
-    | 'ref.func' index               { RefFunc $2 }
-    | 'ref.extern' u32               { RefExtern $2 }
     -- variable instructions
     | 'get_local' index              { GetLocal $2 }
     | 'set_local' index              { SetLocal $2 }
@@ -476,25 +448,8 @@ plaininstr :: { PlainInstr }
     | 'i64.store8' memarg1           { I64Store8 $2 }
     | 'i64.store16' memarg2          { I64Store16 $2 }
     | 'i64.store32' memarg4          { I64Store32 $2 }
-    | 'memory.size'                  { MemorySize }
+    | 'memory.size'                  { CurrentMemory }
-    | 'memory.grow'                  { MemoryGrow }
+    | 'memory.grow'                  { GrowMemory }
-    | 'memory.fill'                  { MemoryFill }
-    | 'memory.copy'                  { MemoryCopy }
-    | 'memory.init' index            { MemoryInit $2 }
-    | 'data.drop' index              { DataDrop $2 }
-    -- table instructions
-    | 'table.init' index opt(index) {
-        case $3 of
-            Nothing -> TableInit (Index 0) $2
-            Just elemIdx -> TableInit $2 elemIdx
-    }
-    | 'table.get' opt(index)         { TableGet (fromMaybe (Index 0) $2) }
-    | 'table.set' opt(index)         { TableSet (fromMaybe (Index 0) $2) }
-    | 'table.copy' opt(index) opt(index) { TableCopy (fromMaybe (Index 0) $2) (fromMaybe (Index 0) $3) }
-    | 'table.fill' opt(index)        { TableFill (fromMaybe (Index 0) $2) }
-    | 'table.size' opt(index)        { TableSize (fromMaybe (Index 0) $2) }
-    | 'table.grow' opt(index)        { TableGrow (fromMaybe (Index 0) $2) }
-    | 'elem.drop' index              { ElemDrop $2 }
     -- numeric instructions
     | 'i32.const' int32              { I32Const $2 }
     | 'i64.const' int64              { I64Const $2 }
@@ -702,33 +657,12 @@ memarg4 :: { MemArg }
 memarg8 :: { MemArg }
     : opt(offset) opt(align) {% parseMemArg 8 $1 $2 }
 
-select_type_or_instructions(terminator)
-    : '(' select_type_or_instructions1(terminator) { $2 }
-    | instruction_list(terminator) {
-        let (end, instr) = $1 in
-        (end, Nothing, instr)
-    }
-
-select_type_or_instructions1(terminator) 
-    : 'result' list(valtype) ')' select_type_or_instructions(terminator) {
-        let (end, res, instr) = $4 in
-        (end, Just ($2 ++ fromMaybe [] res), instr)
-    }
-    | folded_instr_list(terminator) {
-        let (end, instr) = $1 in
-        (end, Nothing, instr)
-    }
-
 instruction_list(terminator)
     : terminator { ($1, []) }
     | plaininstr mixed_instruction_list(terminator) { ([PlainInstr $1] ++) `fmap` $2 }
-    | 'call_indirect' opt(index) typeuse(terminator) {%
+    | 'call_indirect' typeuse(terminator) {%
-        let tableIdx = fromMaybe (Index 0) $2 in
+        let (tu, instr, end) = $2 in
-        let (tu, instr, end) = $3 in
+        onlyAnonimParams tu >> (return (end, [PlainInstr $ CallIndirect tu] ++ instr))
-        onlyAnonimParams tu >> (return (end, [PlainInstr $ CallIndirect tableIdx tu] ++ instr))
-    }
-    | 'select' select_type_or_instructions(terminator) {
-        let (end, t, instr) = $2 in (end, [PlainInstr $ Select t] ++ instr)
     }
     | 'block' opt(ident) typeuse('end') opt(ident) mixed_instruction_list(terminator) {% do
         let (tu, instr, _) = $3 
@@ -766,13 +700,9 @@ folded_instr :: { [Instruction] }
 
 folded_instr1 :: { [Instruction] }
     : plaininstr mixed_instruction_list(')') { snd $2 ++ [PlainInstr $1] }
-    | 'call_indirect' opt(index) typeuse(')') {%
+    | 'call_indirect' typeuse(')') {%
-        let tableIdx = fromMaybe (Index 0) $2 in
+        let (tu, instr, _) = $2 in
-        let (tu, instr, _) = $3 in
+        onlyAnonimParams tu >> (return $ instr ++ [PlainInstr $ CallIndirect tu])
-        onlyAnonimParams tu >> (return $ instr ++ [PlainInstr $ CallIndirect tableIdx tu])
-    }
-    | 'select' select_type_or_instructions(')') {
-        let (_, t, instr) = $2 in instr ++ [PlainInstr $ Select t]
     }
     | 'block' opt(ident) typeuse(')') {%
         let (typeUse, instr, _) = $3 in
@@ -909,12 +839,9 @@ memory_limits_export_import1 :: { Maybe Ident -> [ModuleField] }
     | 'data' datastring ')' ')' {
         \ident ->
             let m = fromIntegral $ LBS.length $2 in
-            let lim = if m `mod` 0x10000 == 0 then m `div` 0x10000 else m `div` 0x10000 + 1 in
-            -- TODO: unhardcode memory index
-            let memIdx = fromMaybe (Index 0) $ Named `fmap` ident in
             [
-                MFMem $ Memory [] ident $ Limit lim $ Just lim,
+                MFMem $ Memory [] ident $ Limit m $ Just m,
-                MFData $ DataSegment Nothing (ActiveData memIdx [PlainInstr $ I32Const 0]) $2
+                MFData $ DataSegment (fromMaybe (Index 0) $ Named `fmap` ident) [PlainInstr $ I32Const 0] $2
             ]
     }
 
@@ -929,11 +856,6 @@ limits :: { Limit }
 
 elemtype :: { ElemType }
     : 'funcref' { FuncRef }
-    | 'externref' { ExternRef }
-
-heaptype :: { ElemType }
-    : 'func' { FuncRef }
-    | 'extern' { ExternRef }
 
 tabletype :: { TableType }
     : limits elemtype { TableType $1 $2 }
@@ -943,24 +865,15 @@ table :: { [ModuleField] }
 
 limits_elemtype_elem :: { Maybe Ident -> [ModuleField] }
     : tabletype ')' { \ident -> [MFTable $ Table [] ident $1] }
-    | elemtype '(' 'elem' indexes_or_ref_exprs ')' ')' {
+    | elemtype '(' 'elem' list(index) ')' ')' {
         \ident ->
             let funcsLen = fromIntegral $ length $4 in [
                 MFTable $ Table [] ident $ TableType (Limit funcsLen (Just funcsLen)) $1,
-                -- TODO: unhardcode table index
+                MFElem $ ElemSegment (fromMaybe (Index 0) $ Named `fmap` ident) [PlainInstr $ I32Const 0] $4
-                let tableIndex = (fromMaybe (Index 0) $ Named `fmap` ident) in
-                let offset = [PlainInstr $ I32Const 0] in
-                let elements = $4 in
-                MFElem $ ElemSegment Nothing FuncRef (Active tableIndex offset) elements
             ]
     }
     | '(' import_export_table { $2 }
 
-indexes_or_ref_exprs :: {[[Instruction]]}
-    : index list(index) { funcIndexToExpr ($1:$2) }
-    | elemexpr list(elemexpr) { $1 : $2 }
-    | {- empty -} { [] }
-
 import_export_table :: { Maybe Ident -> [ModuleField] }
     : 'import' name name ')' tabletype ')' {
         \ident -> [MFImport $ Import [] $2 $3 $ ImportTable ident $5]
@@ -987,58 +900,25 @@ export :: { Export }
 start :: { StartFunction }
     : 'start' index ')' { StartFunction $2 }
 
-elem :: { ElemSegment }
+-- TODO: Spec from 09 Jan 2018 declares 'offset' keyword as mandatory,
-    : 'elem' opt(ident) elem1 { $3{ ident = $2 } }
+-- but collection of testcases omits 'offset' in this position
-
+-- I am going to support both options for now, but maybe it has to be updated in future.
-elem1 :: { ElemSegment }
+offsetexpr :: { [Instruction] }
-    : elemlist ')' { let (t, els) = $1 in ElemSegment Nothing t Passive els }
-    | 'declare' elemlist ')' { let (t, els) = $2 in ElemSegment Nothing t Declarative els }
-    | '(' elem1_active ')' { $2 }
-
-elem1_active :: { ElemSegment }
-    : 'table' index ')' '(' elem1_active_offset {
-        let (offset, t, els) = $5 in ElemSegment Nothing t (Active $2 offset) els
-    }
-    | elem1_active_offset {
-        let (offset, t, els) = $1 in ElemSegment Nothing t (Active (Index 0) offset) els
-    }
-
-elem1_active_offset :: { ([Instruction], ElemType, [[Instruction]]) }
-    : 'offset' mixed_instruction_list(')') elemlist { (snd $2, fst $3, snd $3) }
-    | folded_instr1 elemlist { ($1, fst $2, snd $2) }
-
-elemlist :: { (ElemType, [[Instruction]]) }
-    : 'func' list(index) { (FuncRef, funcIndexToExpr $2) }
-    | 'funcref' list(elemexpr) { (FuncRef, $2) }
-    | 'externref' list(elemexpr) { (ExternRef, $2) }
-    | list(index) { (FuncRef, funcIndexToExpr $1) }
-
-elemexpr :: { [Instruction] }
-    : plaininstr { [PlainInstr $1] }
-    | '(' 'item' mixed_instruction_list(')') { snd $3 }
-    | '(' folded_instr1 { $2 }
-
-offsetexpr1 :: { [Instruction] }
     : 'offset' mixed_instruction_list(')') { snd $2 }
     | folded_instr1 { $1 }
 
-memory_offsetexpr1 :: { (MemoryIndex, [Instruction]) }
+elemsegment :: { ElemSegment }
-    : offsetexpr1 { (Index 0, $1)}
+    : 'elem' opt(index) '(' offsetexpr list(index) ')' { ElemSegment (fromMaybe (Index 0) $2) $4 $5 }
-    | 'memory' index ')' '(' offsetexpr1 { ($2, $5) }
-
-memory_mode :: { DataMode }
-    : '(' memory_offsetexpr1 { uncurry ActiveData $2 }
-    | {- empty -} { PassiveData }
 
 datasegment :: { DataSegment }
-    : 'data' opt(ident) memory_mode datastring ')' { DataSegment $2 $3 $4 }
+    : 'data' opt(index) '(' offsetexpr datastring ')' { DataSegment (fromMaybe (Index 0) $2) $4 $5 }
 
 modulefield1_single :: { ModuleField }
     : typedef { MFType $1 }
     | import { MFImport $1 }
     | export { MFExport $1 }
     | start { MFStart $1 }
-    | elem { MFElem $1 }
+    | elemsegment { MFElem $1 }
     | datasegment { MFData $1 }
     | function { $1 }
     | global { $1 }
@@ -1084,15 +964,11 @@ module1 :: { ModuleDef }
     | 'module' opt(ident) list(modulefield) ')' {% RawModDef $2 `fmap` (desugarize $ concat $3) }
 
 action1 :: { Action }
-    : 'invoke' opt(ident) string list(folded_instr) ')' {%
+    : 'invoke' opt(ident) string list(folded_instr) ')' { Invoke $2 $3 (map (map constInstructionToValue) $4) }
-        fmap (Invoke $2 $3) $ (mapM (mapM constInstructionToValue) $4)
-    }
     | 'get' opt(ident) string ')' { Get $2 $3 }
 
 assertion1 :: { (Maybe AlexPosn, Assertion) }
-    : 'assert_return' '(' action1 list(folded_instr) ')' {%
+    : 'assert_return' '(' action1 list(folded_instr) ')' { ($1, AssertReturn $3 (map (map constInstructionToValue) $4)) }
-        fmap ((\a -> ($1, a)) . AssertReturn $3) $ (mapM (mapM constInstructionToValue) $4)
-    }
     | 'assert_return_canonical_nan' '(' action1 ')' { ($1, AssertReturnCanonicalNaN $3) }
     | 'assert_return_arithmetic_nan' '(' action1 ')' { ($1, AssertReturnArithmeticNaN $3) }
     | 'assert_trap' '(' assertion_trap string ')' { ($1, AssertTrap $3 $4) }
@@ -1208,7 +1084,7 @@ integerToWord64 i
     | i < 0 && i >= -(2 ^ 63) = 0xFFFFFFFFFFFFFFFF - (fromIntegral (abs i)) + 1
     | otherwise = error "I64 is out of bounds."
 
-data FuncType = FuncType { params :: [ParamType], results :: [ValueType] } deriving (Show, Eq)
+data FuncType = FuncType { params :: [ParamType], results :: [ValueType] } deriving (Show, Eq, Generic, NFData)
 
 emptyFuncType :: FuncType
 emptyFuncType = FuncType [] []
@@ -1216,11 +1092,11 @@ emptyFuncType = FuncType [] []
 data ParamType = ParamType {
         ident :: Maybe Ident,
         paramType :: ValueType
-    } deriving (Show, Eq)
+    } deriving (Show, Eq, Generic, NFData)
 
-newtype Ident = Ident TL.Text deriving (Show, Eq)
+newtype Ident = Ident TL.Text deriving (Show, Eq, Generic, NFData)
 
-data Index = Named Ident | Index Natural deriving (Show, Eq)
+data Index = Named Ident | Index Natural deriving (Show, Eq, Generic, NFData)
 
 type LabelIndex = Index
 type FuncIndex = Index
@@ -1229,8 +1105,6 @@ type LocalIndex = Index
 type GlobalIndex = Index
 type TableIndex = Index
 type MemoryIndex = Index
-type ElemIndex = Index
-type DataIndex = Index
 
 data PlainInstr =
     -- Control instructions
@@ -1241,15 +1115,10 @@ data PlainInstr =
     | BrTable [LabelIndex] LabelIndex
     | Return
     | Call FuncIndex
-    | CallIndirect TableIndex TypeUse
+    | CallIndirect TypeUse
-    -- Reference instructions
-    | RefNull ElemType
-    | RefIsNull
-    | RefFunc FuncIndex
-    | RefExtern Natural
     -- Parametric instructions
     | Drop
-    | Select (Maybe [ValueType])
+    | Select
     -- Variable instructions
     | GetLocal LocalIndex
     | SetLocal LocalIndex
@@ -1280,26 +1149,13 @@ data PlainInstr =
     | I64Store8 MemArg
     | I64Store16 MemArg
     | I64Store32 MemArg
-    | MemorySize
+    | CurrentMemory
-    | MemoryGrow
+    | GrowMemory
-    | MemoryFill
-    | MemoryCopy
-    | MemoryInit DataIndex
-    | DataDrop DataIndex
-    -- Table instructions
-    | TableInit TableIndex ElemIndex
-    | TableGrow TableIndex
-    | TableSize TableIndex
-    | TableFill TableIndex
-    | TableGet TableIndex
-    | TableSet TableIndex
-    | TableCopy TableIndex TableIndex
-    | ElemDrop ElemIndex
     -- Numeric instructions
     | I32Const Integer
     | I64Const Integer
-    | F32Const FloatRep
+    | F32Const Float
-    | F64Const FloatRep
+    | F64Const Double
     | IUnOp BitSize IUnOp
     | IBinOp BitSize IBinOp
     | I32Eqz
@@ -1321,14 +1177,14 @@ data PlainInstr =
     | F64PromoteF32
     | IReinterpretF BitSize
     | FReinterpretI BitSize
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
-data TypeDef = TypeDef (Maybe Ident) FuncType deriving (Show, Eq)
+data TypeDef = TypeDef (Maybe Ident) FuncType deriving (Show, Eq, Generic, NFData)
 
 data TypeUse =
     IndexedTypeUse TypeIndex (Maybe FuncType)
     | AnonimousTypeUse FuncType
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
 emptyTypeUse = AnonimousTypeUse emptyFuncType
 
@@ -1350,26 +1206,26 @@ data Instruction =
         trueBranch :: [Instruction],
         falseBranch :: [Instruction]
     }
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
 data Import = Import {
         reExportAs :: [TL.Text],
         sourceModule :: TL.Text,
         name :: TL.Text,
         desc :: ImportDesc
-    } deriving (Show, Eq)
+    } deriving (Show, Eq, Generic, NFData)
 
 data ImportDesc =
     ImportFunc (Maybe Ident) TypeUse
     | ImportTable (Maybe Ident) TableType
     | ImportMemory (Maybe Ident) Limit
     | ImportGlobal (Maybe Ident) GlobalType
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
 data LocalType = LocalType {
         ident :: Maybe Ident,
         localType :: ValueType
-    } deriving (Show, Eq)
+    } deriving (Show, Eq, Generic, NFData)
 
 data Function = Function {
         exportFuncAs :: [TL.Text],
@@ -1378,7 +1234,7 @@ data Function = Function {
         locals :: [LocalType],
         body :: [Instruction]
     }
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
 emptyFunction :: Function
 emptyFunction =
@@ -1396,52 +1252,40 @@ data Global = Global {
         globalType :: GlobalType,
         initializer :: [Instruction]
     }
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
-data Memory = Memory [TL.Text] (Maybe Ident) Limit deriving (Show, Eq)
+data Memory = Memory [TL.Text] (Maybe Ident) Limit deriving (Show, Eq, Generic, NFData)
 
-data Table = Table [TL.Text] (Maybe Ident) TableType deriving (Show, Eq)
+data Table = Table [TL.Text] (Maybe Ident) TableType deriving (Show, Eq, Generic, NFData)
 
 data ExportDesc =
     ExportFunc FuncIndex
     | ExportTable TableIndex
     | ExportMemory MemoryIndex
     | ExportGlobal GlobalIndex
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
 data Export = Export {
         name :: TL.Text,
         desc :: ExportDesc
     }
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
-data StartFunction = StartFunction FuncIndex deriving (Show, Eq)
+data StartFunction = StartFunction FuncIndex deriving (Show, Eq, Generic, NFData)
-
-data ElemMode
-    = Passive
-    | Active TableIndex [Instruction]
-    | Declarative
-    deriving (Show, Eq)
 
 data ElemSegment = ElemSegment {
-        ident :: Maybe Ident,
+        tableIndex :: TableIndex,
-        elemType :: ElemType,
+        offset :: [Instruction],
-        mode :: ElemMode,
+        funcIndexes :: [FuncIndex]
-        elements :: [[Instruction]]
     }
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
-
-data DataMode =
-    PassiveData
-    | ActiveData MemoryIndex [Instruction]
-    deriving (Show, Eq)
 
 data DataSegment = DataSegment {
-        ident :: Maybe Ident,
+        memIndex :: MemoryIndex,
-        dataMode :: DataMode,
+        offset :: [Instruction],
         datastring :: LBS.ByteString
     }
-    deriving (Show, Eq)
+    deriving (Show, Eq, Generic, NFData)
 
 data ModuleField =
     MFType TypeDef
@@ -1454,7 +1298,7 @@ data ModuleField =
     | MFStart StartFunction
     | MFElem ElemSegment
     | MFData DataSegment
-    deriving(Show, Eq)
+    deriving(Show, Eq, Generic, NFData)
 
 happyError (Lexeme _ EOF : []) = Left $ "Error occuried during parsing phase at the end of file"
 happyError (Lexeme Nothing tok : tokens) = Left $ "Error occuried during parsing phase at the end of file"
@@ -1527,17 +1371,12 @@ data FunCtx = FunCtx {
     ctxParams :: [ParamType]
 } deriving (Eq, Show)
 
-constInstructionToValue :: Instruction -> Either String (S.Instruction Natural)
+constInstructionToValue :: Instruction -> S.Instruction Natural
-constInstructionToValue (PlainInstr (I32Const v)) = return $ S.I32Const $ integerToWord32 v
+constInstructionToValue (PlainInstr (I32Const v)) = S.I32Const $ integerToWord32 v
-constInstructionToValue (PlainInstr (F32Const v)) = S.F32Const <$> asFloat v
+constInstructionToValue (PlainInstr (F32Const v)) = S.F32Const v
-constInstructionToValue (PlainInstr (I64Const v)) = return $ S.I64Const $ integerToWord64 v
+constInstructionToValue (PlainInstr (I64Const v)) = S.I64Const $ integerToWord64 v
-constInstructionToValue (PlainInstr (F64Const v)) = S.F64Const <$> asDouble v
+constInstructionToValue (PlainInstr (F64Const v)) = S.F64Const v
-constInstructionToValue (PlainInstr (RefNull et)) = return $ S.RefNull et
+constInstructionToValue _ = error "Only const instructions supported as arguments for actions"
-constInstructionToValue (PlainInstr (RefExtern n)) = return $ S.RefExtern n
-constInstructionToValue _ = Left "Only const instructions supported as arguments for actions"
-
-funcIndexToExpr :: [FuncIndex] -> [[Instruction]]
-funcIndexToExpr = map $ (:[]) . PlainInstr . RefFunc
 
 desugarize :: [ModuleField] -> Either String S.Module
 desugarize fields = do
@@ -1624,13 +1463,17 @@ desugarize fields = do
             extractTypeDefFromInstructions (matchTypeUse defs funcType) body
         extractTypeDef defs (MFGlobal Global { initializer }) =
             extractTypeDefFromInstructions defs initializer
+        extractTypeDef defs (MFElem ElemSegment { offset }) =
+            extractTypeDefFromInstructions defs offset
+        extractTypeDef defs (MFData DataSegment { offset }) =
+            extractTypeDefFromInstructions defs offset
         extractTypeDef defs _ = defs
 
         extractTypeDefFromInstructions :: [TypeDef] -> [Instruction] -> [TypeDef]
         extractTypeDefFromInstructions = foldl' extractTypeDefFromInstruction
 
         extractTypeDefFromInstruction :: [TypeDef] -> Instruction -> [TypeDef]
-        extractTypeDefFromInstruction defs (PlainInstr (CallIndirect _ typeUse)) =
+        extractTypeDefFromInstruction defs (PlainInstr (CallIndirect typeUse)) =
             matchTypeUse defs typeUse
         extractTypeDefFromInstruction defs (BlockInstr { body, blockType }) =
             extractTypeDefFromInstructions (matchTypeUse defs blockType) body
@@ -1713,23 +1556,12 @@ desugarize fields = do
             case getFuncIndex ctxMod funIdx of
                 Just idx -> return $ S.Call idx
                 Nothing -> Left "unknown function"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (CallIndirect tableIdx typeUse)) =
+        synInstrToStruct FunCtx { ctxMod = Module { types } } (PlainInstr (CallIndirect typeUse)) =
-            case getTableIndex ctxMod tableIdx of
+            case getTypeIndex types typeUse of
-                Just tableIdx ->
+                Just idx -> return $ S.CallIndirect idx
-                    case getTypeIndex (types ctxMod) typeUse of
+                Nothing -> Left "unknown type"
-                        Just idx -> return $ S.CallIndirect tableIdx idx
-                        Nothing -> Left "unknown type"
-                Nothing -> Left "unknown table"
         synInstrToStruct _ (PlainInstr Drop) = return $ S.Drop
-        synInstrToStruct _ (PlainInstr (Select vt)) = return $ S.Select vt
+        synInstrToStruct _ (PlainInstr Select) = return $ S.Select
-        synInstrToStruct _ (PlainInstr (RefNull elType)) = return $ S.RefNull elType
-        synInstrToStruct _ (PlainInstr RefIsNull) = return $ S.RefIsNull
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (RefFunc funIdx)) =
-            case getFuncIndex ctxMod funIdx of
-                Just idx -> return $ S.RefFunc idx
-                Nothing -> Left "unknown function"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (RefExtern idx)) =
-            return $ S.RefExtern idx
         synInstrToStruct ctx (PlainInstr (GetLocal localIdx)) =
             case getLocalIndex ctx localIdx of
                 Just idx -> return $ S.GetLocal idx
@@ -1773,68 +1605,12 @@ desugarize fields = do
         synInstrToStruct _ (PlainInstr (I64Store8 memArg)) = return $ S.I64Store8 memArg
         synInstrToStruct _ (PlainInstr (I64Store16 memArg)) = return $ S.I64Store16 memArg
         synInstrToStruct _ (PlainInstr (I64Store32 memArg)) = return $ S.I64Store32 memArg
-        synInstrToStruct _ (PlainInstr MemorySize) = return $ S.MemorySize
+        synInstrToStruct _ (PlainInstr CurrentMemory) = return $ S.CurrentMemory
-        synInstrToStruct _ (PlainInstr MemoryGrow) = return $ S.MemoryGrow
+        synInstrToStruct _ (PlainInstr GrowMemory) = return $ S.GrowMemory
-        synInstrToStruct _ (PlainInstr MemoryFill) = return $ S.MemoryFill
-        synInstrToStruct _ (PlainInstr MemoryCopy) = return $ S.MemoryCopy
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (MemoryInit dataIdx)) =
-            case getDataIndex ctxMod dataIdx of
-                Just dataIdx -> return $ S.MemoryInit dataIdx
-                Nothing -> Left "unknown data"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (DataDrop dataIdx)) =
-            case getDataIndex ctxMod dataIdx of
-                Just dataIdx -> return $ S.DataDrop dataIdx
-                Nothing -> Left "unknown data"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (TableInit tableIdx elemIdx)) =
-            case getTableIndex ctxMod tableIdx of
-                Just tableIdx ->
-                    case getElemIndex ctxMod elemIdx of
-                        Just elemIdx -> return $ S.TableInit tableIdx elemIdx
-                        Nothing -> Left "unknown elem"
-                Nothing -> Left "unknown table"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (TableCopy toIdx fromIdx)) =
-            case getTableIndex ctxMod fromIdx of
-                Just fromIdx ->
-                    case getTableIndex ctxMod toIdx of
-                        Just toIdx -> return $ S.TableCopy toIdx fromIdx
-                        Nothing -> Left "unknown table"
-                Nothing -> Left "unknown table"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (TableSize tableIdx)) =
-            case getTableIndex ctxMod tableIdx of
-                Just tableIdx -> return $ S.TableSize tableIdx
-                Nothing -> Left "unknown table"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (TableFill tableIdx)) =
-            case getTableIndex ctxMod tableIdx of
-                Just tableIdx -> return $ S.TableFill tableIdx
-                Nothing -> Left "unknown table"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (TableGrow tableIdx)) =
-            case getTableIndex ctxMod tableIdx of
-                Just tableIdx -> return $ S.TableGrow tableIdx
-                Nothing -> Left "unknown table"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (TableSet tableIdx)) =
-            case getTableIndex ctxMod tableIdx of
-                Just tableIdx -> return $ S.TableSet tableIdx
-                Nothing -> Left "unknown table"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (TableGet tableIdx)) =
-            case getTableIndex ctxMod tableIdx of
-                Just tableIdx -> return $ S.TableGet tableIdx
-                Nothing -> Left "unknown table"
-        synInstrToStruct FunCtx { ctxMod } (PlainInstr (ElemDrop elemIdx)) =
-            case getElemIndex ctxMod elemIdx of
-                Just elemIdx -> return $ S.ElemDrop elemIdx
-                Nothing -> Left "unknown elem"
         synInstrToStruct _ (PlainInstr (I32Const val)) = return $ S.I32Const $ integerToWord32 val
         synInstrToStruct _ (PlainInstr (I64Const val)) = return $ S.I64Const $ integerToWord64 val
-        synInstrToStruct _ (PlainInstr (F32Const (NanRep Arithmetic))) =
+        synInstrToStruct _ (PlainInstr (F32Const val)) = return $ S.F32Const val
-            Left "arithmetic nan constant allowed only in script"
+        synInstrToStruct _ (PlainInstr (F64Const val)) = return $ S.F64Const val
-        synInstrToStruct _ (PlainInstr (F32Const (NanRep Canonical))) =
-            Left "canonical nan constant allowed only in script"
-        synInstrToStruct _ (PlainInstr (F32Const rep)) = S.F32Const <$> asFloat rep
-        synInstrToStruct _ (PlainInstr (F64Const (NanRep Arithmetic))) =
-            Left "arithmetic nan constant allowed only in script"
-        synInstrToStruct _ (PlainInstr (F64Const (NanRep Canonical))) =
-            Left "canonical nan constant allowed only in script"
-        synInstrToStruct _ (PlainInstr (F64Const rep)) = S.F64Const <$> asDouble rep
         synInstrToStruct _ (PlainInstr (IUnOp sz op)) = return $ S.IUnOp sz op
         synInstrToStruct _ (PlainInstr (IBinOp sz op)) = return $ S.IBinOp sz op
         synInstrToStruct _ (PlainInstr I32Eqz) = return $ S.I32Eqz
@@ -2102,59 +1878,29 @@ desugarize fields = do
 
         -- elem segment
         synElemToStruct :: Module -> ElemSegment -> Either String S.ElemSegment
-        synElemToStruct mod ElemSegment { ident, elemType, mode, elements } = do
+        synElemToStruct mod ElemSegment { tableIndex, offset, funcIndexes } =
-            let ctx = FunCtx mod [] [] []
+            let ctx = FunCtx mod [] [] [] in
-            m <- case mode of {
+            let offsetInstrs = mapM (synInstrToStruct ctx) offset in
-                Active tableIndex offset ->
+            let idx = fromJust $ getTableIndex mod tableIndex in
-                    let offsetInstrs = mapM (synInstrToStruct ctx) offset in
+            let indexes = map (fromJust . getFuncIndex mod) funcIndexes in
-                    let idx = fromJust $ getTableIndex mod tableIndex in
+            S.ElemSegment idx <$> offsetInstrs <*> return indexes
-                    S.Active idx <$> offsetInstrs;
-                Passive -> return S.Passive;
-                Declarative -> return S.Declarative
-            }
-            let elemExprs = mapM (mapM (synInstrToStruct ctx)) elements
-            S.ElemSegment elemType m <$> elemExprs
 
         extractElemSegment :: [ElemSegment] -> ModuleField -> [ElemSegment]
         extractElemSegment elems (MFElem elem) = elem : elems
         extractElemSegment elems _ = elems
 
-        getElemIndex :: Module -> GlobalIndex -> Maybe Natural
-        getElemIndex mod@Module { elems } (Named id) =
-            let isIdent (_, ElemSegment { ident }) = ident == Just id in
-            let elemIndexes = map fst $ filter isIdent $ zip [0..] elems in
-            case elemIndexes of
-                [idx] -> return idx
-                _ -> Nothing
-        getElemIndex _ (Index idx) = Just idx
-
         -- data segment
         synDataToStruct :: Module -> DataSegment -> Either String S.DataSegment
-        synDataToStruct mod DataSegment { dataMode, datastring } = do
+        synDataToStruct mod DataSegment { memIndex, offset, datastring } =
-            m <- case dataMode of
+            let ctx = FunCtx mod [] [] [] in
-                PassiveData -> return S.PassiveData
+            let offsetInstrs = mapM (synInstrToStruct ctx) offset in
-                ActiveData memIndex offset -> do
+            let idx = fromJust $ getMemIndex mod memIndex in
-                    let ctx = FunCtx mod [] [] []
+            S.DataSegment idx <$> offsetInstrs <*> return datastring
-                    offsetInstrs <- mapM (synInstrToStruct ctx) offset
-                    idx <- case getMemIndex mod memIndex of
-                        Just idx -> return idx
-                        Nothing -> throwError "unknown memory"
-                    return $ S.ActiveData idx offsetInstrs
-            return $ S.DataSegment m datastring
 
         extractDataSegment :: [DataSegment] -> ModuleField -> [DataSegment]
         extractDataSegment datas (MFData dataSegment) = dataSegment : datas
         extractDataSegment datas _ = datas
 
-        getDataIndex :: Module -> GlobalIndex -> Maybe Natural
-        getDataIndex mod@Module { datas } (Named id) =
-            let isIdent (_, DataSegment { ident }) = ident == Just id in
-            let dataIndexes = map fst $ filter isIdent $ zip [0..] datas in
-            case dataIndexes of
-                [idx] -> return idx
-                _ -> Nothing
-        getDataIndex _ (Index idx) = Just idx
-
         -- start
         synStartToStruct :: Module -> StartFunction -> S.StartFunction
         synStartToStruct mod (StartFunction funIdx) =
@@ -2170,22 +1916,14 @@ desugarize fields = do
         -- exports
         extractExports :: Module -> [ModuleField] -> [ModuleField]
         extractExports mod mf =
-            let fromImports = foldl' reexport (0, 0, 0, 0, []) $ imports mod in
+            let initial = (funcImportLength, globImportLength, memImportLength, tableImportLength, []) in
-            let (_, _, _, _, result) = foldl' extractExport fromImports mf in
+            let (_, _, _, _, result) = foldl' extractExport initial mf in
             reverse result
             where
-                reexport (fidx, gidx, midx, tidx, mf) (Import {reExportAs, desc = ImportFunc _ _}) =
+                funcImportLength = fromIntegral $ length $ filter isFuncImport $ imports mod
-                    let exports = map (\name -> MFExport $ Export name $ ExportFunc $ Index fidx) reExportAs in
+                globImportLength = fromIntegral $ length $ filter isGlobalImport $ imports mod
-                    (fidx + 1, gidx, midx, tidx, exports ++ mf)
+                memImportLength = fromIntegral $ length $ filter isMemImport $ imports mod
-                reexport (fidx, gidx, midx, tidx, mf) (Import {reExportAs, desc = ImportGlobal _ _}) =
+                tableImportLength = fromIntegral $ length $ filter isTableImport $ imports mod
-                    let exports = map (\name -> MFExport $ Export name $ ExportGlobal $ Index gidx) reExportAs in
-                    (fidx, gidx + 1, midx, tidx, exports ++ mf)
-                reexport (fidx, gidx, midx, tidx, mf) (Import {reExportAs, desc = ImportMemory _ _}) =
-                    let exports = map (\name -> MFExport $ Export name $ ExportMemory $ Index midx) reExportAs in
-                    (fidx, gidx, midx + 1, tidx, exports ++ mf)
-                reexport (fidx, gidx, midx, tidx, mf) (Import {reExportAs, desc = ImportTable _ _}) =
-                    let exports = map (\name -> MFExport $ Export name $ ExportTable $ Index tidx) reExportAs in
-                    (fidx, gidx, midx, tidx + 1, exports ++ mf)
 
                 extractExport (fidx, gidx, midx, tidx, mf) (MFFunc fun@Function{ exportFuncAs }) =
                     let exports = map (\name -> MFExport $ Export name $ ExportFunc $ Index fidx) exportFuncAs in

src/Language/Wasm/Script.hs

@@ -13,7 +13,6 @@ import Control.Monad.IO.Class (liftIO)
 import Numeric.IEEE (identicalIEEE)
 import qualified Control.DeepSeq as DeepSeq
 import Data.Maybe (fromJust, isNothing)
-import Debug.Trace (trace)
 
 import Language.Wasm.Parser (
         Ident(..),
@@ -56,7 +55,6 @@ runScript onAssertFail script = do
     (st, inst) <- Interpreter.makeHostModule Interpreter.emptyStore [
             ("print", hostPrint []),
             ("print_i32", hostPrint [Struct.I32]),
-            ("print_i64", hostPrint [Struct.I64]),
             ("print_i32_f32", hostPrint [Struct.I32, Struct.F32]),
             ("print_f64_f64", hostPrint [Struct.F64, Struct.F64]),
             ("print_f32", hostPrint [Struct.F32]),
@@ -124,10 +122,7 @@ runScript onAssertFail script = do
         asArg [Struct.F32Const v] = Interpreter.VF32 v
         asArg [Struct.I64Const v] = Interpreter.VI64 v
         asArg [Struct.F64Const v] = Interpreter.VF64 v
-        asArg [Struct.RefNull Struct.FuncRef] = Interpreter.RF Nothing
+        asArg _                   = error "Only const instructions supported as arguments for actions"
-        asArg [Struct.RefNull Struct.ExternRef] = Interpreter.RE Nothing
-        asArg [Struct.RefExtern v] = Interpreter.RE (Just v)
-        asArg expr = error $ "Only const instructions supported as arguments for actions: " ++ show expr
 
         runAction :: ScriptState -> Action -> IO (Maybe [Interpreter.Value])
         runAction st (Invoke ident name args) = do
@@ -144,8 +139,6 @@ runScript onAssertFail script = do
         isValueEqual (Interpreter.VI64 v1) (Interpreter.VI64 v2) = v1 == v2
         isValueEqual (Interpreter.VF32 v1) (Interpreter.VF32 v2) = (isNaN v1 && isNaN v2) || identicalIEEE v1 v2
         isValueEqual (Interpreter.VF64 v1) (Interpreter.VF64 v2) = (isNaN v1 && isNaN v2) || identicalIEEE v1 v2
-        isValueEqual (Interpreter.RF f1) (Interpreter.RF f2) = f1 == f2
-        isValueEqual (Interpreter.RE e1) (Interpreter.RE e2) = e1 == e2
         isValueEqual _ _ = False
 
         isNaNReturned :: Action -> Assertion -> AssertM ()
@@ -168,7 +161,7 @@ runScript onAssertFail script = do
             let Right m = Lexer.scanner (TLEncoding.encodeUtf8 textRep) >>= Parser.parseModule in
             (ident, m)
         buildModule (BinaryModDef ident binaryRep) =
-            let Right m = Binary.decodeModuleLazy binaryRep  in
+            let Right m = Binary.decodeModuleLazy binaryRep in
             (ident, m)
 
         checkModuleInvalid :: Struct.Module -> IO ()
@@ -176,13 +169,13 @@ runScript onAssertFail script = do
 
         getFailureString :: Validate.ValidationError -> [TL.Text]
         getFailureString (Validate.TypeMismatch _ _) = ["type mismatch"]
-        getFailureString (Validate.RefTypeMismatch _ _) = ["type mismatch"]
         getFailureString Validate.ResultTypeDoesntMatch = ["type mismatch"]
         getFailureString Validate.MoreThanOneMemory = ["multiple memories"]
+        getFailureString Validate.MoreThanOneTable = ["multiple tables"]
         getFailureString (Validate.LocalIndexOutOfRange idx) = ["unknown local", "unknown local " <> TL.pack (show idx)]
         getFailureString (Validate.MemoryIndexOutOfRange idx) = ["unknown memory", "unknown memory " <> TL.pack (show idx)]
         getFailureString (Validate.TableIndexOutOfRange idx) = ["unknown table", "unknown table " <> TL.pack (show idx)]
-        getFailureString (Validate.FunctionIndexOutOfRange idx) = ["unknown function", "unknown function " <> TL.pack (show idx)]
+        getFailureString Validate.FunctionIndexOutOfRange = ["unknown function", "unknown function 0"]
         getFailureString (Validate.GlobalIndexOutOfRange idx) = ["unknown global", "unknown global " <> TL.pack (show idx)]
         getFailureString Validate.LabelIndexOutOfRange = ["unknown label"]
         getFailureString Validate.TypeIndexOutOfRange = ["unknown type"]
@@ -195,10 +188,7 @@ runScript onAssertFail script = do
         getFailureString Validate.GlobalIsImmutable = ["global is immutable"]
         getFailureString Validate.InvalidStartFunctionType = ["start function"]
         getFailureString Validate.InvalidTableType = ["size minimum must not be greater than maximum"]
-        getFailureString (Validate.ElemIndexOutOfRange idx) = ["unknown elem segment " <> TL.pack (show idx)]
+        getFailureString r = [TL.concat ["not implemented ", (TL.pack $ show r)]]
-        getFailureString (Validate.DataIndexOutOfRange idx) = ["unknown data segment", "unknown data segment " <> TL.pack (show idx)]
-        getFailureString (Validate.UndeclaredFunctionRef _) = ["undeclared function reference"]
-        getFailureString r = [TL.concat ["not implemented ", TL.pack $ show r]]
 
         printFailedAssert :: String -> Assertion -> AssertM ()
         printFailedAssert msg assert = do
@@ -263,14 +253,12 @@ runScript onAssertFail script = do
             let (_, m) = buildModule moduleDef in
             case Validate.validate m of
                 Right m -> do
-                    (st, pos) <- State.get
+                    st <- fst <$> State.get
                     (res, store') <- liftIO $ Interpreter.instantiate (store st) (buildImports st) m
-                    State.put (st { store = store' }, pos)
                     case res of
-                        Left err | err == TL.unpack failureString -> return ()
                         Left "Start function terminated with trap" ->
                             State.modify $ \(st, pos) -> (st { store = store' }, pos)
-                        r -> printFailedAssert "Module linking should fail with trap during execution of a start function" assert
+                        _ -> printFailedAssert ("Module linking should fail with trap during execution of a start function") assert
                 Left reason -> error $ "Module linking failed due to invalid module with reason: " ++ show reason
         runAssert assert@(AssertExhaustion action failureString) = do
             result <- runActionInAssert action

src/Language/Wasm/Structure.hs

@@ -4,10 +4,8 @@
 
 module Language.Wasm.Structure (
     Module(..),
-    DataMode(..),
     DataSegment(..),
     ElemSegment(..),
-    ElemMode(..),
     StartFunction(..),
     Export(..),
     ExportDesc(..),
@@ -104,16 +102,12 @@ type LocalIndex = Natural
 type GlobalIndex = Natural
 type MemoryIndex = Natural
 type TableIndex = Natural
-type DataIndex = Natural
-type ElemIndex = Natural
 
 data ValueType =
     I32
     | I64
     | F32
     | F64
-    | Func
-    | Extern
     deriving (Show, Eq, Generic, NFData)
 
 type ResultType = [ValueType]
@@ -139,15 +133,10 @@ data Instruction index =
     | BrTable [index] index
     | Return
     | Call index
-    | CallIndirect index index
+    | CallIndirect index
-    -- Reference instructions
-    | RefNull ElemType
-    | RefIsNull
-    | RefFunc index
-    | RefExtern Natural
     -- Parametric instructions
     | Drop
-    | Select (Maybe [ValueType])
+    | Select
     -- Variable instructions
     | GetLocal index
     | SetLocal index
@@ -178,21 +167,8 @@ data Instruction index =
     | I64Store8 MemArg
     | I64Store16 MemArg
     | I64Store32 MemArg
-    | MemorySize
+    | CurrentMemory
-    | MemoryGrow
+    | GrowMemory
-    | MemoryFill
-    | MemoryCopy
-    | MemoryInit DataIndex
-    | DataDrop DataIndex
-    -- Table instructions
-    | TableInit TableIndex ElemIndex
-    | TableGrow TableIndex
-    | TableSize TableIndex
-    | TableFill TableIndex
-    | TableGet TableIndex
-    | TableSet TableIndex
-    | TableCopy TableIndex TableIndex
-    | ElemDrop ElemIndex
     -- Numeric instructions
     | I32Const Word32
     | I64Const Word64
@@ -231,7 +207,7 @@ data Function = Function {
 
 data Limit = Limit Natural (Maybe Natural) deriving (Show, Eq, Generic, NFData)
 
-data ElemType = FuncRef | ExternRef deriving (Show, Eq, Generic, NFData)
+data ElemType = FuncRef deriving (Show, Eq, Generic, NFData)
 
 data TableType = TableType Limit ElemType deriving (Show, Eq, Generic, NFData)
 
@@ -246,25 +222,15 @@ data Global = Global {
     initializer :: Expression
 } deriving (Show, Eq, Generic, NFData)
 
-data ElemMode =
-    Passive
-    | Active TableIndex Expression
-    | Declarative
-    deriving (Show, Eq, Generic, NFData)
-
 data ElemSegment = ElemSegment {
-    elemType :: ElemType,
+    tableIndex :: TableIndex,
-    mode :: ElemMode,
+    offset :: Expression,
-    elements :: [Expression]
+    funcIndexes :: [FuncIndex]
 } deriving (Show, Eq, Generic, NFData)
 
-data DataMode =
-    PassiveData
-    | ActiveData MemoryIndex Expression
-    deriving (Show, Eq, Generic, NFData)
-
 data DataSegment = DataSegment {
-    dataMode :: DataMode,
+    memIndex :: MemoryIndex,
+    offset :: Expression,
     chunk :: LBS.ByteString
 } deriving (Show, Eq, Generic, NFData)
 

src/Language/Wasm/Validate.hs

@@ -15,11 +15,11 @@ import Language.Wasm.Structure
 import qualified Data.Set as Set
 import Data.List (foldl')
 import qualified Data.Text.Lazy as TL
-import Data.Maybe (fromMaybe, catMaybes)
+import Data.Maybe (fromMaybe, maybeToList, catMaybes)
 import Numeric.Natural (Natural)
 import Prelude hiding ((<>))
 
-import Control.Monad (foldM, forM_, when, unless)
+import Control.Monad (foldM)
 import Control.Monad.Reader (ReaderT, runReaderT, withReaderT, ask)
 import Control.Monad.Except (Except, runExcept, throwError)
 
@@ -32,23 +32,20 @@ data ValidationError =
     | MemoryLimitExceeded
     | AlignmentOverflow
     | MoreThanOneMemory
-    | FunctionIndexOutOfRange Natural
+    | MoreThanOneTable
+    | FunctionIndexOutOfRange
     | TableIndexOutOfRange Natural
     | MemoryIndexOutOfRange Natural
     | LocalIndexOutOfRange Natural
     | GlobalIndexOutOfRange Natural
-    | ElemIndexOutOfRange Natural
-    | DataIndexOutOfRange Natural
     | LabelIndexOutOfRange
     | TypeIndexOutOfRange
     | ResultTypeDoesntMatch
     | TypeMismatch { actual :: Arrow, expected :: Arrow }
-    | RefTypeMismatch ElemType ElemType
     | InvalidResultArity
     | InvalidConstantExpr
     | InvalidStartFunctionType
     | GlobalIsImmutable
-    | UndeclaredFunctionRef Natural
     deriving (Show, Eq)
 
 type ValidationResult = Either ValidationError ()
@@ -65,14 +62,13 @@ instance Monoid ValidationResult where
 
 isValid :: ValidationResult -> Bool
 isValid (Right ()) = True
-isValid (Left reason) = False
+isValid (Left reason) = Debug.trace ("Module mismatched with reason " ++ show reason) $ False
 
 type Validator = Module -> ValidationResult
 
 data VType =
     Val ValueType
     | Var
-    | NonRefVar
     | Any
     deriving (Show, Eq)
 
@@ -107,11 +103,6 @@ asArrow (FuncType params results) = Arrow (map Val params) (map Val $ reverse re
 isArrowMatch :: Arrow -> Arrow -> Bool
 isArrowMatch (f `Arrow` t) ( f' `Arrow` t') = isEndMatch f f' && isEndMatch t t'
     where
-        isRef :: VType -> Bool
-        isRef (Val Func) = True
-        isRef (Val Extern) = True
-        isRef _            = False
-
         isEndMatch :: End -> End -> Bool
         isEndMatch (Any:l) (Any:r) =
             let (leftTail, rightTail) = unzip $ zip (takeWhile (/= Any) $ reverse l) (takeWhile (/= Any) $ reverse r) in
@@ -128,12 +119,6 @@ isArrowMatch (f `Arrow` t) ( f' `Arrow` t') = isEndMatch f f' && isEndMatch t t'
         isEndMatch (x:l) (Var:r) =
             let subst = replace Var x in
             isEndMatch (subst l) (subst r)
-        isEndMatch (NonRefVar:l) (x:r) =
-            let subst = replace NonRefVar x in
-            isEndMatch (subst l) (subst r)
-        isEndMatch (x:l) (NonRefVar:r) =
-            let subst = replace NonRefVar x in
-            isEndMatch (subst l) (subst r)
         isEndMatch (Val v:l) (Val v':r) = v == v' && isEndMatch l r
         isEndMatch [] [] = True
         isEndMatch _ _ = False
@@ -141,16 +126,13 @@ isArrowMatch (f `Arrow` t) ( f' `Arrow` t') = isEndMatch f f' && isEndMatch t t'
 data Ctx = Ctx {
     types :: [FuncType],
     funcs :: [FuncType],
-    tableTypes :: [TableType],
+    tables :: [TableType],
-    elems :: [ElemType],
-    datas :: [DataMode],
     mems :: [Limit],
     globals :: [GlobalType],
     locals :: [ValueType],
     labels :: [[ValueType]],
     returns :: [ValueType],
-    importedGlobals :: Natural,
+    importedGlobals :: Natural
-    refs :: Set.Set Natural
 } deriving (Show, Eq)
 
 type Checker = ReaderT Ctx (Except ValidationError)
@@ -215,28 +197,24 @@ getResultType (TypeIndex typeIdx) = do
     Ctx { types } <- ask
     maybeToEither TypeIndexOutOfRange $ results <$> types !? typeIdx
 
-elemTypeToRefType :: ElemType -> ValueType 
+getInstrType :: Instruction Natural -> Checker Arrow
-elemTypeToRefType FuncRef = Func
+getInstrType Unreachable = return $ Any ==> Any
-elemTypeToRefType ExternRef = Extern
+getInstrType Nop = return $ empty ==> empty
-
+getInstrType Block { blockType, body } = do
-getInstrType :: [VType] -> Instruction Natural -> Checker Arrow
-getInstrType _ Unreachable = return $ Any ==> Any
-getInstrType _ Nop = return $ empty ==> empty
-getInstrType _ Block { blockType, body } = do
     bt@(Arrow from _) <- getBlockType blockType
     resultType <- getResultType blockType
     t <- withLabel resultType $ getExpressionTypeWithInput from body
     if isArrowMatch t bt
     then return bt
     else throwError $ TypeMismatch t bt
-getInstrType _ Loop { blockType, body } = do
+getInstrType Loop { blockType, body } = do
     bt@(Arrow from _) <- getBlockType blockType
     resultType <- getResultType blockType
     t <- withLabel (map (\(Val v) -> v) from) $ getExpressionTypeWithInput from body
     if isArrowMatch t bt
     then return bt
     else throwError $ TypeMismatch t bt
-getInstrType _ If { blockType, true, false } = do
+getInstrType If { blockType, true, false } = do
     bt@(Arrow from _) <- getBlockType blockType
     resultType <- getResultType blockType
     l <- withLabel resultType $ getExpressionTypeWithInput from true
@@ -249,271 +227,184 @@ getInstrType _ If { blockType, true, false } = do
             else (throwError $ TypeMismatch r bt)
         )
     else throwError $ TypeMismatch l bt
-getInstrType _ (Br lbl) = do
+getInstrType (Br lbl) = do
     r <- map Val <$> getLabel lbl
     return $ (Any : r) ==> Any
-getInstrType _ (BrIf lbl) = do
+getInstrType (BrIf lbl) = do
     r <- map Val <$> getLabel lbl
     return $ (r ++ [Val I32]) ==> r
-getInstrType stack (BrTable lbls lbl) = do
+getInstrType (BrTable lbls lbl) = do
     r <- getLabel lbl
-    let returns lbl = do
+    rs <- mapM getLabel lbls
-            args <- map Val <$> getLabel lbl
+    if all (== r) rs
-            res <- matchStack stack (Val I32 : reverse args) []
-            return (args, res)
-    alternatives <- mapM returns lbls
-    (_, def) <- returns lbl
-    if all (\(args, res) -> res == def && length args == length r) alternatives
     then return $ ([Any] ++ (map Val r) ++ [Val I32]) ==> Any
     else throwError ResultTypeDoesntMatch
-getInstrType _ Return = do
+getInstrType Return = do
     Ctx { returns } <- ask
     return $ (Any : (map Val returns)) ==> Any
-getInstrType _ (Call fun) = do
+getInstrType (Call fun) = do
     Ctx { funcs } <- ask
-    maybeToEither (FunctionIndexOutOfRange fun) $ asArrow <$> funcs !? fun
+    maybeToEither FunctionIndexOutOfRange $ asArrow <$> funcs !? fun
-getInstrType _ (CallIndirect tableIdx sign) = do
+getInstrType (CallIndirect sign) = do
-    Ctx { types, tableTypes = tables } <- ask
+    Ctx { types, tables } <- ask
-    if length tables <= fromIntegral tableIdx
+    if length tables < 1
-    then throwError (TableIndexOutOfRange tableIdx)
+    then throwError (TableIndexOutOfRange 0)
     else do
         Arrow from to <- maybeToEither TypeIndexOutOfRange $ asArrow <$> types !? sign
         return $ (from ++ [Val I32]) ==> to
-getInstrType _ Drop = do
+getInstrType Drop = do
     var <- freshVar
     return $ var ==> empty
-getInstrType _ (Select Nothing) = do
+getInstrType Select = do
-    var <- return NonRefVar
-    return $ [var, var, Val I32] ==> var
-getInstrType _ (Select (Just vt)) =
-    case vt of
-        [t] -> return $ [t, t, I32] ==> t
-        _ -> throwError InvalidResultArity
-getInstrType _ (RefNull elType) = do
-    let t = case elType of { FuncRef -> Func; ExternRef -> Extern }
-    return $ empty ==> Val t
-getInstrType _ RefIsNull = do
     var <- freshVar
-    return $ var ==> Val I32
+    return $ [var, var, Val I32] ==> var
-getInstrType _ (RefFunc funIdx) = do
+getInstrType (GetLocal local) = do
-    Ctx { funcs, refs } <- ask
-    if fromIntegral funIdx < length funcs
-    then do
-        unless (Set.member funIdx refs) $
-            throwError $ UndeclaredFunctionRef $ fromIntegral funIdx
-        return $ empty ==> Val Func
-    else throwError $ FunctionIndexOutOfRange $ fromIntegral funIdx
-getInstrType _ (GetLocal local) = do
     Ctx { locals }  <- ask
     t <- maybeToEither (LocalIndexOutOfRange local) $ locals !? local
     return $ empty ==> Val t
-getInstrType _ (SetLocal local) = do
+getInstrType (SetLocal local) = do
     Ctx { locals } <- ask
     t <- maybeToEither (LocalIndexOutOfRange local) $ locals !? local
     return $ Val t ==> empty
-getInstrType _ (TeeLocal local) = do
+getInstrType (TeeLocal local) = do
     Ctx { locals } <- ask
     t <- maybeToEither (LocalIndexOutOfRange local) $ locals !? local
     return $ Val t ==> Val t
-getInstrType _ (GetGlobal global) = do
+getInstrType (GetGlobal global) = do
     Ctx { globals } <- ask
     t <- maybeToEither (GlobalIndexOutOfRange global) $ asType <$> globals !? global
     return $ empty ==> t
-getInstrType _ (SetGlobal global) = do
+getInstrType (SetGlobal global) = do
     Ctx { globals } <- ask
     t <- maybeToEither (GlobalIndexOutOfRange global) $ asType <$> globals !? global
     shouldBeMut $ globals !! fromIntegral global
     return $ t ==> empty
-getInstrType _ (I32Load memarg) = do
+getInstrType (I32Load memarg) = do
     checkMemoryInstr 4 memarg
     return $ I32 ==> I32
-getInstrType _ (I64Load memarg) = do
+getInstrType (I64Load memarg) = do
     checkMemoryInstr 8 memarg
     return $ I32 ==> I64
-getInstrType _ (F32Load memarg) = do
+getInstrType (F32Load memarg) = do
     checkMemoryInstr 4 memarg
     return $ I32 ==> F32
-getInstrType _ (F64Load memarg) = do
+getInstrType (F64Load memarg) = do
     checkMemoryInstr 8 memarg
     return $ I32 ==> F64
-getInstrType _ (I32Load8S memarg) = do
+getInstrType (I32Load8S memarg) = do
     checkMemoryInstr 1 memarg
     return $ I32 ==> I32
-getInstrType _ (I32Load8U memarg) = do
+getInstrType (I32Load8U memarg) = do
     checkMemoryInstr 1 memarg
     return $ I32 ==> I32
-getInstrType _ (I32Load16S memarg) = do
+getInstrType (I32Load16S memarg) = do
     checkMemoryInstr 2 memarg
     return $ I32 ==> I32
-getInstrType _ (I32Load16U memarg) = do
+getInstrType (I32Load16U memarg) = do
     checkMemoryInstr 2 memarg
     return $ I32 ==> I32
-getInstrType _ (I64Load8S memarg) = do
+getInstrType (I64Load8S memarg) = do
     checkMemoryInstr 1 memarg
     return $ I32 ==> I64
-getInstrType _ (I64Load8U memarg) = do
+getInstrType (I64Load8U memarg) = do
     checkMemoryInstr 1 memarg
     return $ I32 ==> I64
-getInstrType _ (I64Load16S memarg) = do
+getInstrType (I64Load16S memarg) = do
     checkMemoryInstr 2 memarg
     return $ I32 ==> I64
-getInstrType _ (I64Load16U memarg) = do
+getInstrType (I64Load16U memarg) = do
     checkMemoryInstr 2 memarg
     return $ I32 ==> I64
-getInstrType _ (I64Load32S memarg) = do
+getInstrType (I64Load32S memarg) = do
     checkMemoryInstr 4 memarg
     return $ I32 ==> I64
-getInstrType _ (I64Load32U memarg) = do
+getInstrType (I64Load32U memarg) = do
     checkMemoryInstr 4 memarg
     return $ I32 ==> I64
-getInstrType _ (I32Store memarg) = do
+getInstrType (I32Store memarg) = do
     checkMemoryInstr 4 memarg
     return $ [I32, I32] ==> empty
-getInstrType _ (I64Store memarg) = do
+getInstrType (I64Store memarg) = do
     checkMemoryInstr 8 memarg
     return $ [I32, I64] ==> empty
-getInstrType _ (F32Store memarg) = do
+getInstrType (F32Store memarg) = do
     checkMemoryInstr 4 memarg
     return $ [I32, F32] ==> empty
-getInstrType _ (F64Store memarg) = do
+getInstrType (F64Store memarg) = do
     checkMemoryInstr 8 memarg
     return $ [I32, F64] ==> empty
-getInstrType _ (I32Store8 memarg) = do
+getInstrType (I32Store8 memarg) = do
     checkMemoryInstr 1 memarg
     return $ [I32, I32] ==> empty
-getInstrType _ (I32Store16 memarg) = do
+getInstrType (I32Store16 memarg) = do
     checkMemoryInstr 2 memarg
     return $ [I32, I32] ==> empty
-getInstrType _ (I64Store8 memarg) = do
+getInstrType (I64Store8 memarg) = do
     checkMemoryInstr 1 memarg
     return $ [I32, I64] ==> empty
-getInstrType _ (I64Store16 memarg) = do
+getInstrType (I64Store16 memarg) = do
     checkMemoryInstr 2 memarg
     return $ [I32, I64] ==> empty
-getInstrType _ (I64Store32 memarg) = do
+getInstrType (I64Store32 memarg) = do
     checkMemoryInstr 4 memarg
     return $ [I32, I64] ==> empty
-getInstrType _ MemorySize = do
+getInstrType CurrentMemory = do
     Ctx { mems } <- ask 
-    when (length mems < 1) $ throwError (MemoryIndexOutOfRange 0)
+    if length mems < 1 then throwError (MemoryIndexOutOfRange 0) else return $ empty ==> I32
-    return $ empty ==> I32
+getInstrType GrowMemory = do
-getInstrType _ MemoryGrow = do
     Ctx { mems } <- ask 
-    when (length mems < 1) $ throwError (MemoryIndexOutOfRange 0)
+    if length mems < 1 then throwError (MemoryIndexOutOfRange 0) else return $ I32 ==> I32
-    return $ I32 ==> I32
+getInstrType (I32Const _) = return $ empty ==> I32
-getInstrType _ MemoryFill = do
+getInstrType (I64Const _) = return $ empty ==> I64
-    Ctx { mems } <- ask
+getInstrType (F32Const _) = return $ empty ==> F32
-    when (length mems < 1) $ throwError (MemoryIndexOutOfRange 0)
+getInstrType (F64Const _) = return $ empty ==> F64
-    return $ [I32, I32, I32] ==> empty
+getInstrType (IUnOp BS32 _) = return $ I32 ==> I32
-getInstrType _ MemoryCopy = do
+getInstrType (IUnOp BS64 _) = return $ I64 ==> I64
-    Ctx { mems } <- ask
+getInstrType (IBinOp BS32 _) = return $ [I32, I32] ==> I32
-    when (length mems < 1) $ throwError (MemoryIndexOutOfRange 0)
+getInstrType (IBinOp BS64 _) = return $ [I64, I64] ==> I64
-    return $ [I32, I32, I32] ==> empty
+getInstrType I32Eqz = return $ I32 ==> I32
-getInstrType _ (MemoryInit dataIdx) = do
+getInstrType I64Eqz = return $ I64 ==> I32
-    Ctx { mems, datas } <- ask
+getInstrType (IRelOp BS32 _) = return $ [I32, I32] ==> I32
-    when (length mems < 1) $ throwError (MemoryIndexOutOfRange 0)
+getInstrType (IRelOp BS64 _) = return $ [I64, I64] ==> I32
-    when (length datas <= fromIntegral dataIdx) $ throwError (DataIndexOutOfRange dataIdx)
+getInstrType (FUnOp BS32 _) = return $ F32 ==> F32
-    return $ [I32, I32, I32] ==> empty
+getInstrType (FUnOp BS64 _) = return $ F64 ==> F64
-getInstrType _ (DataDrop dataIdx) = do
+getInstrType (FBinOp BS32 _) = return $ [F32, F32] ==> F32
-    Ctx { datas } <- ask
+getInstrType (FBinOp BS64 _) = return $ [F64, F64] ==> F64
-    when (length datas <= fromIntegral dataIdx) $ throwError (DataIndexOutOfRange dataIdx)
+getInstrType (FRelOp BS32 _) = return $ [F32, F32] ==> I32
-    return $ empty ==> empty
+getInstrType (FRelOp BS64 _) = return $ [F64, F64] ==> I32
-getInstrType _ (TableInit tableIdx elemIdx) = do
+getInstrType I32WrapI64 = return $ I64 ==> I32
-    Ctx { tableTypes = tables, elems } <- ask
+getInstrType (ITruncFU BS32 BS32) = return $ F32 ==> I32
-    when (length tables <= fromIntegral tableIdx) $ throwError (TableIndexOutOfRange tableIdx)
+getInstrType (ITruncFU BS32 BS64) = return $ F64 ==> I32
-    when (length elems <= fromIntegral elemIdx) $ throwError (ElemIndexOutOfRange elemIdx)
+getInstrType (ITruncFU BS64 BS32) = return $ F32 ==> I64
-    let TableType _ tableType = tables !! fromIntegral tableIdx
+getInstrType (ITruncFU BS64 BS64) = return $ F64 ==> I64
-    let elemType = elems !! fromIntegral elemIdx
+getInstrType (ITruncFS BS32 BS32) = return $ F32 ==> I32
-    when (elemType /= tableType) $ throwError (RefTypeMismatch tableType elemType)
+getInstrType (ITruncFS BS32 BS64) = return $ F64 ==> I32
-    return $ [I32, I32, I32] ==> empty
+getInstrType (ITruncFS BS64 BS32) = return $ F32 ==> I64
-getInstrType _ (TableCopy toIdx fromIdx) = do
+getInstrType (ITruncFS BS64 BS64) = return $ F64 ==> I64
-    Ctx { tableTypes = tables } <- ask
+getInstrType (ITruncSatFU BS32 BS32) = return $ F32 ==> I32
-    let (from, to) = (fromIntegral fromIdx, fromIntegral toIdx)
+getInstrType (ITruncSatFU BS32 BS64) = return $ F64 ==> I32
-    when (length tables <= from) $ throwError (TableIndexOutOfRange fromIdx)
+getInstrType (ITruncSatFU BS64 BS32) = return $ F32 ==> I64
-    when (length tables <= to) $ throwError (TableIndexOutOfRange toIdx)
+getInstrType (ITruncSatFU BS64 BS64) = return $ F64 ==> I64
-    let TableType _ fromType = tables !! from
+getInstrType (ITruncSatFS BS32 BS32) = return $ F32 ==> I32
-    let TableType _ toType = tables !! to
+getInstrType (ITruncSatFS BS32 BS64) = return $ F64 ==> I32
-    when (fromType /= toType) $ throwError (RefTypeMismatch fromType toType)
+getInstrType (ITruncSatFS BS64 BS32) = return $ F32 ==> I64
-    return $ [I32, I32, I32] ==> empty
+getInstrType (ITruncSatFS BS64 BS64) = return $ F64 ==> I64
-getInstrType _ (TableFill tableIdx) = do
+getInstrType I64ExtendSI32 = return $ I32 ==> I64
-    Ctx { tableTypes = tables } <- ask
+getInstrType I64ExtendUI32 = return $ I32 ==> I64
-    when (length tables <= fromIntegral tableIdx) $ throwError (TableIndexOutOfRange tableIdx)
+getInstrType (FConvertIU BS32 BS32) = return $ I32 ==> F32
-    let TableType _ tableType = tables !! fromIntegral tableIdx
+getInstrType (FConvertIU BS32 BS64) = return $ I64 ==> F32
-    return $ [I32, elemTypeToRefType tableType, I32] ==> empty
+getInstrType (FConvertIU BS64 BS32) = return $ I32 ==> F64
-getInstrType _ (TableSize tableIdx) = do
+getInstrType (FConvertIU BS64 BS64) = return $ I64 ==> F64
-    Ctx { tableTypes = tables } <- ask
+getInstrType (FConvertIS BS32 BS32) = return $ I32 ==> F32
-    when (length tables <= fromIntegral tableIdx) $ throwError (TableIndexOutOfRange tableIdx)
+getInstrType (FConvertIS BS32 BS64) = return $ I64 ==> F32
-    return $ empty ==> I32
+getInstrType (FConvertIS BS64 BS32) = return $ I32 ==> F64
-getInstrType _ (TableGrow tableIdx) = do
+getInstrType (FConvertIS BS64 BS64) = return $ I64 ==> F64
-    Ctx { tableTypes = tables } <- ask
+getInstrType F32DemoteF64 = return $ F64 ==> F32
-    when (length tables <= fromIntegral tableIdx) $ throwError (TableIndexOutOfRange tableIdx)
+getInstrType F64PromoteF32 = return $ F32 ==> F64
-    let TableType _ tableType = tables !! fromIntegral tableIdx
+getInstrType (IReinterpretF BS32) = return $ F32 ==> I32
-    return $ [elemTypeToRefType tableType, I32] ==> I32
+getInstrType (IReinterpretF BS64) = return $ F64 ==> I64
-getInstrType _ (TableGet tableIdx) = do
+getInstrType (FReinterpretI BS32) = return $ I32 ==> F32
-    Ctx { tableTypes = tables } <- ask
+getInstrType (FReinterpretI BS64) = return $ I64 ==> F64
-    when (length tables <= fromIntegral tableIdx) $ throwError (TableIndexOutOfRange tableIdx)
-    let TableType _ tableType = tables !! fromIntegral tableIdx
-    return $ I32 ==> (elemTypeToRefType tableType)
-getInstrType _ (TableSet tableIdx) = do
-    Ctx { tableTypes = tables } <- ask
-    when (length tables <= fromIntegral tableIdx) $ throwError (TableIndexOutOfRange tableIdx)
-    let TableType _ tableType = tables !! fromIntegral tableIdx
-    return $ [I32, elemTypeToRefType tableType] ==> empty
-getInstrType _ (ElemDrop elemIdx) = do
-    Ctx { elems } <- ask
-    when (length elems <= fromIntegral elemIdx) $ throwError (ElemIndexOutOfRange elemIdx)
-    return $ empty ==> empty
-getInstrType _ (I32Const _) = return $ empty ==> I32
-getInstrType _ (I64Const _) = return $ empty ==> I64
-getInstrType _ (F32Const _) = return $ empty ==> F32
-getInstrType _ (F64Const _) = return $ empty ==> F64
-getInstrType _ (IUnOp BS32 _) = return $ I32 ==> I32
-getInstrType _ (IUnOp BS64 _) = return $ I64 ==> I64
-getInstrType _ (IBinOp BS32 _) = return $ [I32, I32] ==> I32
-getInstrType _ (IBinOp BS64 _) = return $ [I64, I64] ==> I64
-getInstrType _ I32Eqz = return $ I32 ==> I32
-getInstrType _ I64Eqz = return $ I64 ==> I32
-getInstrType _ (IRelOp BS32 _) = return $ [I32, I32] ==> I32
-getInstrType _ (IRelOp BS64 _) = return $ [I64, I64] ==> I32
-getInstrType _ (FUnOp BS32 _) = return $ F32 ==> F32
-getInstrType _ (FUnOp BS64 _) = return $ F64 ==> F64
-getInstrType _ (FBinOp BS32 _) = return $ [F32, F32] ==> F32
-getInstrType _ (FBinOp BS64 _) = return $ [F64, F64] ==> F64
-getInstrType _ (FRelOp BS32 _) = return $ [F32, F32] ==> I32
-getInstrType _ (FRelOp BS64 _) = return $ [F64, F64] ==> I32
-getInstrType _ I32WrapI64 = return $ I64 ==> I32
-getInstrType _ (ITruncFU BS32 BS32) = return $ F32 ==> I32
-getInstrType _ (ITruncFU BS32 BS64) = return $ F64 ==> I32
-getInstrType _ (ITruncFU BS64 BS32) = return $ F32 ==> I64
-getInstrType _ (ITruncFU BS64 BS64) = return $ F64 ==> I64
-getInstrType _ (ITruncFS BS32 BS32) = return $ F32 ==> I32
-getInstrType _ (ITruncFS BS32 BS64) = return $ F64 ==> I32
-getInstrType _ (ITruncFS BS64 BS32) = return $ F32 ==> I64
-getInstrType _ (ITruncFS BS64 BS64) = return $ F64 ==> I64
-getInstrType _ (ITruncSatFU BS32 BS32) = return $ F32 ==> I32
-getInstrType _ (ITruncSatFU BS32 BS64) = return $ F64 ==> I32
-getInstrType _ (ITruncSatFU BS64 BS32) = return $ F32 ==> I64
-getInstrType _ (ITruncSatFU BS64 BS64) = return $ F64 ==> I64
-getInstrType _ (ITruncSatFS BS32 BS32) = return $ F32 ==> I32
-getInstrType _ (ITruncSatFS BS32 BS64) = return $ F64 ==> I32
-getInstrType _ (ITruncSatFS BS64 BS32) = return $ F32 ==> I64
-getInstrType _ (ITruncSatFS BS64 BS64) = return $ F64 ==> I64
-getInstrType _ I64ExtendSI32 = return $ I32 ==> I64
-getInstrType _ I64ExtendUI32 = return $ I32 ==> I64
-getInstrType _ (FConvertIU BS32 BS32) = return $ I32 ==> F32
-getInstrType _ (FConvertIU BS32 BS64) = return $ I64 ==> F32
-getInstrType _ (FConvertIU BS64 BS32) = return $ I32 ==> F64
-getInstrType _ (FConvertIU BS64 BS64) = return $ I64 ==> F64
-getInstrType _ (FConvertIS BS32 BS32) = return $ I32 ==> F32
-getInstrType _ (FConvertIS BS32 BS64) = return $ I64 ==> F32
-getInstrType _ (FConvertIS BS64 BS32) = return $ I32 ==> F64
-getInstrType _ (FConvertIS BS64 BS64) = return $ I64 ==> F64
-getInstrType _ F32DemoteF64 = return $ F64 ==> F32
-getInstrType _ F64PromoteF32 = return $ F32 ==> F64
-getInstrType _ (IReinterpretF BS32) = return $ F32 ==> I32
-getInstrType _ (IReinterpretF BS64) = return $ F64 ==> I64
-getInstrType _ (FReinterpretI BS32) = return $ I32 ==> F32
-getInstrType _ (FReinterpretI BS64) = return $ I64 ==> F64
 
 
 replace :: (Eq a) => a -> a -> [a] -> [a]
@@ -525,46 +416,25 @@ getExpressionTypeWithInput inp = fmap (inp `Arrow`) . foldM go inp
     where
         go :: [VType] -> Instruction Natural -> Checker [VType]
         go stack instr = do
-            (f `Arrow` t) <- getInstrType stack instr
+            (f `Arrow` t) <- getInstrType instr
             matchStack stack (reverse f) t
         
-isRef :: ValueType -> Bool
+        matchStack :: [VType] -> [VType] -> [VType] -> Checker [VType]
-isRef (Func)   = True
+        matchStack stack@(Any:_) _arg res = return $ res ++ stack
-isRef (Extern) = True
+        matchStack (Val v:stack) (Val v':args) res =
-isRef _        = False
+            if v == v'
-
+            then matchStack stack args res
-matchStack :: [VType] -> [VType] -> [VType] -> Checker [VType]
+            else throwError $ TypeMismatch ((reverse $ Val v':args) `Arrow` res) ([] `Arrow` (Val v:stack))
-matchStack stack@(Any:_) _arg res = return $ res ++ stack
+        matchStack _ (Any:_) res = return $ res
-matchStack (Val v:stack) (Val v':args) res =
+        matchStack (Val v:stack) (Var:args) res =
-    if v == v'
+            let subst = replace Var (Val v) in
-    then matchStack stack args res
+            matchStack stack (subst args) (subst res)
-    else throwError $ TypeMismatch ((reverse $ Val v':args) `Arrow` res) ([] `Arrow` (Val v:stack))
+        matchStack (Var:stack) (Val v:args) res =
-matchStack _ (Any:_) res = return $ res
+            let subst = replace Var (Val v) in
-matchStack (Val v:stack) (Var:args) res =
+            matchStack stack (subst args) (subst res)
-    let subst = replace Var (Val v) in
+        matchStack stack [] res = return $ res ++ stack
-    matchStack stack (subst args) (subst res)
+        matchStack [] args res = throwError $ TypeMismatch ((reverse args) `Arrow` res) ([] `Arrow` [])
-matchStack (Var:stack) (Val v:args) res =
+        matchStack _ _ _ = error "inconsistent checker state"
-    let subst = replace Var (Val v) in
-    matchStack stack (subst args) (subst res)
-matchStack (Val v:stack) (NonRefVar:args) res =
-    let subst = replace NonRefVar (Val v) in
-    if isRef v
-    then throwError $ TypeMismatch (empty ==> empty) (empty ==> empty)
-    else matchStack stack (subst args) (subst res)
-matchStack (NonRefVar:stack) (Val v:args) res =
-    let subst = replace NonRefVar (Val v) in
-    if isRef v
-    then throwError $ TypeMismatch (empty ==> empty) (empty ==> empty)
-    else matchStack stack (subst args) (subst res)
-matchStack (Var:stack) (NonRefVar:args) res =
-    let subst = replace NonRefVar NonRefVar in
-    matchStack stack (subst args) (subst res)
-matchStack (NonRefVar:stack) (Var:args) res =
-    let subst = replace Var NonRefVar in
-    matchStack stack (subst args) (subst res)
-matchStack stack [] res = return $ res ++ stack
-matchStack [] args res = throwError $ TypeMismatch ((reverse args) `Arrow` res) ([] `Arrow` [])
-matchStack st args res = error $ "inconsistent checker state: " ++ show (st, args, res)
 
 getExpressionType :: Expression -> Checker Arrow
 getExpressionType = getExpressionTypeWithInput []
@@ -575,8 +445,6 @@ isConstExpression ((I32Const _):rest) = isConstExpression rest
 isConstExpression ((I64Const _):rest) = isConstExpression rest
 isConstExpression ((F32Const _):rest) = isConstExpression rest
 isConstExpression ((F64Const _):rest) = isConstExpression rest
-isConstExpression ((RefNull _):rest) = isConstExpression rest
-isConstExpression ((RefFunc _):rest) = isConstExpression rest
 isConstExpression ((GetGlobal idx):rest) = do
     Ctx {globals, importedGlobals} <- ask
     if importedGlobals <= idx
@@ -596,26 +464,20 @@ getFuncTypes Module {types, functions, imports} =
         getFuncType _ = Nothing
 
 ctxFromModule :: [ValueType] -> [[ValueType]] -> [ValueType] -> Module -> Ctx
-ctxFromModule locals labels returns m =
+ctxFromModule locals labels returns m@Module {types, tables, mems, globals, imports} =
-    let Module {types, tables, mems, globals, imports, elems, exports, datas} = m in
     let tableImports = catMaybes $ map getTableType imports in
     let memsImports = catMaybes $ map getMemType imports in
     let globalImports = catMaybes $ map getGlobalType imports in
     Ctx {
         types,
         funcs = getFuncTypes m,
-        tableTypes = tableImports ++ map (\(Table t) -> t) tables,
+        tables = tableImports ++ map (\(Table t) -> t) tables,
-        elems = map elemType elems,
-        datas = map dataMode datas,
         mems = memsImports ++ map (\(Memory l) -> l) mems,
         globals = globalImports ++ map (\(Global g _) -> g) globals,
         locals,
         labels,
         returns,
-        importedGlobals = fromIntegral $ length globalImports,
+        importedGlobals = fromIntegral $ length globalImports
-        refs = Set.unions $ map getElemRefs elems
-            ++ map getGlobalRefs globals
-            ++ map getExportRefs exports
     }
     where
         getTableType (Import _ _ (ImportTable tableType)) = Just tableType
@@ -627,19 +489,6 @@ ctxFromModule locals labels returns m =
         getGlobalType (Import _ _ (ImportGlobal gl)) = Just gl
         getGlobalType _ = Nothing
 
-        getElemRefs ElemSegment{ elemType = FuncRef, elements} =
-            foldl extractRef Set.empty elements
-            where
-                extractRef refs [RefFunc idx] = Set.insert idx refs
-                extractRef refs _ = refs
-        getElemRefs _ = Set.empty
-
-        getGlobalRefs Global {initializer = [RefFunc idx]} = Set.singleton idx
-        getGlobalRefs _ = Set.empty
-
-        getExportRefs Export {desc = ExportFunc idx} = Set.singleton idx
-        getExportRefs _ = Set.empty
-
 isFunctionValid :: Function -> Validator
 isFunctionValid Function {funcType, localTypes = locals, body} mod@Module {types} =
     if fromIntegral funcType < length types
@@ -660,7 +509,10 @@ tablesShouldBeValid :: Validator
 tablesShouldBeValid Module { imports, tables } =
     let tableImports = filter isTableImport imports in
     let res = foldMap (\Import { desc = ImportTable t } -> isValidTableType t) tableImports in
-    foldl' (\r (Table t) -> r <> isValidTableType t) res tables
+    let res' = foldl' (\r (Table t) -> r <> isValidTableType t) res tables in
+    if length tableImports + length tables <= 1
+        then res'
+        else Left MoreThanOneTable
     where
         isValidTableType :: TableType -> ValidationResult
         isValidTableType (TableType (Limit min max) _) =
@@ -705,30 +557,24 @@ elemsShouldBeValid m@Module { elems, functions, tables, imports } =
     foldMap (isElemValid ctx) elems
     where
         isElemValid :: Ctx -> ElemSegment -> ValidationResult
-        isElemValid ctx (ElemSegment elemType mode elements) = do
+        isElemValid ctx (ElemSegment tableIdx offset funs) =
-            forM_ elements $ \elem -> runChecker ctx $ do
+            let check = runChecker ctx $ do
-                arr <- getExpressionType elem
-                isConstExpression elem
-                unless (isValidRef elemType arr)
-                    $ throwError $ RefTypeMismatch elemType elemType
-            case mode of
-                Active tableIdx offset -> runChecker ctx $ do
                     isConstExpression offset
                     t <- getExpressionType offset
-                    unless (isArrowMatch (empty ==> I32) t) $ do
+                    if isArrowMatch (empty ==> I32) t
-                        throwError $ TypeMismatch t (empty ==> I32)
+                    then return ()
-                    let tableImports = filter isTableImport imports
+                    else throwError $ TypeMismatch t (empty ==> I32) 
-                    when (tableIdx >= fromIntegral (length tableImports + length tables)) $ do
+            in
-                        throwError $ TableIndexOutOfRange tableIdx
+            let tableImports = filter isTableImport imports in
-                    let TableType _ tableType = tableTypes ctx !! (fromIntegral tableIdx)
+            let isTableIndexValid =
-                    when (tableType /= elemType) $ do
+                    if tableIdx < (fromIntegral $ length tableImports + length tables)
-                        throwError $ RefTypeMismatch elemType tableType
+                    then return ()
-                _ -> return ()
+                    else Left (TableIndexOutOfRange tableIdx)
-        
+            in
-        isValidRef :: ElemType -> Arrow -> Bool
+            let funImports = filter isFuncImport imports in
-        isValidRef FuncRef arr | arr == (empty ==> Func) = True
+            let funsLength = fromIntegral $ length functions + length funImports in
-        isValidRef ExternRef arr | arr == (empty ==> Extern) = True
+            let isFunsValid = foldMap (\i -> if i < funsLength then return () else Left FunctionIndexOutOfRange) funs in
-        isValidRef _ _ = False
+            check <> isFunsValid <> isTableIndexValid
 
 datasShouldBeValid :: Validator
 datasShouldBeValid m@Module { datas, mems, imports } =
@@ -736,7 +582,7 @@ datasShouldBeValid m@Module { datas, mems, imports } =
     foldMap (isDataValid ctx) datas
     where
         isDataValid :: Ctx -> DataSegment -> ValidationResult
-        isDataValid ctx (DataSegment (ActiveData memIdx offset) _) =
+        isDataValid ctx (DataSegment memIdx offset _) =
             let check = runChecker ctx $ do
                     isConstExpression offset
                     t <- getExpressionType offset
@@ -748,7 +594,6 @@ datasShouldBeValid m@Module { datas, mems, imports } =
             if memIdx < (fromIntegral $ length memImports + length mems)
             then check
             else Left (MemoryIndexOutOfRange memIdx)
-        isDataValid ctx (DataSegment PassiveData _) = return ()
 
 startShouldBeValid :: Validator
 startShouldBeValid Module { start = Nothing } = return ()
@@ -757,7 +602,7 @@ startShouldBeValid m@Module { start = Just (StartFunction idx) } =
     let i = fromIntegral idx in
     if length types > i
     then if FuncType [] [] == types !! i then return () else Left InvalidStartFunctionType
-    else Left $ FunctionIndexOutOfRange $ fromIntegral i
+    else Left FunctionIndexOutOfRange
 
 exportsShouldBeValid :: Validator
 exportsShouldBeValid Module { exports, imports, functions, mems, tables, globals } =
@@ -770,7 +615,7 @@ exportsShouldBeValid Module { exports, imports, functions, mems, tables, globals
 
         isExportValid :: Export -> ValidationResult
         isExportValid (Export _ (ExportFunc funIdx)) =
-            if fromIntegral funIdx < length funcImports + length functions then return () else Left (FunctionIndexOutOfRange funIdx)
+            if fromIntegral funIdx < length funcImports + length functions then return () else Left FunctionIndexOutOfRange
         isExportValid (Export _ (ExportTable tableIdx)) =
             if fromIntegral tableIdx < length tableImports + length tables then return () else Left (TableIndexOutOfRange tableIdx)
         isExportValid (Export _ (ExportMemory memIdx)) =

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.23 
+resolver: lts-16.5
 packages:
 - '.'
 extra-deps: []

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: 4c972e067bae16b95961dbfdd12e07f1ee6c8fffabbfa05c3d65100b03f548b7
+    size: 531707
-    size: 650253
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/5.yaml
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/23.yaml
+    sha256: 9751e25e0af5713a53ddcfcc79564b082c71b1b357fadef0d85672a5b5ba3703
-  original: lts-20.23
+  original: lts-16.5

tests/Test.hs

@@ -16,16 +16,20 @@ import qualified Data.List as List
 
 main :: IO ()
 main = do
-  files <-
+  let groups = [
-    filter (not . List.isPrefixOf "simd") . filter (List.isSuffixOf ".wast")
+          ("Core Tests", "tests/spec"),
-      <$> Directory.listDirectory "tests/spec"
+          ("Reference Types Proposal", "tests/spec/proposals/reference-types")
-  -- let files = ["binary-leb128.wast"]
+        ]
-  scriptTestCases <- (`mapM` files) $ \file -> do
+  testGroups <- (`mapM` groups) $ \(groupName, dir) -> do
-    test <- LBS.readFile ("tests/spec/" ++ file)
+    files <- filter (List.isSuffixOf ".wast") <$> Directory.listDirectory dir
-    return $ testCase file $ do
+    -- let files = ["const.wast"]
-      case Wasm.parseScript test of
+    scriptTestCases <- (`mapM` files) $ \file -> do
-        Right script -> 
+      test <- LBS.readFile (dir ++ "/" ++ file)
-          Script.runScript (\msg assert -> assertFailure ("Failed assert: " ++ msg ++ ". Assert " ++ show assert)) script
+      return $ testCase file $ do
-        Left error ->
+        case Wasm.parseScript test of
-          assertFailure $ "Failed to parse with error: " ++ show error
+          Right script -> 
-  defaultMain $ testGroup "Wasm Core Test Suit" scriptTestCases
+            Script.runScript (\msg assert -> assertFailure ("Failed assert: " ++ msg ++ ". Assert " ++ show assert)) script
+          Left error ->
+            assertFailure $ "Failed to parse with error: " ++ show error
+    return $ testGroup groupName scriptTestCases
+  defaultMain $ testGroup "Wasm Test Suit" testGroups

wasm.cabal

@@ -1,6 +1,6 @@
 cabal-version:  2.2
 name:           wasm
-version:        1.1.2
+version:        1.0.1.0
 synopsis:       WebAssembly Language Toolkit and Interpreter
 description:
   Library for parsing and interpreting WebAssembly, including:
@@ -16,9 +16,9 @@ license:        MIT
 license-file:   LICENSE
 build-type:     Simple
 category:       Language
-homepage:       https://github.com/SPY/haskell-wasm
+homepage:       https:github.com/SPY/haskell-wasm
-bug-reports:    https://github.com/SPY/haskell-wasm/issues
+bug-reports:    https:github.com/SPY/haskell-wasm/issues
-tested-with:    GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.2.7
+tested-with:    GHC==8.6.5, GHC==8.8.4, GHC==8.10.4
 extra-source-files:
     README.md
     src/Language/Wasm/Parser.y
@@ -33,14 +33,14 @@ library
       Language.Wasm.Script
       Language.Wasm.Lexer
       Language.Wasm.Structure
+      Language.Wasm
+  other-modules:
+      Language.Wasm.Binary
+      Language.Wasm.Builder
+      Language.Wasm.FloatUtils
       Language.Wasm.Interpreter
       Language.Wasm.Parser
       Language.Wasm.Validate
-      Language.Wasm.Binary
-      Language.Wasm.Builder
-      Language.Wasm
-  other-modules:
-      Language.Wasm.FloatUtils
       Paths_wasm
   autogen-modules:
       Paths_wasm
@@ -57,17 +57,17 @@ library
   build-depends:
       array >=0.5 && < 0.6
     , base >=4.6 && < 5
-    , bytestring >=0.10 && < 0.13
+    , bytestring >=0.10 && < 0.12
     , cereal >=0.5 && < 0.6
-    , containers >=0.5 && < 0.8
+    , containers >=0.5 && < 0.7
-    , deepseq >=1.4 && < 1.6
+    , deepseq >=1.4 && < 1.5
     , ieee754 >=0.8 && < 0.9
-    , mtl >=2.2.1 && < 2.4
+    , mtl >=2.2.1 && < 2.3
-    , primitive >=0.7 && < 0.10
+    , primitive >=0.7 && < 0.8
-    , text >=1.1 && < 3
+    , text >=1.1 && < 1.3
-    , transformers >=0.4 && < 0.7
+    , transformers >=0.4 && < 0.6
     , utf8-string >=1.0 && < 1.1
-    , vector >=0.12.2 && < 0.14
+    , vector >=0.12 && < 0.13
   default-language: Haskell2010
 
 test-suite test