Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Update text syntax to use (memory $i) #25

Closed
wants to merge 1 commit into from
Closed

Update text syntax to use (memory $i) #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/core/load.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
(memory $mem2 1)

(func (export "load1") (param i32) (result i64)
(i64.load $mem1 (local.get 0))
(i64.load (memory $mem1) (local.get 0))
)
(func (export "load2") (param i32) (result i64)
(i64.load $mem2 (local.get 0))
(i64.load (memory $mem2) (local.get 0))
)

(data (memory $mem1) (i32.const 0) "\01")
Expand Down Expand Up @@ -36,10 +36,10 @@
(data (memory $mem2) (i32.const 50) "\0A\0B\0C\0D\0E")

(func (export "read1") (param i32) (result i32)
(i32.load8_u $mem1 (local.get 0))
(i32.load8_u (memory $mem1) (local.get 0))
)
(func (export "read2") (param i32) (result i32)
(i32.load8_u $mem2 (local.get 0))
(i32.load8_u (memory $mem2) (local.get 0))
)
)

Expand Down
16 changes: 8 additions & 8 deletions test/core/memory-multi.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
(memory $mem2 1)

(func (export "init1") (result i32)
(memory.init $mem1 $d (i32.const 1) (i32.const 0) (i32.const 4))
(i32.load $mem1 (i32.const 1))
(memory.init $d (memory $mem1) (i32.const 1) (i32.const 0) (i32.const 4))
(i32.load (memory $mem1) (i32.const 1))
)

(func (export "init2") (result i32)
(memory.init $mem2 $d (i32.const 1) (i32.const 4) (i32.const 4))
(i32.load $mem2 (i32.const 1))
(memory.init $d (memory $mem2) (i32.const 1) (i32.const 4) (i32.const 4))
(i32.load (memory $mem2) (i32.const 1))
)

(data $d "\01\00\00\00" "\02\00\00\00")
Expand All @@ -28,13 +28,13 @@
(memory $mem2 1)

(func (export "fill1") (result i32)
(memory.fill $mem1 (i32.const 1) (i32.const 0x01) (i32.const 4))
(i32.load $mem1 (i32.const 1))
(memory.fill (memory $mem1) (i32.const 1) (i32.const 0x01) (i32.const 4))
(i32.load (memory $mem1) (i32.const 1))
)

(func (export "fill2") (result i32)
(memory.fill $mem2 (i32.const 1) (i32.const 0x02) (i32.const 2))
(i32.load $mem2 (i32.const 1))
(memory.fill (memory $mem2) (i32.const 1) (i32.const 0x02) (i32.const 2))
(i32.load (memory $mem2) (i32.const 1))
)
)

Expand Down
24 changes: 12 additions & 12 deletions test/core/store.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
(memory $mem2 1)

(func (export "load1") (param i32) (result i64)
(i64.load $mem1 (local.get 0))
(i64.load (memory $mem1) (local.get 0))
)
(func (export "load2") (param i32) (result i64)
(i64.load $mem2 (local.get 0))
(i64.load (memory $mem2) (local.get 0))
)

(func (export "store1") (param i32 i64)
(i64.store $mem1 (local.get 0) (local.get 1))
(i64.store (memory $mem1) (local.get 0) (local.get 1))
)
(func (export "store2") (param i32 i64)
(i64.store $mem2 (local.get 0) (local.get 1))
(i64.store (memory $mem2) (local.get 0) (local.get 1))
)
)

Expand Down Expand Up @@ -59,17 +59,17 @@
(memory $mem2 (import "M2" "mem") 1)

(func (export "load1") (param i32) (result i64)
(i64.load $mem1 (local.get 0))
(i64.load (memory $mem1) (local.get 0))
)
(func (export "load2") (param i32) (result i64)
(i64.load $mem2 (local.get 0))
(i64.load (memory $mem2) (local.get 0))
)

(func (export "store1") (param i32 i64)
(i64.store $mem1 (local.get 0) (local.get 1))
(i64.store (memory $mem1) (local.get 0) (local.get 1))
)
(func (export "store2") (param i32 i64)
(i64.store $mem2 (local.get 0) (local.get 1))
(i64.store (memory $mem2) (local.get 0) (local.get 1))
)
)

Expand All @@ -92,18 +92,18 @@
(data (memory $mem2) (i32.const 50) "\0A\0B\0C\0D\0E")

(func (export "read1") (param i32) (result i32)
(i32.load8_u $mem1 (local.get 0))
(i32.load8_u (memory $mem1) (local.get 0))
)
(func (export "read2") (param i32) (result i32)
(i32.load8_u $mem2 (local.get 0))
(i32.load8_u (memory $mem2) (local.get 0))
)

(func (export "copy-1-to-2")
(local $i i32)
(local.set $i (i32.const 20))
(loop $cont
(br_if 1 (i32.eq (local.get $i) (i32.const 23)))
(i32.store8 $mem2 (local.get $i) (i32.load8_u $mem1 (local.get $i)))
(i32.store8 (memory $mem2) (local.get $i) (i32.load8_u (memory $mem1) (local.get $i)))
(local.set $i (i32.add (local.get $i) (i32.const 1)))
(br $cont)
)
Expand All @@ -114,7 +114,7 @@
(local.set $i (i32.const 50))
(loop $cont
(br_if 1 (i32.eq (local.get $i) (i32.const 54)))
(i32.store8 $mem1 (local.get $i) (i32.load8_u $mem2 (local.get $i)))
(i32.store8 (memory $mem1) (local.get $i) (i32.load8_u (memory $mem2) (local.get $i)))
(local.set $i (i32.add (local.get $i) (i32.const 1)))
(br $cont)
)
Expand Down