Skip to content

Commit f834bbb

Browse files
clarify address type
1 parent 322c1ba commit f834bbb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

design/mvp/CanonicalABI.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ been allowed to resolve and explicitly relinquish any borrowed handles.
13191319

13201320
A "buffer" is an abstract region of memory that can either be read-from or
13211321
written-to. This region of memory can either be owned by the host or by wasm.
1322-
Currently wasm memory is always 32-bit linear memory, but soon 64-bit and GC
1322+
Currently wasm memory is always 32-bit or 64-bit linear memory, but soon GC
13231323
memory will be added. Thus, buffers provide an abstraction over at least 4
13241324
different "kinds" of memory.
13251325

@@ -4203,8 +4203,8 @@ For canonical definitions:
42034203
In addition to [general validation of `$opts`](#canonopt-validation) validation
42044204
specifies:
42054205
* `$f` is given type `(func (param i32 T T) (result T))` where `T` is `i32` or
4206-
`i64` as determined by the `memory` from `$opts` (or `i32` by default if no
4207-
`memory` is present).
4206+
`i64` as determined by the address type of `memory` from `$opts` (or `i32` by
4207+
default if no `memory` is present).
42084208
* `$stream_t` must be a type of the form `(stream $t?)`
42094209
* If `$t` is present:
42104210
* [`lower($t)` above](#canonopt-validation) defines required options for `stream.write`
@@ -4324,8 +4324,8 @@ For canonical definitions:
43244324
In addition to [general validation of `$opts`](#canonopt-validation) validation
43254325
specifies:
43264326
* `$f` is given type `(func (param i32 T) (result i32))` where `T` is `i32` or
4327-
`i64` as determined by the `memory` from `$opts` (or `i32` by default if no
4328-
`memory` is present).
4327+
`i64` as determined by the address type of `memory` from `$opts` (or `i32`
4328+
by default if no `memory` is present).
43294329
* `$future_t` must be a type of the form `(future $t?)`
43304330
* If `$t` is present:
43314331
* [`lift($t)` above](#canonopt-validation) defines required options for `future.read`
@@ -4750,7 +4750,7 @@ For a canonical definition:
47504750
validation specifies:
47514751
* `$f` is given type `(func (param $ptr) (param $units) (result i32))`
47524752
where `$ptr` and `$units` are both `i32` or `i64` as determined by
4753-
the `memory` field in `$opts`.
4753+
the address type of the `memory` field in `$opts`.
47544754
* `async` is not present
47554755
* `memory` must be present
47564756

@@ -4792,7 +4792,7 @@ For a canonical definition:
47924792
```
47934793
validation specifies:
47944794
* `$f` is given type `(func (param i32) (param $ptr))` where `$ptr` is `i32` or `i64`
4795-
as determined by the `memory` from `$opts`
4795+
as determined by the address type of `memory` from `$opts`
47964796
* `async` is not present
47974797
* `memory` must be present
47984798
* `realloc` must be present

0 commit comments

Comments
 (0)