T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update wasmparser/wat dependencies (#2675)

Browse Source 
* Update wasmparser/wat dependencies

Bring in new opcodes and new instructions for SIMD

* Update module linking syntax
This commit is contained in:
Alex Crichton
2021-02-22 11:56:34 -06:00
committed by GitHub
parent 584d6fbf0e
commit 98d3e6823f
22 changed files with 100 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/misc_testsuite/module-linking/alias-outer.wast
View File

@@ -49,12 +49,12 @@
(module $m1
(func (export "f") (result i32)
i32.const 0))
(instance $m_g1 (instantiate $m0 "m" (module $m1)))
(instance $m_g1 (instantiate $m0 (import "m" (module $m1))))
(instance $g1 (instantiate (module $m_g1 "m")))
(module $m2
(func (export "f") (result i32)
i32.const 1))
(instance $m_g2 (instantiate $m0 "m" (module $m2)))
(instance $m_g2 (instantiate $m0 (import "m" (module $m2))))
(instance $g2 (instantiate (module $m_g2 "m")))
(func (export "get1") (result i32)

10
tests/misc_testsuite/module-linking/alias.wast
View File

@@ -30,7 +30,7 @@
(data (i32.const 0) "\03\00\00\00")
)
(instance $a (instantiate $m))
(alias $m (memory $a "m"))
(alias $a "m" (memory $m))
(func (export "get") (result i32)
i32.const 0
@@ -108,7 +108,7 @@
(type $t (func))
(module $m
;; alias
(alias $thunk (type outer 0 $t))
(alias outer 0 $t (type $thunk))
;; import
(import "" "" (func (type $thunk)))
;; module (referencing parent type)
@@ -125,12 +125,12 @@
;; instance
(instance $i (instantiate $m2))
;; alias that instance
(alias $my_f (func $i ""))
(alias $i "" (func $my_f))
;; module
(module $m3
(import "" (func)))
;; use our aliased function to create the module
(instance $i2 (instantiate $m3 "" (func $my_f)))
(instance $i2 (instantiate $m3 (import "" (func $my_f))))
;; module
(module $m4
(import "" (func)))
@@ -139,5 +139,5 @@
;; instantiate the above module
(module $smol (func $f (export "")))
(instance $smol (instantiate $smol))
(instance (instantiate $m "" (instance $smol)))
(instance (instantiate $m (import "" (instance $smol))))
)

50
tests/misc_testsuite/module-linking/instantiate.wast
View File

@@ -34,7 +34,7 @@
(module
(import "" (func))
(start 0))
(instance $a (instantiate 0 "" (func $set)))
(instance $a (instantiate 0 (import "" (func $set))))
)
(assert_return (invoke $a "get") (i32.const 1))
@@ -49,7 +49,7 @@
global.set 0)
(start 0))
(instance $a (instantiate 0 "" (global $g)))
(instance $a (instantiate 0 (import "" (global $g))))
)
(assert_return (invoke $a "get") (i32.const 2))
@@ -63,7 +63,7 @@
call_indirect)
(start 0))
(instance $a (instantiate 0 "" (table $t)))
(instance $a (instantiate 0 (import "" (table $t))))
)
(assert_return (invoke $a "get") (i32.const 3))
@@ -78,7 +78,7 @@
i32.store)
(start 0))
(instance $a (instantiate 0 "" (memory $m)))
(instance $a (instantiate 0 (import "" (memory $m))))
)
(assert_return (invoke $a "load") (i32.const 100))
@@ -88,13 +88,13 @@
(module $m1
(import "" (instance (export "" (func))))
(alias (func 0 ""))
(alias 0 "" (func))
(start 0))
(module $m2
(func (export "") (import "")))
(instance $i (instantiate $m2 "" (func $set)))
(instance (instantiate $m1 "" (instance $i)))
(instance $i (instantiate $m2 (import "" (func $set))))
(instance (instantiate $m1 (import "" (instance $i))))
)
(assert_return (invoke $a "get") (i32.const 4))
@@ -111,7 +111,7 @@
(module $m2
(func (export "") (result i32)
i32.const 5))
(instance $i (instantiate $m1 "" (module $m2)))
(instance $i (instantiate $m1 (import "" (module $m2))))
(func (export "get") (result i32)
call (func $i ""))
)
@@ -122,13 +122,13 @@
(module $m
(import "" (module $m (export "get" (func (result i32)))))
(instance $i (instantiate $m))
(alias $f (func $i "get"))
(alias $i "get" (func $f))
(export "" (func $f))
)
(module $m2
(func (export "get") (result i32)
i32.const 6))
(instance $a (instantiate $m "" (module $m2)))
(instance $a (instantiate $m (import "" (module $m2))))
(func (export "get") (result i32)
call (func $a ""))
@@ -163,10 +163,10 @@
(instance $a
(instantiate 0
"m" (memory $m)
"g" (global $g)
"t" (table $t)
"f" (func $f)
(import "m" (memory $m))
(import "g" (global $g))
(import "t" (table $t))
(import "f" (func $f))
)
)
)
@@ -183,10 +183,10 @@
(module $mt (import "" (table 1 funcref)))
(module $mg (import "" (global (mut i32))))
(instance (instantiate $mm "" (memory $m)))
(instance (instantiate $mf "" (func $f)))
(instance (instantiate $mt "" (table $t)))
(instance (instantiate $mg "" (global $g)))
(instance (instantiate $mm (import "" (memory $m))))
(instance (instantiate $mf (import "" (func $f))))
(instance (instantiate $mt (import "" (table $t))))
(instance (instantiate $mg (import "" (global $g))))
)
;; instantiate nested
@@ -204,13 +204,13 @@
(import "" (func))
(start 0)
)
(instance (instantiate 0 "" (func 0)))
(instance (instantiate 0 (import "" (func 0))))
)
(instance (instantiate 0 "" (func 0)))
(instance (instantiate 0 (import "" (func 0))))
)
(instance (instantiate 0 "" (func 0)))
(instance (instantiate 0 (import "" (func 0))))
)
(instance (instantiate 0 "" (func 0)))
(instance (instantiate 0 (import "" (func 0))))
)
(assert_return (invoke $a "get") (i32.const 1))
@@ -285,7 +285,7 @@
(module $m1
(import "a" "f" (func)))
(instance (instantiate $m1 "a" (instance 0)))
(instance (instantiate $m1 (import "a" (instance 0))))
)
(module
@@ -300,9 +300,9 @@
(func (export "")))
(instance $i (instantiate $a))
(import "m" (module $b (import "" (func))))
(instance $b (instantiate $b "" (func $i ""))))
(instance $b (instantiate $b (import "" (func $i "")))))
;; we should be able to instantiate m2 with m1 because m1 doesn't actually
;; import anything (always safe to remove imports!)
(instance (instantiate $m2 "m" (module $m1)))
(instance (instantiate $m2 (import "m" (module $m1))))
)