Make initial and max memory sizes be in pages instead of bytes

The AST and everything that uses it treats the values as
pages. Javascript continues to use bytes.
This matches v8 and sexpr-wasm, and the consensus from live discussion
and  PR209 in the spec.

47 files changed, 45 insertions, 46 deletions

diff --git a/test/dot_s/alternate-lcomm.wast b/test/dot_s/alternate-lcomm.wast
index 1f36b1584..824a27ae6 100644
--- a/test/dot_s/alternate-lcomm.wast
+++ b/test/dot_s/alternate-lcomm.wast
@@ -1,4 +1,4 @@
 (module
-  (memory 9)
+  (memory 1)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 8 }
diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast
index aaf647d86..e0d34365e 100644
--- a/test/dot_s/asm_const.wast
+++ b/test/dot_s/asm_const.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 51
+  (memory 1
     (segment 16 "{ Module.print(\"hello, world!\"); }\00")
   )
   (type $FUNCSIG$vi (func (param i32)))
diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast
index b20f97149..3eab56fd4 100644
--- a/test/dot_s/basics.wast
+++ b/test/dot_s/basics.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 52
+  (memory 1
     (segment 16 "hello, world!\n\00")
     (segment 32 "vcq")
     (segment 48 "\16\00\00\00")
diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast
index 782c38ad8..9d6ccc22b 100644
--- a/test/dot_s/bcp-1.wast
+++ b/test/dot_s/bcp-1.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 104
+  (memory 1
     (segment 16 "\00\00\00\00\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00")
     (segment 40 "\06\00\00\00\07\00\00\00\08\00\00\00")
     (segment 52 "\t\00\00\00\n\00\00\00")
diff --git a/test/dot_s/data-offset-folding.wast b/test/dot_s/data-offset-folding.wast
index c60ce22e5..98c73e3b1 100644
--- a/test/dot_s/data-offset-folding.wast
+++ b/test/dot_s/data-offset-folding.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 420
+  (memory 1
     (segment 8 "\00\00\00\00")
     (segment 416 "`\00\00\00")
   )
diff --git a/test/dot_s/function-data-sections.wast b/test/dot_s/function-data-sections.wast
index d07fe95a6..e9ba95f43 100644
--- a/test/dot_s/function-data-sections.wast
+++ b/test/dot_s/function-data-sections.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 20
+  (memory 1
     (segment 8 "\00\00\00\00")
     (segment 12 "\01\00\00\00")
     (segment 16 "33\13@")
diff --git a/test/dot_s/lcomm-in-text-segment.wast b/test/dot_s/lcomm-in-text-segment.wast
index 956fe6157..ac81f5898 100644
--- a/test/dot_s/lcomm-in-text-segment.wast
+++ b/test/dot_s/lcomm-in-text-segment.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 20
+  (memory 1
     (segment 16 "\t\00\00\00")
   )
 )
diff --git a/test/dot_s/macClangMetaData.wast b/test/dot_s/macClangMetaData.wast
index d6cb6f85f..e68a517e6 100644
--- a/test/dot_s/macClangMetaData.wast
+++ b/test/dot_s/macClangMetaData.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 30
+  (memory 1
     (segment 16 "Hello, World!\00")
   )
   (type $FUNCSIG$ii (func (param i32) (result i32)))
diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast
index d78de6926..fec2ac9be 100644
--- a/test/dot_s/memops.wast
+++ b/test/dot_s/memops.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 67
+  (memory 1
     (segment 16 "{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }\00")
   )
   (type $FUNCSIG$vi (func (param i32)))
diff --git a/test/dot_s/permute.wast b/test/dot_s/permute.wast
index 2651808fb..5f6add279 100644
--- a/test/dot_s/permute.wast
+++ b/test/dot_s/permute.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 272
+  (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")
   )
 )
diff --git a/test/dot_s/relocation.wast b/test/dot_s/relocation.wast
index 36bbef38d..eb7c73119 100644
--- a/test/dot_s/relocation.wast
+++ b/test/dot_s/relocation.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16
+  (memory 1
     (segment 8 "\0c\00\00\00")
     (segment 12 "\08\00\00\00")
   )
diff --git a/test/dot_s/symbolic-offset.wast b/test/dot_s/symbolic-offset.wast
index 28c7f142f..ffc7dbb01 100644
--- a/test/dot_s/symbolic-offset.wast
+++ b/test/dot_s/symbolic-offset.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 20
+  (memory 1
     (segment 8 "\01\00\00\00\00\00\00\00\00\00\00\00")
   )
   (export "f" $f)
diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm
index 9bdf4286c..3cd26deb2 100644
--- a/test/emcc_O2_hello_world.fromasm
+++ b/test/emcc_O2_hello_world.fromasm
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (type $FUNCSIG$vi (func (param i32)))
diff --git a/test/emcc_O2_hello_world.wast.fromBinary b/test/emcc_O2_hello_world.wast.fromBinary
index 6ede653f6..d984427ee 100644
--- a/test/emcc_O2_hello_world.wast.fromBinary
+++ b/test/emcc_O2_hello_world.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $0 (func (param i32 i32 i32) (result i32)))
   (type $1 (func (param i32) (result i32)))
   (type $2 (func (param i32)))
diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index e0bb3bfd3..bda303906 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
   (type $FUNCSIG$id (func (param f64) (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
diff --git a/test/emcc_hello_world.wast.fromBinary b/test/emcc_hello_world.wast.fromBinary
index eaed95225..5e1351813 100644
--- a/test/emcc_hello_world.wast.fromBinary
+++ b/test/emcc_hello_world.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $0 (func (param i32 i32 i32) (result i32)))
   (type $1 (func (param i32) (result i32)))
   (type $2 (func (param i32)))
diff --git a/test/hello_world.fromasm b/test/hello_world.fromasm
index 78722b0d0..f2dc36277 100644
--- a/test/hello_world.fromasm
+++ b/test/hello_world.fromasm
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (export "add" $add)
   (func $add (param $x i32) (param $y i32) (result i32)
     (return
diff --git a/test/hello_world.wast b/test/hello_world.wast
index 1c8f9d359..0a2dd083d 100644
--- a/test/hello_world.wast
+++ b/test/hello_world.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (export "add" $add)
   (func $add (param $x i32) (param $y i32) (result i32)
     (i32.add
diff --git a/test/hello_world.wast.fromBinary b/test/hello_world.wast.fromBinary
index 74331f60c..77a0fee04 100644
--- a/test/hello_world.wast.fromBinary
+++ b/test/hello_world.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $0 (func (param i32 i32) (result i32)))
   (export "add" $add)
   (func $add (type $0) (param $var$0 i32) (param $var$1 i32) (result i32)
diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast
index 6cc5e06a0..9e43e7ba7 100644
--- a/test/llvm_autogenerated/global.wast
+++ b/test/llvm_autogenerated/global.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 1196
+  (memory 1
     (segment 8 "9\05\00\00")
     (segment 24 "\01\00\00\00")
     (segment 28 "*\00\00\00")
diff --git a/test/llvm_autogenerated/offset-folding.wast b/test/llvm_autogenerated/offset-folding.wast
index 66b31c294..2e5a236e9 100644
--- a/test/llvm_autogenerated/offset-folding.wast
+++ b/test/llvm_autogenerated/offset-folding.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 216)
+  (memory 1)
   (export "test0" $test0)
   (export "test1" $test1)
   (export "test2" $test2)
diff --git a/test/llvm_autogenerated/offset.wast b/test/llvm_autogenerated/offset.wast
index 9a37840b7..a36e37985 100644
--- a/test/llvm_autogenerated/offset.wast
+++ b/test/llvm_autogenerated/offset.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 12
+  (memory 1
     (segment 8 "\00\00\00\00")
   )
   (export "load_i32_with_folded_offset" $load_i32_with_folded_offset)
diff --git a/test/llvm_autogenerated/store-results.wast b/test/llvm_autogenerated/store-results.wast
index 83277c92f..3d0fe94cf 100644
--- a/test/llvm_autogenerated/store-results.wast
+++ b/test/llvm_autogenerated/store-results.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 20)
+  (memory 1)
   (export "single_block" $single_block)
   (export "foo" $foo)
   (export "bar" $bar)
diff --git a/test/min.fromasm b/test/min.fromasm
index 4e5c4639d..838f78053 100644
--- a/test/min.fromasm
+++ b/test/min.fromasm
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (export "floats" $floats)
   (func $floats (param $f f32) (result f32)
     (local $t f32)
diff --git a/test/min.wast b/test/min.wast
index b626cd42a..790e29e9b 100644
--- a/test/min.wast
+++ b/test/min.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (export "floats" $floats)
   (func $floats (param $f f32) (result f32)
     (local $t f32)
diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary
index 0c1fe8571..f48fdf8ec 100644
--- a/test/min.wast.fromBinary
+++ b/test/min.wast.fromBinary
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $0 (func (param f32) (result f32)))
   (type $1 (func (param i32 i32) (result f32)))
   (type $2 (func (param i32) (result i32)))
diff --git a/test/passes/lower-if-else.txt b/test/passes/lower-if-else.txt
index 76aeb58f5..ab840ef04 100644
--- a/test/passes/lower-if-else.txt
+++ b/test/passes/lower-if-else.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $ifs
     (block $block0
       (if
diff --git a/test/passes/lower-if-else.wast b/test/passes/lower-if-else.wast
index 11c44fadf..138a8a206 100644
--- a/test/passes/lower-if-else.wast
+++ b/test/passes/lower-if-else.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $ifs
     (block
       (if
diff --git a/test/passes/merge-blocks.txt b/test/passes/merge-blocks.txt
index bb8814eee..2b4278f7c 100644
--- a/test/passes/merge-blocks.txt
+++ b/test/passes/merge-blocks.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $i1 i32)
     (block $topmost
       (block $block0
diff --git a/test/passes/merge-blocks.wast b/test/passes/merge-blocks.wast
index bd58ebc38..09eefefdb 100644
--- a/test/passes/merge-blocks.wast
+++ b/test/passes/merge-blocks.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $i1 i32)
     (block $topmost
       (block
diff --git a/test/passes/metrics.txt b/test/passes/metrics.txt
index c5e3a49ee..05a69c5aa 100644
--- a/test/passes/metrics.txt
+++ b/test/passes/metrics.txt
@@ -5,7 +5,7 @@ Counts
  if             : 4       
 Total           : 18      
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $ifs
     (block $block0
       (if
diff --git a/test/passes/metrics.wast b/test/passes/metrics.wast
index 11c44fadf..138a8a206 100644
--- a/test/passes/metrics.wast
+++ b/test/passes/metrics.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $ifs
     (block
       (if
diff --git a/test/passes/post-emscripten.txt b/test/passes/post-emscripten.txt
index 567a8b849..8687a8743 100644
--- a/test/passes/post-emscripten.txt
+++ b/test/passes/post-emscripten.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0 (param $x i32)
     (i32.load offset=1
       (get_local $x)
diff --git a/test/passes/post-emscripten.wast b/test/passes/post-emscripten.wast
index df56817a7..1da5afd61 100644
--- a/test/passes/post-emscripten.wast
+++ b/test/passes/post-emscripten.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0 (param $x i32)
     (i32.load
       (i32.add
diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt
index 53635621d..d4c50563d 100644
--- a/test/passes/remove-unused-brs.txt
+++ b/test/passes/remove-unused-brs.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $i1 i32)
     (block $topmost
     )
diff --git a/test/passes/remove-unused-brs.wast b/test/passes/remove-unused-brs.wast
index 2598a45f4..8e1a557ef 100644
--- a/test/passes/remove-unused-brs.wast
+++ b/test/passes/remove-unused-brs.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $i1 i32)
     (block $topmost
       (br $topmost)
diff --git a/test/passes/remove-unused-names.txt b/test/passes/remove-unused-names.txt
index 045a3288c..c73772d99 100644
--- a/test/passes/remove-unused-names.txt
+++ b/test/passes/remove-unused-names.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0 (param $i1 i32) (result i32)
     (i32.const 0)
   )
diff --git a/test/passes/remove-unused-names.wast b/test/passes/remove-unused-names.wast
index ae6b2d31b..8cf74ca07 100644
--- a/test/passes/remove-unused-names.wast
+++ b/test/passes/remove-unused-names.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0 (param $i1 i32) (result i32)
     (block $topmost
       (i32.const 0)
diff --git a/test/passes/reorder-locals.txt b/test/passes/reorder-locals.txt
index 31d540db7..63c98f674 100644
--- a/test/passes/reorder-locals.txt
+++ b/test/passes/reorder-locals.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $a i32) (param $b i32)
     (local $z i32)
     (local $y i32)
diff --git a/test/passes/reorder-locals.wast b/test/passes/reorder-locals.wast
index 282f7ff98..ff840e3ca 100644
--- a/test/passes/reorder-locals.wast
+++ b/test/passes/reorder-locals.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $a i32) (param $b i32)
     (local $x i32)
     (local $y i32)
diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt
index 773215ad7..4b0a1ca2b 100644
--- a/test/passes/simplify-locals.txt
+++ b/test/passes/simplify-locals.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $i1 i32)
     (local $x i32)
     (local $y i32)
diff --git a/test/passes/simplify-locals.wast b/test/passes/simplify-locals.wast
index fca2f24c7..2fd3a5f4c 100644
--- a/test/passes/simplify-locals.wast
+++ b/test/passes/simplify-locals.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (func $b0-yes (param $i1 i32)
     (local $x i32)
     (local $y i32)
diff --git a/test/print/min.wast b/test/print/min.wast
index e38662bb1..1d1f87be6 100644
--- a/test/print/min.wast
+++ b/test/print/min.wast
@@ -1 +1 @@
-(module(memory 16777216 16777216)(export "floats" $floats)(func $floats(param $f f32)(result f32)(local $t f32)(f32.add(get_local $t)(get_local $f)))(func $neg(param $k i32)(param $p i32)(result f32)(local $n f32)(set_local $n(f32.neg(block $block0(i32.store(get_local $k)(get_local $p))(f32.load(get_local $k))))))(func $littleswitch(param $x i32)(result i32)(block $topmost(tableswitch $switch$0(i32.sub(get_local $x)(i32.const 1))(table(case $switch-case$1)(case $switch-case$2)) (case $switch-case$1)(case $switch-case$1(br $topmost(i32.const 1)))(case $switch-case$2(br $topmost(i32.const 2))))(i32.const 0)))(func $f1(param $i1 i32)(param $i2 i32)(param $i3 i32)(result i32)(block $topmost(get_local $i3))))
+(module(memory 256 256)(export "floats" $floats)(func $floats(param $f f32)(result f32)(local $t f32)(f32.add(get_local $t)(get_local $f)))(func $neg(param $k i32)(param $p i32)(result f32)(local $n f32)(set_local $n(f32.neg(block $block0(i32.store(get_local $k)(get_local $p))(f32.load(get_local $k))))))(func $littleswitch(param $x i32)(result i32)(block $topmost(tableswitch $switch$0(i32.sub(get_local $x)(i32.const 1))(table(case $switch-case$1)(case $switch-case$2)) (case $switch-case$1)(case $switch-case$1(br $topmost(i32.const 1)))(case $switch-case$2(br $topmost(i32.const 2))))(i32.const 0)))(func $f1(param $i1 i32)(param $i2 i32)(param $i3 i32)(result i32)(block $topmost(get_local $i3))))
diff --git a/test/s2wasm_known_binaryen_shell_test_failures.txt b/test/s2wasm_known_binaryen_shell_test_failures.txt
index e619a7dc9..799a100fe 100644
--- a/test/s2wasm_known_binaryen_shell_test_failures.txt
+++ b/test/s2wasm_known_binaryen_shell_test_failures.txt
@@ -28,7 +28,6 @@ bitfld-5.c.s.wast
 memcpy-1.c.s.wast
 mode-dependent-address.c.s.wast
 multi-ix.c.s.wast
-pr29006.c.s.wast
 pr37573.c.s.wast
 pr43236.c.s.wast
 pr44852.c.s.wast
diff --git a/test/spec b/test/spec
-Subproject b12d2271c9c6f4f02bd7d788ac5dce4f6eb696d
+Subproject 3fdec99e94434b58d7477834c2be6b81c1aea91
diff --git a/test/two_sides.fromasm b/test/two_sides.fromasm
index bacef4212..3b71caef8 100644
--- a/test/two_sides.fromasm
+++ b/test/two_sides.fromasm
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $FUNCSIG$id (func (param f64) (result i32)))
   (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
   (export "_test" $_test)
diff --git a/test/unit.fromasm b/test/unit.fromasm
index 0895d39d8..4133eb491 100644
--- a/test/unit.fromasm
+++ b/test/unit.fromasm
@@ -1,5 +1,5 @@
 (module
-  (memory 16777216 16777216)
+  (memory 256 256)
   (type $FUNCSIG$id (func (param f64) (result i32)))
   (type $FUNCSIG$ddd (func (param f64 f64) (result f64)))
   (type $FUNCSIG$vf (func (param f32)))