Merge remote-tracking branch 'addr64/main' into wasm-3.0

Author: rossberg

document/js-api/index.bs

@@ -1803,7 +1803,8 @@ In practice, an implementation may run out of resources for valid modules below
 
 <ul>
 <li>The maximum size of a table is 10,000,000.</li>
-<li>The maximum number of pages of a memory is 65,536.</li>
+<li>The maximum size of a 32-bit memory is 65,536 pages (4 GiB).</li>
+<li>The maximum size of a 64-bit memory is 262,144 pages (16 GiB).</li>
 </ul>
 
 <h2 id="security-considerations">Security and Privacy Considerations</h2>

proposals/memory64/Overview.md

@@ -88,16 +88,16 @@ have to support 32-bit memory addresses in their ABI.
 * [Memory page limits][valid limits] and [Table entry limits][valid limits] are
   classified by their respective address types
   - ```
-    ⊦ it : k    n <= k    (m <= k)?    (n < m)?
+    ⊦ at : k    n <= k    (m <= k)?    (n < m)?
     -------------------------------------------
-    ⊦ { min n, max m? } : it
+    ⊦ { min n, max m? } : at
     ```
 
 * Memory and Table types are validated accordingly:
   - ```
-    ⊦ limits : it
+    ⊦ limits : at
     --------------
-    ⊦ it limits ok
+    ⊦ at limits ok
     ```
 
 * All [memory instructions][valid meminst] are changed to use the address type,
@@ -195,11 +195,11 @@ have to support 32-bit memory addresses in their ABI.
       ----------------------------------
       C ⊦ tables.fill x : [at t at] → []
       ```
-  - table.copy x y
+  - table.copy d s
     - ```
-        C.tables[d] = aN limits t   C.tables[s] = aM limits t    K = min {aN, AM}
+        C.tables[d] = aD limits t   C.tables[s] = aS limits t    aN = min {aD, aS}
       -----------------------------------------------------------------------------
-      C ⊦ table.copy d s : [aN aM aK] → []
+      C ⊦ table.copy d s : [aD aS aN] → []
       ```
   - table.init x y
     - ```

test/core/memory.wast

@@ -5,6 +5,7 @@
 (module (memory 0 0))
 (module (memory 0 1))
 (module (memory 1 256))
+(module definition (memory 65536))
 (module (memory 0 65536))
 
 (module (memory (data)) (func (export "memsize") (result i32) (memory.size)))

test/core/memory64.wast

@@ -5,6 +5,8 @@
 (module (memory i64 0 1))
 (module (memory i64 1 256))
 (module (memory i64 0 65536))
+(module definition (memory i64 0x1_0000_0000_0000))
+(module (memory i64 0 0x1_0000_0000_0000))
 
 (module (memory i64 (data)) (func (export "memsize") (result i64) (memory.size)))
 (assert_return (invoke "memsize") (i64.const 0))

test/core/table.wast

@@ -6,6 +6,7 @@
 (module (table 0 1 funcref))
 (module (table 1 256 funcref))
 (module (table 0 65536 funcref))
+(module definition (table 0xffff_ffff funcref))
 (module (table 0 0xffff_ffff funcref))
 
 (module (table 1 (ref null func)))
@@ -53,6 +54,9 @@
 (module (table i64 1 256 funcref))
 (module (table i64 0 65536 funcref))
 (module (table i64 0 0xffff_ffff funcref))
+(module (table i64 0 0x1_0000_0000 funcref))
+(module definition (table i64 0xffff_ffff_ffff_ffff funcref))
+(module (table i64 0 0xffff_ffff_ffff_ffff funcref))
 
 (module (table i64 0 funcref) (table i64 0 funcref))
 (module (table (import "spectest" "table64") i64 0 funcref) (table i64 0 funcref))