13 files changed, 38 insertions, 51 deletions
diff --git a/test/dot_s/alias.wast b/test/dot_s/alias.wast
index 5744f8e8a..bd114b9dc 100644
--- a/test/dot_s/alias.wast
+++ b/test/dot_s/alias.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "\d2\04\00\00\00\00\00\00)\t\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "\d2\04\00\00\00\00\00\00)\t\00\00")
   (export "memory" memory)
   (type $FUNCSIG$v (func))
   (export "__exit" $__exit)
diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast
index ec9389029..564a565ef 100644
--- a/test/dot_s/asm_const.wast
+++ b/test/dot_s/asm_const.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "{ Module.print(\"hello, world!\"); }\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "{ Module.print(\"hello, world!\"); }\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (import $emscripten_asm_const_vi "env" "emscripten_asm_const_vi" (param i32))
diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast
index b93bcd5cc..7b13be3d8 100644
--- a/test/dot_s/basics.wast
+++ b/test/dot_s/basics.wast
@@ -1,9 +1,8 @@
 (module
-  (memory 1
-    (segment 16 "hello, world!\n\00")
-    (segment 32 "vcq")
-    (segment 48 "\16\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "hello, world!\n\00")
+  (data (i32.const 32) "vcq")
+  (data (i32.const 48) "\16\00\00\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$v (func))
diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast
index fcbe3b81e..c090d90e5 100644
--- a/test/dot_s/bcp-1.wast
+++ b/test/dot_s/bcp-1.wast
@@ -1,13 +1,12 @@
 (module
-  (memory 1
-    (segment 16 "\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00")
-    (segment 40 "\07\00\00\00\08\00\00\00\t\00\00\00")
-    (segment 52 "\n\00\00\00\0b\00\00\00")
-    (segment 60 "\0c\00\00\00\0d\00\00\00\0e\00\00\00")
-    (segment 72 "\0f\00\00\00\10\00\00\00\11\00\00\00")
-    (segment 96 "hi\00")
-    (segment 100 "\00\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00")
+  (data (i32.const 40) "\07\00\00\00\08\00\00\00\t\00\00\00")
+  (data (i32.const 52) "\n\00\00\00\0b\00\00\00")
+  (data (i32.const 60) "\0c\00\00\00\0d\00\00\00\0e\00\00\00")
+  (data (i32.const 72) "\0f\00\00\00\10\00\00\00\11\00\00\00")
+  (data (i32.const 96) "hi\00")
+  (data (i32.const 100) "\00\00\00\00")
   (export "memory" memory)
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
diff --git a/test/dot_s/data-offset-folding.wast b/test/dot_s/data-offset-folding.wast
index e737e04f1..9cdacd60b 100644
--- a/test/dot_s/data-offset-folding.wast
+++ b/test/dot_s/data-offset-folding.wast
@@ -1,8 +1,7 @@
 (module
-  (memory 1
-    (segment 12 "\00\00\00\00")
-    (segment 416 "`\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 12) "\00\00\00\00")
+  (data (i32.const 416) "`\00\00\00")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 420, "initializers": [] }
diff --git a/test/dot_s/function-data-sections.wast b/test/dot_s/function-data-sections.wast
index 82aa6f8c9..43947a3cc 100644
--- a/test/dot_s/function-data-sections.wast
+++ b/test/dot_s/function-data-sections.wast
@@ -1,9 +1,8 @@
 (module
-  (memory 1
-    (segment 12 "\00\00\00\00")
-    (segment 16 "\01\00\00\00")
-    (segment 20 "33\13@")
-  )
+  (memory 1)
+  (data (i32.const 12) "\00\00\00\00")
+  (data (i32.const 16) "\01\00\00\00")
+  (data (i32.const 20) "33\13@")
   (export "memory" memory)
   (export "foo" $foo)
   (export "bar" $bar)
diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast
index 2a5224d00..5fb481197 100644
--- a/test/dot_s/indidx.wast
+++ b/test/dot_s/indidx.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "\04\00\00\00\02\00\00\00\01\00\00\00\03\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "\04\00\00\00\02\00\00\00\01\00\00\00\03\00\00\00")
   (export "memory" memory)
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$v (func))
diff --git a/test/dot_s/lcomm-in-text-segment.wast b/test/dot_s/lcomm-in-text-segment.wast
index 27ebc9b87..e154c6c78 100644
--- a/test/dot_s/lcomm-in-text-segment.wast
+++ b/test/dot_s/lcomm-in-text-segment.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 20 "\10\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 20) "\10\00\00\00")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 24, "initializers": [] }
diff --git a/test/dot_s/macClangMetaData.wast b/test/dot_s/macClangMetaData.wast
index ed41e459c..2d1b5a68f 100644
--- a/test/dot_s/macClangMetaData.wast
+++ b/test/dot_s/macClangMetaData.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "Hello, World!\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "Hello, World!\00")
   (export "memory" memory)
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (import $puts "env" "puts" (param i32) (result i32))
diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast
index 07d5caec3..12a13372e 100644
--- a/test/dot_s/memops.wast
+++ b/test/dot_s/memops.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (import $emscripten_asm_const_vi "env" "emscripten_asm_const_vi" (param i32))
diff --git a/test/dot_s/permute.wast b/test/dot_s/permute.wast
index 13abcf66c..a58bc21c8 100644
--- a/test/dot_s/permute.wast
+++ b/test/dot_s/permute.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2")
-  )
+  (memory 1)
+  (data (i32.const 16) "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 272, "initializers": [] }
diff --git a/test/dot_s/relocation.wast b/test/dot_s/relocation.wast
index 35fcd1562..eb00bac89 100644
--- a/test/dot_s/relocation.wast
+++ b/test/dot_s/relocation.wast
@@ -1,8 +1,7 @@
 (module
-  (memory 1
-    (segment 12 "\10\00\00\00")
-    (segment 16 "\0c\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 12) "\10\00\00\00")
+  (data (i32.const 16) "\0c\00\00\00")
   (export "memory" memory)
   (export "main" $main)
   (func $main (result i32)
diff --git a/test/dot_s/symbolic-offset.wast b/test/dot_s/symbolic-offset.wast
index 15ec8f1be..51879232a 100644
--- a/test/dot_s/symbolic-offset.wast
+++ b/test/dot_s/symbolic-offset.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 12 "\01\00\00\00\00\00\00\00\00\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 12) "\01\00\00\00\00\00\00\00\00\00\00\00")
   (export "memory" memory)
   (export "f" $f)
   (func $f (param $0 i32) (param $1 i32)