Change the memory sizes to be in units of pages rather than powers of two.

14 files changed, 28 insertions, 28 deletions

diff --git a/test/parse/module/bad-memory-init-size-negative.txt b/test/parse/module/bad-memory-init-size-negative.txt
index 1c917c94..ba8c787f 100644
--- a/test/parse/module/bad-memory-init-size-negative.txt
+++ b/test/parse/module/bad-memory-init-size-negative.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (memory -100))
 (;; STDERR ;;;
-parse/module/bad-memory-init-size-negative.txt:2:17: invalid initial memory size "-100"
+parse/module/bad-memory-init-size-negative.txt:2:17: invalid initial memory pages "-100"
 (module (memory -100))
                 ^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-memory-max-less-than-init.txt b/test/parse/module/bad-memory-max-less-than-init.txt
index 3435cc70..79668cc3 100644
--- a/test/parse/module/bad-memory-max-less-than-init.txt
+++ b/test/parse/module/bad-memory-max-less-than-init.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
-(module (memory 100 50))
+(module (memory 2 1))
 (;; STDERR ;;;
-parse/module/bad-memory-max-less-than-init.txt:2:10: max size (50) must be greater than or equal to initial size (100)
-(module (memory 100 50))
+parse/module/bad-memory-max-less-than-init.txt:2:10: max pages (1) must be greater than or equal to initial pages (2)
+(module (memory 2 1))
          ^^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-memory-max-size-negative.txt b/test/parse/module/bad-memory-max-size-negative.txt
index fadc50af..923eb00f 100644
--- a/test/parse/module/bad-memory-max-size-negative.txt
+++ b/test/parse/module/bad-memory-max-size-negative.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module (memory 100 -5))
 (;; STDERR ;;;
-parse/module/bad-memory-max-size-negative.txt:2:21: invalid max memory size "-5"
+parse/module/bad-memory-max-size-negative.txt:2:21: invalid max memory pages "-5"
 (module (memory 100 -5))
                     ^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-memory-segment-address-oob.txt b/test/parse/module/bad-memory-segment-address-oob.txt
index 4e728fec..aca84f9b 100644
--- a/test/parse/module/bad-memory-segment-address-oob.txt
+++ b/test/parse/module/bad-memory-segment-address-oob.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
-(module (memory 100 (segment 200 "hi")))
+(module (memory 1 (segment 80000 "hi")))
 (;; STDERR ;;;
-parse/module/bad-memory-segment-address-oob.txt:2:22: address (200) greater than initial memory size (100)
-(module (memory 100 (segment 200 "hi")))
-                     ^^^^^^^
+parse/module/bad-memory-segment-address-oob.txt:2:20: address (80000) greater than initial memory size (65536)
+(module (memory 1 (segment 80000 "hi")))
+                   ^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-memory-segment-end-oob.txt b/test/parse/module/bad-memory-segment-end-oob.txt
index 12da9db9..549155eb 100644
--- a/test/parse/module/bad-memory-segment-end-oob.txt
+++ b/test/parse/module/bad-memory-segment-end-oob.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
-(module (memory 10 (segment 5 "56789a")))
+(module (memory 1 (segment 65531 "56789a")))
 (;; STDERR ;;;
-parse/module/bad-memory-segment-end-oob.txt:2:21: segment ends past the end of initial memory size (10)
-(module (memory 10 (segment 5 "56789a")))
-                    ^^^^^^^
+parse/module/bad-memory-segment-end-oob.txt:2:20: segment ends past the end of initial memory size (65536)
+(module (memory 1 (segment 65531 "56789a")))
+                   ^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-memory-segment-overlap.txt b/test/parse/module/bad-memory-segment-overlap.txt
index 952b2e65..0fb5258d 100644
--- a/test/parse/module/bad-memory-segment-overlap.txt
+++ b/test/parse/module/bad-memory-segment-overlap.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
-(module (memory 100 (segment 0 "hello") (segment 3 "hi")))
+(module (memory 1 (segment 0 "hello") (segment 3 "hi")))
 (;; STDERR ;;;
-parse/module/bad-memory-segment-overlap.txt:2:42: address (3) less than end of previous segment (5)
-(module (memory 100 (segment 0 "hello") (segment 3 "hi")))
-                                         ^^^^^^^
+parse/module/bad-memory-segment-overlap.txt:2:40: address (3) less than end of previous segment (5)
+(module (memory 1 (segment 0 "hello") (segment 3 "hi")))
+                                       ^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/bad-memory-too-many.txt b/test/parse/module/bad-memory-too-many.txt
index 19fc362c..bc9ce592 100644
--- a/test/parse/module/bad-memory-too-many.txt
+++ b/test/parse/module/bad-memory-too-many.txt
@@ -1,9 +1,9 @@
 ;;; ERROR: 1
 (module
-  (memory 100)
-  (memory 1000))
+  (memory 65536)
+  (memory 131072))
 (;; STDERR ;;;
 parse/module/bad-memory-too-many.txt:4:3: only one memory block allowed
-  (memory 1000))
-  ^^^^^^^^^^^^^
+  (memory 131072))
+  ^^^^^^^^^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/module/export-memory-multi.txt b/test/parse/module/export-memory-multi.txt
index 0f0f01bb..911f829c 100644
--- a/test/parse/module/export-memory-multi.txt
+++ b/test/parse/module/export-memory-multi.txt
@@ -1,4 +1,4 @@
 (module
-  (memory 42)
+  (memory 65536)
   (export "mem1" memory)
   (export "mem2" memory))
diff --git a/test/parse/module/export-memory.txt b/test/parse/module/export-memory.txt
index 0a3cd6bf..7e0c2e49 100644
--- a/test/parse/module/export-memory.txt
+++ b/test/parse/module/export-memory.txt
@@ -1,3 +1,3 @@
 (module
-  (memory 100)
+  (memory 65536)
   (export "mem" memory))
diff --git a/test/parse/module/memory-init-max-size.txt b/test/parse/module/memory-init-max-size.txt
index ecefc97c..eb89c17d 100644
--- a/test/parse/module/memory-init-max-size.txt
+++ b/test/parse/module/memory-init-max-size.txt
@@ -1 +1 @@
-(module (memory 100 200))
+(module (memory 65536 131072))
diff --git a/test/parse/module/memory-init-size.txt b/test/parse/module/memory-init-size.txt
index ee26fe96..99116d1e 100644
--- a/test/parse/module/memory-init-size.txt
+++ b/test/parse/module/memory-init-size.txt
@@ -1 +1 @@
-(module (memory 100))
+(module (memory 65536))
diff --git a/test/parse/module/memory-segment-1.txt b/test/parse/module/memory-segment-1.txt
index 062a5942..55c58ac3 100644
--- a/test/parse/module/memory-segment-1.txt
+++ b/test/parse/module/memory-segment-1.txt
@@ -1 +1 @@
-(module (memory 100 (segment 0 "hello, world!")))
+(module (memory 1 (segment 0 "hello, world!")))
diff --git a/test/parse/module/memory-segment-long.txt b/test/parse/module/memory-segment-long.txt
index 4a64ef87..6d8e9d30 100644
--- a/test/parse/module/memory-segment-long.txt
+++ b/test/parse/module/memory-segment-long.txt
@@ -3,7 +3,7 @@
 ;; the very long segment strings were causing the strings that store the
 ;; initial size and max size to be clobbered.
 (module
-  (memory 19448 4294967295
+  (memory 1 65535
     (segment 8 "\10\01\00\00")
     (segment 16 "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\03 \02 \02 \02 \02 \02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\01`\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\08\d5\08\d5\08\d5\08\d5\08\d5\08\d5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\08\d6\08\d6\08\d6\08\d6\08\d6\08\d6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\04\c0\04\c0\04\c0\04\c0\02\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
     (segment 784 " \05\00\00")
diff --git a/test/parse/module/memory-segment-many.txt b/test/parse/module/memory-segment-many.txt
index 5a0075e1..d83aab6a 100644
--- a/test/parse/module/memory-segment-many.txt
+++ b/test/parse/module/memory-segment-many.txt
@@ -1,5 +1,5 @@
 (module
-  (memory 100
+  (memory 1
     (segment 0 "hi")
     (segment 4 "hello")
     (segment 10 "goodbye")