GitHub/haskell-wasm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small clean up

Browse Source
This commit is contained in:
Ilya Rezvov
2020-01-14 17:00:41 -08:00
parent d7e1b803f5
commit f8d008bb04
1 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Language/Wasm/Interpreter.hs
+10 -29
View File
@@ -233,17 +233,11 @@ makeHostModule st items = do
where where
(|>) = flip ($) (|>) = flip ($)
isHostFunction :: (TL.Text, HostItem) -> Bool
isHostFunction (_, (HostFunction _ _)) = True
isHostFunction _ = False
makeHostFunctions :: (Store, ModuleInstance) -> (Store, ModuleInstance) makeHostFunctions :: (Store, ModuleInstance) -> (Store, ModuleInstance)
makeHostFunctions (st, inst) = makeHostFunctions (st, inst) =
let funcLen = Vector.length $ funcInstances st in let funcLen = Vector.length $ funcInstances st in
let hostFunctions = filter isHostFunction items in let (names, types, instances) = unzip3 [(name, t, HostInstance t c) | (name, (HostFunction t c)) <- items] in
let instances = map (\(_, (HostFunction t c)) -> HostInstance t c) hostFunctions in let exps = Vector.fromList $ zipWith (\name i -> ExportInstance name (ExternFunction i)) names [funcLen..] in
let types = map (\(_, (HostFunction t _)) -> t) hostFunctions in
let exps = Vector.fromList $ zipWith (\(name, _) i -> ExportInstance name (ExternFunction i)) hostFunctions [funcLen..] in
let inst' = inst { let inst' = inst {
funcTypes = Vector.fromList types, funcTypes = Vector.fromList types,
funcaddrs = Vector.fromList [funcLen..funcLen + length instances - 1], funcaddrs = Vector.fromList [funcLen..funcLen + length instances - 1],
@@ -252,17 +246,12 @@ makeHostModule st items = do
in in
let st' = st { funcInstances = funcInstances st <> Vector.fromList instances } in let st' = st { funcInstances = funcInstances st <> Vector.fromList instances } in
(st', inst') (st', inst')
isHostGlobal :: (TL.Text, HostItem) -> Bool
isHostGlobal (_, (HostGlobal _)) = True
isHostGlobal _ = False
makeHostGlobals :: (Store, ModuleInstance) -> (Store, ModuleInstance) makeHostGlobals :: (Store, ModuleInstance) -> (Store, ModuleInstance)
makeHostGlobals (st, inst) = makeHostGlobals (st, inst) =
let globLen = Vector.length $ globalInstances st in let globLen = Vector.length $ globalInstances st in
let hostGlobals = filter isHostGlobal items in let (names, instances) = unzip [(name, g) | (name, (HostGlobal g)) <- items] in
let instances = map (\(_, (HostGlobal g)) -> g) hostGlobals in let exps = Vector.fromList $ zipWith (\name i -> ExportInstance name (ExternGlobal i)) names [globLen..] in
let exps = Vector.fromList $ zipWith (\(name, _) i -> ExportInstance name (ExternGlobal i)) hostGlobals [globLen..] in
let inst' = inst { let inst' = inst {
globaladdrs = Vector.fromList [globLen..globLen + length instances - 1], globaladdrs = Vector.fromList [globLen..globLen + length instances - 1],
exports = Language.Wasm.Interpreter.exports inst <> exps exports = Language.Wasm.Interpreter.exports inst <> exps
@@ -270,34 +259,26 @@ makeHostModule st items = do
in in
let st' = st { globalInstances = globalInstances st <> Vector.fromList instances } in let st' = st { globalInstances = globalInstances st <> Vector.fromList instances } in
(st', inst') (st', inst')
isHostMem :: (TL.Text, HostItem) -> Bool
isHostMem (_, (HostMemory _)) = True
isHostMem _ = False
makeHostMems :: (Store, ModuleInstance) -> IO (Store, ModuleInstance) makeHostMems :: (Store, ModuleInstance) -> IO (Store, ModuleInstance)
makeHostMems (st, inst) = do makeHostMems (st, inst) = do
let memLen = Vector.length $ memInstances st let memLen = Vector.length $ memInstances st
let hostMems = filter isHostMem items let (names, limits) = unzip [(name, Memory lim) | (name, (HostMemory lim)) <- items]
instances <- allocMems $ map (\(_, (HostMemory lim)) -> Memory lim) hostMems instances <- allocMems limits
let exps = Vector.fromList $ zipWith (\(name, _) i -> ExportInstance name (ExternMemory i)) hostMems [memLen..] let exps = Vector.fromList $ zipWith (\name i -> ExportInstance name (ExternMemory i)) names [memLen..]
let inst' = inst { let inst' = inst {
memaddrs = Vector.fromList [memLen..memLen + length instances - 1], memaddrs = Vector.fromList [memLen..memLen + length instances - 1],
exports = Language.Wasm.Interpreter.exports inst <> exps exports = Language.Wasm.Interpreter.exports inst <> exps
} }
let st' = st { memInstances = memInstances st <> instances } let st' = st { memInstances = memInstances st <> instances }
return (st', inst') return (st', inst')
isHostTable :: (TL.Text, HostItem) -> Bool
isHostTable (_, (HostTable _)) = True
isHostTable _ = False
makeHostTables :: (Store, ModuleInstance) -> IO (Store, ModuleInstance) makeHostTables :: (Store, ModuleInstance) -> IO (Store, ModuleInstance)
makeHostTables (st, inst) = do makeHostTables (st, inst) = do
let tableLen = Vector.length $ tableInstances st let tableLen = Vector.length $ tableInstances st
let hostTables = filter isHostTable items let (names, tables) = unzip [(name, Table (TableType lim AnyFunc)) | (name, (HostTable lim)) <- items]
let instances = allocTables $ map (\(_, (HostTable lim)) -> Table (TableType lim AnyFunc)) hostTables let instances = allocTables tables
let exps = Vector.fromList $ zipWith (\(name, _) i -> ExportInstance name (ExternTable i)) hostTables [tableLen..] let exps = Vector.fromList $ zipWith (\name i -> ExportInstance name (ExternTable i)) names [tableLen..]
let inst' = inst { let inst' = inst {
tableaddrs = Vector.fromList [tableLen..tableLen + length instances - 1], tableaddrs = Vector.fromList [tableLen..tableLen + length instances - 1],
exports = Language.Wasm.Interpreter.exports inst <> exps exports = Language.Wasm.Interpreter.exports inst <> exps