summaryrefslogtreecommitdiff
path: root/test/lld
diff options
context:
space:
mode:
Diffstat (limited to 'test/lld')
-rw-r--r--test/lld/duplicate_imports.wast2
-rw-r--r--test/lld/duplicate_imports.wast.out48
-rw-r--r--test/lld/em_asm.wast2
-rw-r--r--test/lld/em_asm.wast.out22
-rw-r--r--test/lld/em_asm_table.wast2
-rw-r--r--test/lld/em_asm_table.wast.out36
-rw-r--r--test/lld/hello_world.wast2
-rw-r--r--test/lld/hello_world.wast.mem.out22
-rw-r--r--test/lld/hello_world.wast.out22
-rw-r--r--test/lld/init.wast2
-rw-r--r--test/lld/init.wast.out22
-rw-r--r--test/lld/recursive.wast40
-rw-r--r--test/lld/recursive.wast.out60
-rw-r--r--test/lld/reserved_func_ptr.wast34
-rw-r--r--test/lld/reserved_func_ptr.wast.jscall.out128
-rw-r--r--test/lld/reserved_func_ptr.wast.out62
16 files changed, 253 insertions, 253 deletions
diff --git a/test/lld/duplicate_imports.wast b/test/lld/duplicate_imports.wast
index 8147f5d2f..db184bcad 100644
--- a/test/lld/duplicate_imports.wast
+++ b/test/lld/duplicate_imports.wast
@@ -9,7 +9,7 @@
(global $global$0 (mut i32) (i32.const 66128))
(global $global$1 i32 (i32.const 66128))
(global $global$2 i32 (i32.const 581))
- (table 1 1 anyfunc)
+ (table 1 1 funcref)
(memory $0 2)
(data (i32.const 568) "Hello, world\00")
(export "memory" (memory $0))
diff --git a/test/lld/duplicate_imports.wast.out b/test/lld/duplicate_imports.wast.out
index 7de123df9..6d3417b26 100644
--- a/test/lld/duplicate_imports.wast.out
+++ b/test/lld/duplicate_imports.wast.out
@@ -16,8 +16,8 @@
(import "env" "invoke_ffd" (func $legalimport$invoke_ffd2 (param i32 f64 f64) (result f64)))
(memory $0 2)
(data (i32.const 568) "Hello, world\00")
- (table $0 1 1 anyfunc)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (table $0 1 1 funcref)
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66128))
(global $global$2 i32 (i32.const 581))
(export "memory" (memory $0))
@@ -42,63 +42,63 @@
)
(func $legalfunc$puts2 (; 6 ;) (param $0 i64) (result i32)
(call $legalimport$puts2
- (i32.wrap/i64
- (get_local $0)
+ (i32.wrap_i64
+ (local.get $0)
)
- (i32.wrap/i64
+ (i32.wrap_i64
(i64.shr_u
- (get_local $0)
+ (local.get $0)
(i64.const 32)
)
)
)
)
(func $legalfunc$invoke_ffd (; 7 ;) (param $0 i32) (param $1 f32) (param $2 f64) (result f32)
- (f32.demote/f64
+ (f32.demote_f64
(call $legalimport$invoke_ffd
- (get_local $0)
- (f64.promote/f32
- (get_local $1)
+ (local.get $0)
+ (f64.promote_f32
+ (local.get $1)
)
- (get_local $2)
+ (local.get $2)
)
)
)
(func $legalfunc$invoke_ffd2 (; 8 ;) (param $0 i32) (param $1 f64) (param $2 f64) (result f32)
- (f32.demote/f64
+ (f32.demote_f64
(call $legalimport$invoke_ffd2
- (get_local $0)
- (get_local $1)
- (get_local $2)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
)
)
)
(func $stackSave (; 9 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 10 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 11 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 12 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
)
diff --git a/test/lld/em_asm.wast b/test/lld/em_asm.wast
index b1f4d4fe2..5a171fb5b 100644
--- a/test/lld/em_asm.wast
+++ b/test/lld/em_asm.wast
@@ -10,7 +10,7 @@
(global $global$0 (mut i32) (i32.const 66192))
(global $global$1 i32 (i32.const 66192))
(global $global$2 i32 (i32.const 652))
- (table 1 1 anyfunc)
+ (table 1 1 funcref)
(memory $0 2)
(data (i32.const 568) "{ Module.print(\"Hello world\"); }\00{ return $0 + $1; }\00{ Module.print(\"Got \" + $0); }\00")
(export "memory" (memory $0))
diff --git a/test/lld/em_asm.wast.out b/test/lld/em_asm.wast.out
index 68ee4dda3..009dedc55 100644
--- a/test/lld/em_asm.wast.out
+++ b/test/lld/em_asm.wast.out
@@ -13,8 +13,8 @@
(import "env" "emscripten_asm_const_ii" (func $emscripten_asm_const_ii (param i32 i32) (result i32)))
(memory $0 2)
(data (i32.const 568) "{ Module.print(\"Hello world\"); }\00{ return $0 + $1; }\00{ Module.print(\"Got \" + $0); }\00")
- (table $0 1 1 anyfunc)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (table $0 1 1 funcref)
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66192))
(global $global$2 i32 (i32.const 652))
(export "memory" (memory $0))
@@ -48,31 +48,31 @@
(nop)
)
(func $stackSave (; 5 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 6 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 7 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 8 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
)
diff --git a/test/lld/em_asm_table.wast b/test/lld/em_asm_table.wast
index 01039bf09..c35ebe577 100644
--- a/test/lld/em_asm_table.wast
+++ b/test/lld/em_asm_table.wast
@@ -4,7 +4,7 @@
(import "env" "memory" (memory $2 8192))
(import "env" "emscripten_log" (func $fimport$0 (param i32 i32)))
(import "env" "emscripten_asm_const_int" (func $fimport$1 (param i32 i32 i32) (result i32)))
- (table $0 159609 anyfunc)
+ (table $0 159609 funcref)
(elem (i32.const 1) $fimport$0 $fimport$1)
(global $global$0 (mut i32) (i32.const 1024))
(global $global$1 i32 (i32.const 1048))
diff --git a/test/lld/em_asm_table.wast.out b/test/lld/em_asm_table.wast.out
index e91b333b2..35e593dd7 100644
--- a/test/lld/em_asm_table.wast.out
+++ b/test/lld/em_asm_table.wast.out
@@ -7,9 +7,9 @@
(import "env" "STACKTOP" (global $stack$init i32))
(import "env" "emscripten_log" (func $fimport$0 (param i32 i32)))
(import "env" "emscripten_asm_const_iii" (func $emscripten_asm_const_iii (param i32 i32 i32) (result i32)))
- (table $0 159609 anyfunc)
+ (table $0 159609 funcref)
(elem (i32.const 1) $fimport$0 $emscripten_asm_const_iii)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 1048))
(export "__data_end" (global $global$1))
(export "stackSave" (func $stackSave))
@@ -19,46 +19,46 @@
(export "dynCall_vii" (func $dynCall_vii))
(export "dynCall_iiii" (func $dynCall_iiii))
(func $stackSave (; 2 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 3 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 4 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 5 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
(func $dynCall_vii (; 6 ;) (param $fptr i32) (param $0 i32) (param $1 i32)
(call_indirect (type $FUNCSIG$vii)
- (get_local $0)
- (get_local $1)
- (get_local $fptr)
+ (local.get $0)
+ (local.get $1)
+ (local.get $fptr)
)
)
(func $dynCall_iiii (; 7 ;) (param $fptr i32) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(call_indirect (type $FUNCSIG$iiii)
- (get_local $0)
- (get_local $1)
- (get_local $2)
- (get_local $fptr)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
+ (local.get $fptr)
)
)
)
diff --git a/test/lld/hello_world.wast b/test/lld/hello_world.wast
index 0564e64a8..5cebc06c8 100644
--- a/test/lld/hello_world.wast
+++ b/test/lld/hello_world.wast
@@ -6,7 +6,7 @@
(global $global$0 (mut i32) (i32.const 66128))
(global $global$1 i32 (i32.const 66128))
(global $global$2 i32 (i32.const 581))
- (table 1 1 anyfunc)
+ (table 1 1 funcref)
(memory $0 2)
(data (i32.const 568) "Hello, world\00")
(export "memory" (memory $0))
diff --git a/test/lld/hello_world.wast.mem.out b/test/lld/hello_world.wast.mem.out
index 5f2576013..078620bcd 100644
--- a/test/lld/hello_world.wast.mem.out
+++ b/test/lld/hello_world.wast.mem.out
@@ -6,8 +6,8 @@
(import "env" "STACKTOP" (global $stack$init i32))
(import "env" "puts" (func $puts (param i32) (result i32)))
(memory $0 2)
- (table $0 1 1 anyfunc)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (table $0 1 1 funcref)
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66128))
(global $global$2 i32 (i32.const 581))
(export "memory" (memory $0))
@@ -31,31 +31,31 @@
(nop)
)
(func $stackSave (; 3 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 4 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 5 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 6 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
)
diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wast.out
index b3b798939..df89a5756 100644
--- a/test/lld/hello_world.wast.out
+++ b/test/lld/hello_world.wast.out
@@ -7,8 +7,8 @@
(import "env" "puts" (func $puts (param i32) (result i32)))
(memory $0 2)
(data (i32.const 568) "Hello, world\00")
- (table $0 1 1 anyfunc)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (table $0 1 1 funcref)
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66128))
(global $global$2 i32 (i32.const 581))
(export "memory" (memory $0))
@@ -32,31 +32,31 @@
(nop)
)
(func $stackSave (; 3 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 4 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 5 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 6 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
)
diff --git a/test/lld/init.wast b/test/lld/init.wast
index 87c2e862f..15bf65e7c 100644
--- a/test/lld/init.wast
+++ b/test/lld/init.wast
@@ -4,7 +4,7 @@
(global $global$0 (mut i32) (i32.const 66112))
(global $global$1 i32 (i32.const 66112))
(global $global$2 i32 (i32.const 576))
- (table 1 1 anyfunc)
+ (table 1 1 funcref)
(memory $0 2)
(data (i32.const 568) "\00\00\00\00\00\00\00\00")
(export "memory" (memory $0))
diff --git a/test/lld/init.wast.out b/test/lld/init.wast.out
index 0cc93c41f..b702fb373 100644
--- a/test/lld/init.wast.out
+++ b/test/lld/init.wast.out
@@ -4,8 +4,8 @@
(import "env" "STACKTOP" (global $stack$init i32))
(memory $0 2)
(data (i32.const 568) "\00\00\00\00\00\00\00\00")
- (table $0 1 1 anyfunc)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (table $0 1 1 funcref)
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66112))
(global $global$2 i32 (i32.const 576))
(export "memory" (memory $0))
@@ -44,31 +44,31 @@
(call $init_y)
)
(func $stackSave (; 4 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 5 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 6 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 7 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
)
diff --git a/test/lld/recursive.wast b/test/lld/recursive.wast
index c6dbdd359..f3501b39b 100644
--- a/test/lld/recursive.wast
+++ b/test/lld/recursive.wast
@@ -6,7 +6,7 @@
(global $global$0 (mut i32) (i32.const 66128))
(global $global$1 i32 (i32.const 66128))
(global $global$2 i32 (i32.const 587))
- (table 1 1 anyfunc)
+ (table 1 1 funcref)
(memory $0 2)
(data (i32.const 568) "%d:%d\n\00Result: %d\n\00")
(export "memory" (memory $0))
@@ -16,51 +16,51 @@
(export "__data_end" (global $global$2))
(func $foo (; 1 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32)
(local $var$2 i32)
- (set_global $global$0
- (tee_local $var$2
+ (global.set $global$0
+ (local.tee $var$2
(i32.sub
- (get_global $global$0)
+ (global.get $global$0)
(i32.const 16)
)
)
)
(i32.store offset=4
- (get_local $var$2)
- (get_local $var$1)
+ (local.get $var$2)
+ (local.get $var$1)
)
(i32.store
- (get_local $var$2)
- (get_local $var$0)
+ (local.get $var$2)
+ (local.get $var$0)
)
(drop
(call $printf
(i32.const 568)
- (get_local $var$2)
+ (local.get $var$2)
)
)
- (set_global $global$0
+ (global.set $global$0
(i32.add
- (get_local $var$2)
+ (local.get $var$2)
(i32.const 16)
)
)
(i32.add
- (get_local $var$1)
- (get_local $var$0)
+ (local.get $var$1)
+ (local.get $var$0)
)
)
(func $main (; 2 ;) (type $1) (result i32)
(local $var$0 i32)
- (set_global $global$0
- (tee_local $var$0
+ (global.set $global$0
+ (local.tee $var$0
(i32.sub
- (get_global $global$0)
+ (global.get $global$0)
(i32.const 16)
)
)
)
(i32.store
- (get_local $var$0)
+ (local.get $var$0)
(call $foo
(i32.const 1)
(i32.const 2)
@@ -69,12 +69,12 @@
(drop
(call $printf
(i32.const 575)
- (get_local $var$0)
+ (local.get $var$0)
)
)
- (set_global $global$0
+ (global.set $global$0
(i32.add
- (get_local $var$0)
+ (local.get $var$0)
(i32.const 16)
)
)
diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wast.out
index 7ad93a97b..1c1180e1c 100644
--- a/test/lld/recursive.wast.out
+++ b/test/lld/recursive.wast.out
@@ -7,8 +7,8 @@
(import "env" "printf" (func $printf (param i32 i32) (result i32)))
(memory $0 2)
(data (i32.const 568) "%d:%d\n\00Result: %d\n\00")
- (table $0 1 1 anyfunc)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (table $0 1 1 funcref)
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66128))
(global $global$2 i32 (i32.const 587))
(export "memory" (memory $0))
@@ -22,51 +22,51 @@
(export "__growWasmMemory" (func $__growWasmMemory))
(func $foo (; 1 ;) (type $0) (param $var$0 i32) (param $var$1 i32) (result i32)
(local $var$2 i32)
- (set_global $global$0
- (tee_local $var$2
+ (global.set $global$0
+ (local.tee $var$2
(i32.sub
- (get_global $global$0)
+ (global.get $global$0)
(i32.const 16)
)
)
)
(i32.store offset=4
- (get_local $var$2)
- (get_local $var$1)
+ (local.get $var$2)
+ (local.get $var$1)
)
(i32.store
- (get_local $var$2)
- (get_local $var$0)
+ (local.get $var$2)
+ (local.get $var$0)
)
(drop
(call $printf
(i32.const 568)
- (get_local $var$2)
+ (local.get $var$2)
)
)
- (set_global $global$0
+ (global.set $global$0
(i32.add
- (get_local $var$2)
+ (local.get $var$2)
(i32.const 16)
)
)
(i32.add
- (get_local $var$1)
- (get_local $var$0)
+ (local.get $var$1)
+ (local.get $var$0)
)
)
(func $main (; 2 ;) (type $1) (result i32)
(local $var$0 i32)
- (set_global $global$0
- (tee_local $var$0
+ (global.set $global$0
+ (local.tee $var$0
(i32.sub
- (get_global $global$0)
+ (global.get $global$0)
(i32.const 16)
)
)
)
(i32.store
- (get_local $var$0)
+ (local.get $var$0)
(call $foo
(i32.const 1)
(i32.const 2)
@@ -75,12 +75,12 @@
(drop
(call $printf
(i32.const 575)
- (get_local $var$0)
+ (local.get $var$0)
)
)
- (set_global $global$0
+ (global.set $global$0
(i32.add
- (get_local $var$0)
+ (local.get $var$0)
(i32.const 16)
)
)
@@ -90,31 +90,31 @@
(nop)
)
(func $stackSave (; 4 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 5 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 6 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 7 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
)
diff --git a/test/lld/reserved_func_ptr.wast b/test/lld/reserved_func_ptr.wast
index b3c6fd9b3..426412b77 100644
--- a/test/lld/reserved_func_ptr.wast
+++ b/test/lld/reserved_func_ptr.wast
@@ -10,7 +10,7 @@
(global $global$0 (mut i32) (i32.const 66112))
(global $global$1 i32 (i32.const 66112))
(global $global$2 i32 (i32.const 568))
- (table 3 3 anyfunc)
+ (table 3 3 funcref)
(elem (i32.const 1) $_Z18address_taken_funciii $_Z19address_taken_func2iii)
(memory $0 2)
(export "memory" (memory $0))
@@ -27,53 +27,53 @@
(local $var$3 i32)
(local $var$4 i32)
(local $var$5 i32)
- (set_local $var$2
+ (local.set $var$2
(call $_Z4atoiPKc
(i32.load offset=4
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$3
+ (local.set $var$3
(call $_Z4atoiPKc
(i32.load offset=8
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$4
+ (local.set $var$4
(call $_Z4atoiPKc
(i32.load offset=12
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$5
+ (local.set $var$5
(call $_Z4atoiPKc
(i32.load offset=16
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$1
+ (local.set $var$1
(call $_Z4atoiPKc
(i32.load offset=20
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
(call_indirect (type $0)
- (get_local $var$2)
+ (local.get $var$2)
)
(call_indirect (type $1)
(i32.const 3)
- (get_local $var$3)
+ (local.get $var$3)
)
(drop
(call_indirect (type $2)
(i32.const 4)
(i32.const 5)
- (get_local $var$4)
+ (local.get $var$4)
)
)
(drop
@@ -81,14 +81,14 @@
(f32.const 3.0999999046325684)
(f32.const 4.199999809265137)
(i32.const 5)
- (get_local $var$5)
+ (local.get $var$5)
)
)
(drop
(call_indirect (type $4)
(f64.const 4.2)
(i32.const 5)
- (get_local $var$1)
+ (local.get $var$1)
)
)
(call_indirect (type $5)
@@ -99,7 +99,7 @@
(i32.const 1)
(i32.const 2)
(i32.gt_s
- (get_local $var$0)
+ (local.get $var$0)
(i32.const 3)
)
)
diff --git a/test/lld/reserved_func_ptr.wast.jscall.out b/test/lld/reserved_func_ptr.wast.jscall.out
index afef95f0e..6242c3b76 100644
--- a/test/lld/reserved_func_ptr.wast.jscall.out
+++ b/test/lld/reserved_func_ptr.wast.jscall.out
@@ -27,9 +27,9 @@
(import "env" "jsCall_vi" (func $jsCall_vi (param i32 i32)))
(import "env" "jsCall_viii" (func $jsCall_viii (param i32 i32 i32 i32)))
(memory $0 2)
- (table $0 21 21 anyfunc)
+ (table $0 21 21 funcref)
(elem (i32.const 1) $_Z18address_taken_funciii $_Z19address_taken_func2iii $jsCall_ddi_0 $jsCall_ddi_1 $jsCall_ddi_2 $jsCall_fffi_0 $jsCall_fffi_1 $jsCall_fffi_2 $jsCall_iii_0 $jsCall_iii_1 $jsCall_iii_2 $jsCall_v_0 $jsCall_v_1 $jsCall_v_2 $jsCall_vi_0 $jsCall_vi_1 $jsCall_vi_2 $jsCall_viii_0 $jsCall_viii_1 $jsCall_viii_2)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66112))
(global $global$2 i32 (i32.const 568))
(export "memory" (memory $0))
@@ -53,53 +53,53 @@
(local $var$3 i32)
(local $var$4 i32)
(local $var$5 i32)
- (set_local $var$2
+ (local.set $var$2
(call $_Z4atoiPKc
(i32.load offset=4
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$3
+ (local.set $var$3
(call $_Z4atoiPKc
(i32.load offset=8
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$4
+ (local.set $var$4
(call $_Z4atoiPKc
(i32.load offset=12
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$5
+ (local.set $var$5
(call $_Z4atoiPKc
(i32.load offset=16
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$1
+ (local.set $var$1
(call $_Z4atoiPKc
(i32.load offset=20
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
(call_indirect (type $0)
- (get_local $var$2)
+ (local.get $var$2)
)
(call_indirect (type $1)
(i32.const 3)
- (get_local $var$3)
+ (local.get $var$3)
)
(drop
(call_indirect (type $2)
(i32.const 4)
(i32.const 5)
- (get_local $var$4)
+ (local.get $var$4)
)
)
(drop
@@ -107,14 +107,14 @@
(f32.const 3.0999999046325684)
(f32.const 4.199999809265137)
(i32.const 5)
- (get_local $var$5)
+ (local.get $var$5)
)
)
(drop
(call_indirect (type $4)
(f64.const 4.2)
(i32.const 5)
- (get_local $var$1)
+ (local.get $var$1)
)
)
(call_indirect (type $5)
@@ -125,7 +125,7 @@
(i32.const 1)
(i32.const 2)
(i32.gt_s
- (get_local $var$0)
+ (local.get $var$0)
(i32.const 3)
)
)
@@ -136,105 +136,105 @@
(nop)
)
(func $stackSave (; 11 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 12 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 13 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 14 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
(func $dynCall_viii (; 15 ;) (param $fptr i32) (param $0 i32) (param $1 i32) (param $2 i32)
(call_indirect (type $FUNCSIG$viii)
- (get_local $0)
- (get_local $1)
- (get_local $2)
- (get_local $fptr)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
+ (local.get $fptr)
)
)
(func $jsCall_ddi_0 (; 16 ;) (param $0 f64) (param $1 i32) (result f64)
(call $jsCall_ddi
(i32.const 0)
- (get_local $0)
- (get_local $1)
+ (local.get $0)
+ (local.get $1)
)
)
(func $jsCall_ddi_1 (; 17 ;) (param $0 f64) (param $1 i32) (result f64)
(call $jsCall_ddi
(i32.const 1)
- (get_local $0)
- (get_local $1)
+ (local.get $0)
+ (local.get $1)
)
)
(func $jsCall_ddi_2 (; 18 ;) (param $0 f64) (param $1 i32) (result f64)
(call $jsCall_ddi
(i32.const 2)
- (get_local $0)
- (get_local $1)
+ (local.get $0)
+ (local.get $1)
)
)
(func $jsCall_fffi_0 (; 19 ;) (param $0 f32) (param $1 f32) (param $2 i32) (result f32)
(call $jsCall_fffi
(i32.const 0)
- (get_local $0)
- (get_local $1)
- (get_local $2)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
)
)
(func $jsCall_fffi_1 (; 20 ;) (param $0 f32) (param $1 f32) (param $2 i32) (result f32)
(call $jsCall_fffi
(i32.const 1)
- (get_local $0)
- (get_local $1)
- (get_local $2)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
)
)
(func $jsCall_fffi_2 (; 21 ;) (param $0 f32) (param $1 f32) (param $2 i32) (result f32)
(call $jsCall_fffi
(i32.const 2)
- (get_local $0)
- (get_local $1)
- (get_local $2)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
)
)
(func $jsCall_iii_0 (; 22 ;) (param $0 i32) (param $1 i32) (result i32)
(call $jsCall_iii
(i32.const 0)
- (get_local $0)
- (get_local $1)
+ (local.get $0)
+ (local.get $1)
)
)
(func $jsCall_iii_1 (; 23 ;) (param $0 i32) (param $1 i32) (result i32)
(call $jsCall_iii
(i32.const 1)
- (get_local $0)
- (get_local $1)
+ (local.get $0)
+ (local.get $1)
)
)
(func $jsCall_iii_2 (; 24 ;) (param $0 i32) (param $1 i32) (result i32)
(call $jsCall_iii
(i32.const 2)
- (get_local $0)
- (get_local $1)
+ (local.get $0)
+ (local.get $1)
)
)
(func $jsCall_v_0 (; 25 ;)
@@ -255,43 +255,43 @@
(func $jsCall_vi_0 (; 28 ;) (param $0 i32)
(call $jsCall_vi
(i32.const 0)
- (get_local $0)
+ (local.get $0)
)
)
(func $jsCall_vi_1 (; 29 ;) (param $0 i32)
(call $jsCall_vi
(i32.const 1)
- (get_local $0)
+ (local.get $0)
)
)
(func $jsCall_vi_2 (; 30 ;) (param $0 i32)
(call $jsCall_vi
(i32.const 2)
- (get_local $0)
+ (local.get $0)
)
)
(func $jsCall_viii_0 (; 31 ;) (param $0 i32) (param $1 i32) (param $2 i32)
(call $jsCall_viii
(i32.const 0)
- (get_local $0)
- (get_local $1)
- (get_local $2)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
)
)
(func $jsCall_viii_1 (; 32 ;) (param $0 i32) (param $1 i32) (param $2 i32)
(call $jsCall_viii
(i32.const 1)
- (get_local $0)
- (get_local $1)
- (get_local $2)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
)
)
(func $jsCall_viii_2 (; 33 ;) (param $0 i32) (param $1 i32) (param $2 i32)
(call $jsCall_viii
(i32.const 2)
- (get_local $0)
- (get_local $1)
- (get_local $2)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
)
)
)
diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wast.out
index 3bc43764f..393178a00 100644
--- a/test/lld/reserved_func_ptr.wast.out
+++ b/test/lld/reserved_func_ptr.wast.out
@@ -11,9 +11,9 @@
(import "env" "STACKTOP" (global $stack$init i32))
(import "env" "_Z4atoiPKc" (func $_Z4atoiPKc (param i32) (result i32)))
(memory $0 2)
- (table $0 3 3 anyfunc)
+ (table $0 3 3 funcref)
(elem (i32.const 1) $_Z18address_taken_funciii $_Z19address_taken_func2iii)
- (global $global$0 (mut i32) (get_global $stack$init))
+ (global $global$0 (mut i32) (global.get $stack$init))
(global $global$1 i32 (i32.const 66112))
(global $global$2 i32 (i32.const 568))
(export "memory" (memory $0))
@@ -37,53 +37,53 @@
(local $var$3 i32)
(local $var$4 i32)
(local $var$5 i32)
- (set_local $var$2
+ (local.set $var$2
(call $_Z4atoiPKc
(i32.load offset=4
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$3
+ (local.set $var$3
(call $_Z4atoiPKc
(i32.load offset=8
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$4
+ (local.set $var$4
(call $_Z4atoiPKc
(i32.load offset=12
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$5
+ (local.set $var$5
(call $_Z4atoiPKc
(i32.load offset=16
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
- (set_local $var$1
+ (local.set $var$1
(call $_Z4atoiPKc
(i32.load offset=20
- (get_local $var$1)
+ (local.get $var$1)
)
)
)
(call_indirect (type $0)
- (get_local $var$2)
+ (local.get $var$2)
)
(call_indirect (type $1)
(i32.const 3)
- (get_local $var$3)
+ (local.get $var$3)
)
(drop
(call_indirect (type $2)
(i32.const 4)
(i32.const 5)
- (get_local $var$4)
+ (local.get $var$4)
)
)
(drop
@@ -91,14 +91,14 @@
(f32.const 3.0999999046325684)
(f32.const 4.199999809265137)
(i32.const 5)
- (get_local $var$5)
+ (local.get $var$5)
)
)
(drop
(call_indirect (type $4)
(f64.const 4.2)
(i32.const 5)
- (get_local $var$1)
+ (local.get $var$1)
)
)
(call_indirect (type $5)
@@ -109,7 +109,7 @@
(i32.const 1)
(i32.const 2)
(i32.gt_s
- (get_local $var$0)
+ (local.get $var$0)
(i32.const 3)
)
)
@@ -120,39 +120,39 @@
(nop)
)
(func $stackSave (; 5 ;) (result i32)
- (get_global $global$0)
+ (global.get $global$0)
)
(func $stackAlloc (; 6 ;) (param $0 i32) (result i32)
(local $1 i32)
- (set_global $global$0
- (tee_local $1
+ (global.set $global$0
+ (local.tee $1
(i32.and
(i32.sub
- (get_global $global$0)
- (get_local $0)
+ (global.get $global$0)
+ (local.get $0)
)
(i32.const -16)
)
)
)
- (get_local $1)
+ (local.get $1)
)
(func $stackRestore (; 7 ;) (param $0 i32)
- (set_global $global$0
- (get_local $0)
+ (global.set $global$0
+ (local.get $0)
)
)
(func $__growWasmMemory (; 8 ;) (param $newSize i32) (result i32)
(grow_memory
- (get_local $newSize)
+ (local.get $newSize)
)
)
(func $dynCall_viii (; 9 ;) (param $fptr i32) (param $0 i32) (param $1 i32) (param $2 i32)
(call_indirect (type $FUNCSIG$viii)
- (get_local $0)
- (get_local $1)
- (get_local $2)
- (get_local $fptr)
+ (local.get $0)
+ (local.get $1)
+ (local.get $2)
+ (local.get $fptr)
)
)
)