summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/atomics.wast2
-rw-r--r--test/atomics.wast.from-wast2
-rw-r--r--test/atomics.wast.fromBinary2
-rw-r--r--test/atomics.wast.fromBinary.noDebugInfo2
-rw-r--r--test/memory-shared.wast3
-rw-r--r--test/memory-shared.wast.from-wast2
-rw-r--r--test/memory-shared.wast.fromBinary2
-rw-r--r--test/memory-shared.wast.fromBinary.noDebugInfo2
-rw-r--r--test/passes/remove-unused-names_merge-blocks.txt2
-rw-r--r--test/passes/remove-unused-names_merge-blocks.wast2
-rw-r--r--test/passes/safe-heap.txt2
-rw-r--r--test/passes/safe-heap.wast2
-rw-r--r--test/passes/simplify-locals.txt2
-rw-r--r--test/passes/simplify-locals.wast2
-rw-r--r--test/print/memory-import-shared.minified.txt2
-rw-r--r--test/print/memory-import-shared.txt2
-rw-r--r--test/print/memory-import-shared.wast2
-rw-r--r--test/print/memory-notshared.minified.txt2
-rw-r--r--test/print/memory-notshared.txt3
-rw-r--r--test/print/memory-notshared.wast3
-rw-r--r--test/print/memory-shared.minified.txt2
-rw-r--r--test/print/memory-shared.txt2
-rw-r--r--test/print/memory-shared.wast2
-rw-r--r--test/threads.fromasm2
-rw-r--r--test/threads.fromasm.clamp2
-rw-r--r--test/threads.fromasm.clamp.no-opts2
-rw-r--r--test/threads.fromasm.imprecise2
-rw-r--r--test/threads.fromasm.imprecise.no-opts2
-rw-r--r--test/threads.fromasm.no-opts2
29 files changed, 26 insertions, 35 deletions
diff --git a/test/atomics.wast b/test/atomics.wast
index 7ed32f189..a2e3be5ab 100644
--- a/test/atomics.wast
+++ b/test/atomics.wast
@@ -1,6 +1,6 @@
(module
(type $0 (func))
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
(func $atomic-loadstore (type $0)
(local $0 i32)
(local $1 i64)
diff --git a/test/atomics.wast.from-wast b/test/atomics.wast.from-wast
index 48059dc45..6de863888 100644
--- a/test/atomics.wast.from-wast
+++ b/test/atomics.wast.from-wast
@@ -1,6 +1,6 @@
(module
(type $0 (func))
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
(func $atomic-loadstore (type $0)
(local $0 i32)
(local $1 i64)
diff --git a/test/atomics.wast.fromBinary b/test/atomics.wast.fromBinary
index 26a70248f..e9fd9f1dc 100644
--- a/test/atomics.wast.fromBinary
+++ b/test/atomics.wast.fromBinary
@@ -1,6 +1,6 @@
(module
(type $0 (func))
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
(func $atomic-loadstore (type $0)
(local $var$0 i32)
(local $var$1 i64)
diff --git a/test/atomics.wast.fromBinary.noDebugInfo b/test/atomics.wast.fromBinary.noDebugInfo
index d9f18a221..6d6f81324 100644
--- a/test/atomics.wast.fromBinary.noDebugInfo
+++ b/test/atomics.wast.fromBinary.noDebugInfo
@@ -1,6 +1,6 @@
(module
(type $0 (func))
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
(func $0 (type $0)
(local $var$0 i32)
(local $var$1 i64)
diff --git a/test/memory-shared.wast b/test/memory-shared.wast
index b16e00d99..ee02979b1 100644
--- a/test/memory-shared.wast
+++ b/test/memory-shared.wast
@@ -1,4 +1,3 @@
(module
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
)
-
diff --git a/test/memory-shared.wast.from-wast b/test/memory-shared.wast.from-wast
index daff79f22..ee02979b1 100644
--- a/test/memory-shared.wast.from-wast
+++ b/test/memory-shared.wast.from-wast
@@ -1,3 +1,3 @@
(module
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
)
diff --git a/test/memory-shared.wast.fromBinary b/test/memory-shared.wast.fromBinary
index b16e00d99..ea904d085 100644
--- a/test/memory-shared.wast.fromBinary
+++ b/test/memory-shared.wast.fromBinary
@@ -1,4 +1,4 @@
(module
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
)
diff --git a/test/memory-shared.wast.fromBinary.noDebugInfo b/test/memory-shared.wast.fromBinary.noDebugInfo
index b16e00d99..ea904d085 100644
--- a/test/memory-shared.wast.fromBinary.noDebugInfo
+++ b/test/memory-shared.wast.fromBinary.noDebugInfo
@@ -1,4 +1,4 @@
(module
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
)
diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt
index c170a6c99..f5d432d27 100644
--- a/test/passes/remove-unused-names_merge-blocks.txt
+++ b/test/passes/remove-unused-names_merge-blocks.txt
@@ -7,7 +7,7 @@
(type $5 (func (result f64)))
(table 1 1 anyfunc)
(elem (i32.const 0) $call-i)
- (memory $0 256 256 shared)
+ (memory $0 (shared 256 256))
(func $call-i (type $i) (param $0 i32)
(nop)
)
diff --git a/test/passes/remove-unused-names_merge-blocks.wast b/test/passes/remove-unused-names_merge-blocks.wast
index 67a1f2762..4cd7abe09 100644
--- a/test/passes/remove-unused-names_merge-blocks.wast
+++ b/test/passes/remove-unused-names_merge-blocks.wast
@@ -1,5 +1,5 @@
(module
- (memory 256 256 shared)
+ (memory (shared 256 256))
(type $i (func (param i32)))
(type $ii (func (param i32 i32)))
(type $iii (func (param i32 i32 i32)))
diff --git a/test/passes/safe-heap.txt b/test/passes/safe-heap.txt
index 69caaaa6f..f34dd7455 100644
--- a/test/passes/safe-heap.txt
+++ b/test/passes/safe-heap.txt
@@ -4,7 +4,7 @@
(import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32))
(import "env" "segfault" (func $segfault))
(import "env" "alignfault" (func $alignfault))
- (memory $0 100 100 shared)
+ (memory $0 (shared 100 100))
(func $loads (type $0)
(drop
(call $SAFE_HEAP_LOAD_i32_4_U_4
diff --git a/test/passes/safe-heap.wast b/test/passes/safe-heap.wast
index d583accb7..12d299769 100644
--- a/test/passes/safe-heap.wast
+++ b/test/passes/safe-heap.wast
@@ -1,5 +1,5 @@
(module
- (memory 100 100 shared)
+ (memory (shared 100 100))
(func $loads
(drop (i32.load (i32.const 1)))
(drop (i32.atomic.load (i32.const 1)))
diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt
index 15d8b21e5..ae1e1ddba 100644
--- a/test/passes/simplify-locals.txt
+++ b/test/passes/simplify-locals.txt
@@ -896,7 +896,7 @@
(type $4 (func (param i32)))
(type $5 (func (param i32) (result i32)))
(type $6 (func (param i32 i32 i32 i32 i32 i32)))
- (memory $0 256 256 shared)
+ (memory $0 (shared 256 256))
(func $nonatomics (type $FUNCSIG$i) (result i32)
(local $x i32)
(nop)
diff --git a/test/passes/simplify-locals.wast b/test/passes/simplify-locals.wast
index eff5ff6be..10fcf1277 100644
--- a/test/passes/simplify-locals.wast
+++ b/test/passes/simplify-locals.wast
@@ -884,7 +884,7 @@
)
)
(module
- (memory 256 256 shared)
+ (memory (shared 256 256))
(type $FUNCSIG$v (func))
(type $FUNCSIG$i (func (result i32)))
(type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32)))
diff --git a/test/print/memory-import-shared.minified.txt b/test/print/memory-import-shared.minified.txt
index 56d11ab17..8691f813c 100644
--- a/test/print/memory-import-shared.minified.txt
+++ b/test/print/memory-import-shared.minified.txt
@@ -1 +1 @@
-(module(import "env" "memory" (memory $0 256 shared))) \ No newline at end of file
+(module(import "env" "memory" (memory $0 (shared 256 256)))) \ No newline at end of file
diff --git a/test/print/memory-import-shared.txt b/test/print/memory-import-shared.txt
index 7bbb11ab1..ba5a0463c 100644
--- a/test/print/memory-import-shared.txt
+++ b/test/print/memory-import-shared.txt
@@ -1,3 +1,3 @@
(module
- (import "env" "memory" (memory $0 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
)
diff --git a/test/print/memory-import-shared.wast b/test/print/memory-import-shared.wast
index 7bbb11ab1..ba5a0463c 100644
--- a/test/print/memory-import-shared.wast
+++ b/test/print/memory-import-shared.wast
@@ -1,3 +1,3 @@
(module
- (import "env" "memory" (memory $0 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
)
diff --git a/test/print/memory-notshared.minified.txt b/test/print/memory-notshared.minified.txt
deleted file mode 100644
index 905aff3d5..000000000
--- a/test/print/memory-notshared.minified.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-(module(memory $0 23 256)
-) \ No newline at end of file
diff --git a/test/print/memory-notshared.txt b/test/print/memory-notshared.txt
deleted file mode 100644
index 604a6b1ce..000000000
--- a/test/print/memory-notshared.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
- (memory $0 23 256)
-)
diff --git a/test/print/memory-notshared.wast b/test/print/memory-notshared.wast
deleted file mode 100644
index 4a7b8449a..000000000
--- a/test/print/memory-notshared.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
- (memory $0 23 256 notshared)
-)
diff --git a/test/print/memory-shared.minified.txt b/test/print/memory-shared.minified.txt
index 3f07a0080..c6aeccdcd 100644
--- a/test/print/memory-shared.minified.txt
+++ b/test/print/memory-shared.minified.txt
@@ -1,2 +1,2 @@
-(module(memory $0 23 256 shared)
+(module(memory $0 (shared 23 256))
) \ No newline at end of file
diff --git a/test/print/memory-shared.txt b/test/print/memory-shared.txt
index daff79f22..ee02979b1 100644
--- a/test/print/memory-shared.txt
+++ b/test/print/memory-shared.txt
@@ -1,3 +1,3 @@
(module
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
)
diff --git a/test/print/memory-shared.wast b/test/print/memory-shared.wast
index daff79f22..ee02979b1 100644
--- a/test/print/memory-shared.wast
+++ b/test/print/memory-shared.wast
@@ -1,3 +1,3 @@
(module
- (memory $0 23 256 shared)
+ (memory $0 (shared 23 256))
)
diff --git a/test/threads.fromasm b/test/threads.fromasm
index 5114d985a..3199bb22c 100644
--- a/test/threads.fromasm
+++ b/test/threads.fromasm
@@ -1,5 +1,5 @@
(module
- (import "env" "memory" (memory $0 256 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
(import "env" "table" (table 0 0 anyfunc))
(import "env" "memoryBase" (global $memoryBase i32))
(import "env" "tableBase" (global $tableBase i32))
diff --git a/test/threads.fromasm.clamp b/test/threads.fromasm.clamp
index 5114d985a..3199bb22c 100644
--- a/test/threads.fromasm.clamp
+++ b/test/threads.fromasm.clamp
@@ -1,5 +1,5 @@
(module
- (import "env" "memory" (memory $0 256 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
(import "env" "table" (table 0 0 anyfunc))
(import "env" "memoryBase" (global $memoryBase i32))
(import "env" "tableBase" (global $tableBase i32))
diff --git a/test/threads.fromasm.clamp.no-opts b/test/threads.fromasm.clamp.no-opts
index 1c65d0d36..2a96c3dc2 100644
--- a/test/threads.fromasm.clamp.no-opts
+++ b/test/threads.fromasm.clamp.no-opts
@@ -6,7 +6,7 @@
(import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
(import "global" "NaN" (global $nan$asm2wasm$import f64))
(import "global" "Infinity" (global $inf$asm2wasm$import f64))
- (import "env" "memory" (memory $0 256 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
(import "env" "table" (table 0 0 anyfunc))
(import "env" "memoryBase" (global $memoryBase i32))
(import "env" "tableBase" (global $tableBase i32))
diff --git a/test/threads.fromasm.imprecise b/test/threads.fromasm.imprecise
index bad9963c8..d61e982cd 100644
--- a/test/threads.fromasm.imprecise
+++ b/test/threads.fromasm.imprecise
@@ -1,5 +1,5 @@
(module
- (import "env" "memory" (memory $0 256 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
(import "env" "table" (table 0 0 anyfunc))
(import "env" "memoryBase" (global $memoryBase i32))
(import "env" "tableBase" (global $tableBase i32))
diff --git a/test/threads.fromasm.imprecise.no-opts b/test/threads.fromasm.imprecise.no-opts
index 1c65d0d36..2a96c3dc2 100644
--- a/test/threads.fromasm.imprecise.no-opts
+++ b/test/threads.fromasm.imprecise.no-opts
@@ -6,7 +6,7 @@
(import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
(import "global" "NaN" (global $nan$asm2wasm$import f64))
(import "global" "Infinity" (global $inf$asm2wasm$import f64))
- (import "env" "memory" (memory $0 256 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
(import "env" "table" (table 0 0 anyfunc))
(import "env" "memoryBase" (global $memoryBase i32))
(import "env" "tableBase" (global $tableBase i32))
diff --git a/test/threads.fromasm.no-opts b/test/threads.fromasm.no-opts
index 1c65d0d36..2a96c3dc2 100644
--- a/test/threads.fromasm.no-opts
+++ b/test/threads.fromasm.no-opts
@@ -6,7 +6,7 @@
(import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32))
(import "global" "NaN" (global $nan$asm2wasm$import f64))
(import "global" "Infinity" (global $inf$asm2wasm$import f64))
- (import "env" "memory" (memory $0 256 256 shared))
+ (import "env" "memory" (memory $0 (shared 256 256)))
(import "env" "table" (table 0 0 anyfunc))
(import "env" "memoryBase" (global $memoryBase i32))
(import "env" "tableBase" (global $tableBase i32))