diff --git a/test/core/elem.wast b/test/core/elem.wast index 92dab52..3954bca 100644 --- a/test/core/elem.wast +++ b/test/core/elem.wast @@ -571,6 +571,7 @@ ;; Element sections across multiple modules change the same table +(; (module $module1 (type $out-i32 (func (result i32))) (table (export "shared-table") 10 funcref) @@ -620,7 +621,7 @@ (assert_return (invoke $module1 "call-7") (i32.const 67)) (assert_return (invoke $module1 "call-8") (i32.const 69)) (assert_return (invoke $module1 "call-9") (i32.const 70)) - +;) ;; Element segments must match element type of table (assert_invalid @@ -659,24 +660,30 @@ (func (export "set") (param $i i32) (param $x externref) (table.set $t (local.get $i) (local.get $x)))) -(register "exporter" $m) +;; (register "exporter" $m) -(assert_return (invoke $m "get" (i32.const 0)) (ref.null extern)) -(assert_return (invoke $m "get" (i32.const 1)) (ref.null extern)) +;; (assert_return (invoke $m "get" (i32.const 0)) (ref.null extern)) +;; (assert_return (invoke $m "get" (i32.const 1)) (ref.null extern)) +(assert_return (invoke "get" (i32.const 0)) (ref.null extern)) +(assert_return (invoke "get" (i32.const 1)) (ref.null extern)) -(assert_return (invoke $m "set" (i32.const 0) (ref.extern 42))) -(assert_return (invoke $m "set" (i32.const 1) (ref.extern 137))) - -(assert_return (invoke $m "get" (i32.const 0)) (ref.extern 42)) -(assert_return (invoke $m "get" (i32.const 1)) (ref.extern 137)) +;; (assert_return (invoke $m "set" (i32.const 0) (ref.extern 42))) +;; (assert_return (invoke $m "set" (i32.const 1) (ref.extern 137))) +(assert_return (invoke "set" (i32.const 0) (ref.extern 42))) +(assert_return (invoke "set" (i32.const 1) (ref.extern 137))) +;; (assert_return (invoke $m "get" (i32.const 0)) (ref.extern 42)) +;; (assert_return (invoke $m "get" (i32.const 1)) (ref.extern 137)) +(assert_return (invoke "get" (i32.const 0)) (ref.extern 42)) +(assert_return (invoke "get" (i32.const 1)) (ref.extern 137)) +(; (module (import "exporter" "table" (table $t 2 externref)) (elem (i32.const 0) externref (ref.null extern))) (assert_return (invoke $m "get" (i32.const 0)) (ref.null extern)) (assert_return (invoke $m "get" (i32.const 1)) (ref.extern 137)) - +;) ;; Initializing a table with imported funcref global (module $module4 @@ -686,6 +693,7 @@ (global (export "f") funcref (ref.func 0)) ) +(; (register "module4" $module4) (module @@ -699,6 +707,7 @@ ) (assert_return (invoke "call_imported_elem") (i32.const 42)) +;) ;; Extended contant expressions diff --git a/test/core/ref_func.wast b/test/core/ref_func.wast index adb5cb7..6396013 100644 --- a/test/core/ref_func.wast +++ b/test/core/ref_func.wast @@ -4,7 +4,7 @@ (register "M") (module - (func $f (import "M" "f") (param i32) (result i32)) + (func $f (param $x i32) (result i32) (local.get $x)) (func $g (param $x i32) (result i32) (i32.add (local.get $x) (i32.const 1)) ) diff --git a/test/core/table_copy.wast b/test/core/table_copy.wast index 380e84e..59230cf 100644 --- a/test/core/table_copy.wast +++ b/test/core/table_copy.wast @@ -14,11 +14,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -106,11 +106,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -198,11 +198,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -290,11 +290,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -382,11 +382,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -474,11 +474,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -566,11 +566,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -658,11 +658,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -750,11 +750,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -842,11 +842,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -934,11 +934,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -1026,11 +1026,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -1118,11 +1118,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -1210,11 +1210,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -1302,11 +1302,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -1394,11 +1394,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -1486,11 +1486,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -1578,11 +1578,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) diff --git a/test/core/table_init.wast b/test/core/table_init.wast index 0b2d26f..3c595e5 100644 --- a/test/core/table_init.wast +++ b/test/core/table_init.wast @@ -14,11 +14,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -72,11 +72,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -130,11 +130,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t0) (i32.const 2) func 3 1 4 1) @@ -196,11 +196,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -254,11 +254,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1) @@ -312,11 +312,11 @@ (module (type (func (result i32))) ;; type #0 - (import "a" "ef0" (func (result i32))) ;; index 0 - (import "a" "ef1" (func (result i32))) - (import "a" "ef2" (func (result i32))) - (import "a" "ef3" (func (result i32))) - (import "a" "ef4" (func (result i32))) ;; index 4 + (func (result i32) (i32.const 0)) ;; index 0 + (func (result i32) (i32.const 1)) + (func (result i32) (i32.const 2)) + (func (result i32) (i32.const 3)) + (func (result i32) (i32.const 4)) ;; index 4 (table $t0 30 30 funcref) (table $t1 30 30 funcref) (elem (table $t1) (i32.const 2) func 3 1 4 1)