diff options
Diffstat (limited to 'test/binaryen.js')
-rw-r--r-- | test/binaryen.js/atomics.js.txt | 2 | ||||
-rw-r--r-- | test/binaryen.js/debug-info.js.txt | 4 | ||||
-rw-r--r-- | test/binaryen.js/debug-names.js.txt | 6 | ||||
-rw-r--r-- | test/binaryen.js/exception-handling.js.txt | 4 | ||||
-rw-r--r-- | test/binaryen.js/expressions.js | 2 | ||||
-rw-r--r-- | test/binaryen.js/expressions.js.txt | 2 | ||||
-rw-r--r-- | test/binaryen.js/functions.js.txt | 2 | ||||
-rw-r--r-- | test/binaryen.js/hello-world.js.txt | 4 | ||||
-rw-r--r-- | test/binaryen.js/kitchen-sink.js.txt | 68 | ||||
-rw-r--r-- | test/binaryen.js/low-memory-unused.js.txt | 6 | ||||
-rw-r--r-- | test/binaryen.js/reloc.js.txt | 2 | ||||
-rw-r--r-- | test/binaryen.js/sieve.js.txt | 4 | ||||
-rw-r--r-- | test/binaryen.js/tag.js.txt | 6 |
13 files changed, 56 insertions, 56 deletions
diff --git a/test/binaryen.js/atomics.js.txt b/test/binaryen.js/atomics.js.txt index 091298d57..40d2be26a 100644 --- a/test/binaryen.js/atomics.js.txt +++ b/test/binaryen.js/atomics.js.txt @@ -1,5 +1,5 @@ (module - (type $none_=>_none (func)) + (type $0 (func)) (memory $0 (shared 1 1)) (func $main (i32.atomic.store diff --git a/test/binaryen.js/debug-info.js.txt b/test/binaryen.js/debug-info.js.txt index 1d557b337..7802e3415 100644 --- a/test/binaryen.js/debug-info.js.txt +++ b/test/binaryen.js/debug-info.js.txt @@ -1,7 +1,7 @@ === default === debugInfo=false (module - (type $none_=>_none (func)) + (type $0 (func)) (memory $0 0) (export "test" (func $0)) (func $0 @@ -23,7 +23,7 @@ debugInfo=true === without debug info === debugInfo=false (module - (type $none_=>_none (func)) + (type $0 (func)) (memory $0 0) (export "test" (func $0)) (func $0 diff --git a/test/binaryen.js/debug-names.js.txt b/test/binaryen.js/debug-names.js.txt index 605bec650..dc66048ca 100644 --- a/test/binaryen.js/debug-names.js.txt +++ b/test/binaryen.js/debug-names.js.txt @@ -10,7 +10,7 @@ === parsed wast === (module $hel - (type $i32_=>_none (func (param i32))) + (type $0 (func (param i32))) (global $ld i32 (i32.const 0)) (memory $lo 0 0) (table $wor 0 0 funcref) @@ -22,7 +22,7 @@ === roundtripped === (module $hel - (type $i32_=>_none (func (param i32))) + (type $0 (func (param i32))) (global $ld i32 (i32.const 0)) (memory $lo 0 0) (table $wor 0 0 funcref) @@ -34,7 +34,7 @@ === roundtripped again === (module $hel - (type $i32_=>_none (func (param i32))) + (type $0 (func (param i32))) (global $ld i32 (i32.const 0)) (memory $lo 0 0) (table $wor 0 0 funcref) diff --git a/test/binaryen.js/exception-handling.js.txt b/test/binaryen.js/exception-handling.js.txt index 73e33799e..905e1a3a4 100644 --- a/test/binaryen.js/exception-handling.js.txt +++ b/test/binaryen.js/exception-handling.js.txt @@ -1,6 +1,6 @@ (module - (type $i32_=>_none (func (param i32))) - (type $none_=>_none (func)) + (type $0 (func (param i32))) + (type $1 (func)) (tag $e (param i32)) (func $test (try $l0 diff --git a/test/binaryen.js/expressions.js b/test/binaryen.js/expressions.js index a214ec340..13295a33d 100644 --- a/test/binaryen.js/expressions.js +++ b/test/binaryen.js/expressions.js @@ -348,7 +348,7 @@ console.log("# CallIndirect"); assert( theCallIndirect.toText() == - "(call_indirect $0 (type $i32_i32_=>_i32)\n (i32.const 7)\n (i32.const 6)\n (i32.const 9000)\n)\n" + "(call_indirect $0 (type $func.0)\n (i32.const 7)\n (i32.const 6)\n (i32.const 9000)\n)\n" ); module.dispose(); diff --git a/test/binaryen.js/expressions.js.txt b/test/binaryen.js/expressions.js.txt index bbc1b0140..f548c4037 100644 --- a/test/binaryen.js/expressions.js.txt +++ b/test/binaryen.js/expressions.js.txt @@ -42,7 +42,7 @@ ) # CallIndirect -(call_indirect $0 (type $i32_i32_=>_i32) +(call_indirect $0 (type $func.0) (i32.const 7) (i32.const 6) (i32.const 9000) diff --git a/test/binaryen.js/functions.js.txt b/test/binaryen.js/functions.js.txt index bf6337e0e..c353d8cd6 100644 --- a/test/binaryen.js/functions.js.txt +++ b/test/binaryen.js/functions.js.txt @@ -7,7 +7,7 @@ getExpressionInfo(body)={"id":14,"value":3} ) (module - (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $0 (func (param i32 i32) (result i32))) (func $b-function (param $a i32) (param $b i32) (result i32) (local $res i32) (local $unused f64) diff --git a/test/binaryen.js/hello-world.js.txt b/test/binaryen.js/hello-world.js.txt index 764ac8519..3f9296adf 100644 --- a/test/binaryen.js/hello-world.js.txt +++ b/test/binaryen.js/hello-world.js.txt @@ -1,5 +1,5 @@ (module - (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $0 (func (param i32 i32) (result i32))) (export "adder" (func $adder)) (func $adder (param $0 i32) (param $1 i32) (result i32) (return @@ -14,7 +14,7 @@ optimized: (module - (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $0 (func (param i32 i32) (result i32))) (export "adder" (func $adder)) (func $adder (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32) (i32.add diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt index 3b4f40ff6..0f67e903b 100644 --- a/test/binaryen.js/kitchen-sink.js.txt +++ b/test/binaryen.js/kitchen-sink.js.txt @@ -130,13 +130,13 @@ getExpressionInfo(tuple[1])={"id":14,"type":3,"value":{"low":37,"high":0}} getExpressionInfo(tuple[2])={"id":14,"type":4,"value":1.2999999523162842} getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} (module - (type $i32_i64_f32_f64_=>_i32 (func (param i32 i64 f32 f64) (result i32))) - (type $i32_=>_none (func (param i32))) - (type $i32_f64_=>_f32 (func (param i32 f64) (result f32))) - (type $none_=>_none (func)) + (type $0 (func (param i32 i64 f32 f64) (result i32))) + (type $1 (func (param i32))) + (type $2 (func (param i32 f64) (result f32))) + (type $3 (func)) (import "module" "base" (global $a-global-imp i32)) (import "module" "base" (global $a-mut-global-imp (mut i32))) - (import "module" "base" (func $an-imported (type $i32_f64_=>_f32) (param i32 f64) (result f32))) + (import "module" "base" (func $an-imported (type $2) (param i32 f64) (result f32))) (import "module" "base" (tag $a-tag-imp (param i32))) (global $a-global i32 (i32.const 1)) (memory $0 (shared 1 256)) @@ -150,7 +150,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} (export "a-global-exp" (global $a-global)) (export "a-tag-exp" (tag $a-tag)) (start $starter) - (func "$kitchen()sinker" (type $i32_i64_f32_f64_=>_i32) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) + (func "$kitchen()sinker" (type $0) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body (result i32) (block $the-nothing @@ -1999,7 +1999,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} ) (drop (i32.eqz - (call_indirect $t0 (type $i32_i64_f32_f64_=>_i32) + (call_indirect $t0 (type $0) (i32.const 13) (i64.const 37) (f32.const 1.2999999523162842) @@ -2063,7 +2063,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} (f32.const 1.2999999523162842) (f64.const 3.7) ) - (return_call_indirect $t0 (type $i32_i64_f32_f64_=>_i32) + (return_call_indirect $t0 (type $0) (i32.const 13) (i64.const 37) (f32.const 1.2999999523162842) @@ -2228,19 +2228,19 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} (i32.const 42) ) ) - (func $starter (type $none_=>_none) + (func $starter (type $3) (nop) ) ) (module - (type $i32_i64_f32_f64_=>_i32 (func (param i32 i64 f32 f64) (result i32))) - (type $i32_=>_none (func (param i32))) - (type $i32_f64_=>_f32 (func (param i32 f64) (result f32))) - (type $none_=>_none (func)) + (type $0 (func (param i32 i64 f32 f64) (result i32))) + (type $1 (func (param i32))) + (type $2 (func (param i32 f64) (result f32))) + (type $3 (func)) (import "module" "base" (global $a-global-imp i32)) (import "module" "base" (global $a-mut-global-imp (mut i32))) - (import "module" "base" (func $an-imported (type $i32_f64_=>_f32) (param i32 f64) (result f32))) + (import "module" "base" (func $an-imported (type $2) (param i32 f64) (result f32))) (import "module" "base" (tag $a-tag-imp (param i32))) (global $a-global i32 (i32.const 1)) (memory $0 (shared 1 256)) @@ -2254,7 +2254,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} (export "a-global-exp" (global $a-global)) (export "a-tag-exp" (tag $a-tag)) (start $starter) - (func "$kitchen()sinker" (type $i32_i64_f32_f64_=>_i32) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) + (func "$kitchen()sinker" (type $0) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) (block $the-body (result i32) (block $the-nothing @@ -4103,7 +4103,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} ) (drop (i32.eqz - (call_indirect $t0 (type $i32_i64_f32_f64_=>_i32) + (call_indirect $t0 (type $0) (i32.const 13) (i64.const 37) (f32.const 1.2999999523162842) @@ -4167,7 +4167,7 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} (f32.const 1.2999999523162842) (f64.const 3.7) ) - (return_call_indirect $t0 (type $i32_i64_f32_f64_=>_i32) + (return_call_indirect $t0 (type $0) (i32.const 13) (i64.const 37) (f32.const 1.2999999523162842) @@ -4332,16 +4332,16 @@ getExpressionInfo(tuple[3])={"id":14,"type":5,"value":3.7} (i32.const 42) ) ) - (func $starter (type $none_=>_none) + (func $starter (type $3) (nop) ) ) raw: (module - (type $none_=>_none (func)) - (type $i32_=>_none (func (param i32))) - (type $none_=>_i32 (func (result i32))) + (type $0 (func)) + (type $1 (func (param i32))) + (type $2 (func (result i32))) (import "module" "check" (func $check (param i32))) (func $just-one-block (local $0 i32) @@ -4809,11 +4809,11 @@ optimized: module loaded from binary form: (module - (type $i32_i32_=>_none (func (param i32 i32))) - (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $0 (func (param i32 i32))) + (type $1 (func (param i32 i32) (result i32))) (global $a-global i32 (i32.const 3)) (tag $a-tag (param i32 i32)) - (func $adder (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32) + (func $adder (type $1) (param $0 i32) (param $1 i32) (result i32) (i32.add (local.get $0) (local.get $1) @@ -4822,8 +4822,8 @@ module loaded from binary form: ) (module - (type $i32_=>_none (func (param i32))) - (type $none_=>_none (func)) + (type $0 (func (param i32))) + (type $1 (func)) (import "spectest" "print" (func $print-i32 (param i32))) (start $starter) (func $starter @@ -4835,7 +4835,7 @@ module loaded from binary form: 1234 : i32 (module - (type $none_=>_none (func)) + (type $0 (func)) (func $func (local $0 i32) (local.set $0 @@ -4851,11 +4851,11 @@ module loaded from binary form: validation: 0 test_parsing text: (module - (type $i32_=>_none (func (param i32))) - (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $0 (func (param i32))) + (type $1 (func (param i32 i32) (result i32))) (global $a-global i32 (i32.const 3)) (tag $a-tag (param i32)) - (func $adder (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32) + (func $adder (type $1) (param $0 i32) (param $1 i32) (result i32) (i32.add (local.get $0) (local.get $1) @@ -4865,11 +4865,11 @@ test_parsing text: module loaded from text form: (module - (type $i32_=>_none (func (param i32))) - (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $0 (func (param i32))) + (type $1 (func (param i32 i32) (result i32))) (global $a-global i32 (i32.const 3)) (tag $a-tag (param i32)) - (func $ADD_ER (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32) + (func $ADD_ER (type $1) (param $0 i32) (param $1 i32) (result i32) (i32.add (local.get $0) (local.get $1) @@ -4879,7 +4879,7 @@ module loaded from text form: sizeof Literal: 24 (module - (type $none_=>_none (func)) + (type $0 (func)) (global $a-global i32 (i32.const 125)) (global $a-global2 i32 (i32.const 2)) (global $a-global3 i32 (i32.const 3)) diff --git a/test/binaryen.js/low-memory-unused.js.txt b/test/binaryen.js/low-memory-unused.js.txt index 08c36575d..99c682259 100644 --- a/test/binaryen.js/low-memory-unused.js.txt +++ b/test/binaryen.js/low-memory-unused.js.txt @@ -14,7 +14,7 @@ === unoptimized === (module - (type $i32_=>_i32 (func (param i32) (result i32))) + (type $0 (func (param i32) (result i32))) (memory $0 1) (export "test" (func $test)) (func $test (param $0 i32) (result i32) @@ -29,7 +29,7 @@ === optimized, lowMemoryUnused=false === (module - (type $i32_=>_i32 (func (param i32) (result i32))) + (type $0 (func (param i32) (result i32))) (memory $0 1) (export "test" (func $test)) (func $test (; has Stack IR ;) (param $0 i32) (result i32) @@ -45,7 +45,7 @@ === optimized, lowMemoryUnused=true === (module - (type $i32_=>_i32 (func (param i32) (result i32))) + (type $0 (func (param i32) (result i32))) (memory $0 1) (export "test" (func $test)) (func $test (; has Stack IR ;) (param $0 i32) (result i32) diff --git a/test/binaryen.js/reloc.js.txt b/test/binaryen.js/reloc.js.txt index bfddb0970..0aa075841 100644 --- a/test/binaryen.js/reloc.js.txt +++ b/test/binaryen.js/reloc.js.txt @@ -1,5 +1,5 @@ (module - (type $none_=>_none (func)) + (type $0 (func)) (import "env" "memory_base" (global $memory_base i32)) (import "env" "table_base" (global $table_base i32)) (memory $0 1) diff --git a/test/binaryen.js/sieve.js.txt b/test/binaryen.js/sieve.js.txt index 1da65a09f..3fad13fdf 100644 --- a/test/binaryen.js/sieve.js.txt +++ b/test/binaryen.js/sieve.js.txt @@ -1,5 +1,5 @@ (module - (type $i32_=>_i32 (func (param i32) (result i32))) + (type $0 (func (param i32) (result i32))) (memory $0 1 100) (export "sieve" (func $sieve)) (func $sieve (param $0 i32) (result i32) @@ -57,7 +57,7 @@ optimized: (module - (type $i32_=>_i32 (func (param i32) (result i32))) + (type $0 (func (param i32) (result i32))) (memory $0 1 100) (export "sieve" (func $sieve)) (func $sieve (; has Stack IR ;) (param $0 i32) (result i32) diff --git a/test/binaryen.js/tag.js.txt b/test/binaryen.js/tag.js.txt index 99c697c55..06c0c9d68 100644 --- a/test/binaryen.js/tag.js.txt +++ b/test/binaryen.js/tag.js.txt @@ -1,15 +1,15 @@ GetTag is equal: true getTagInfo={"name":"a-tag","module":"","base":"","params":2,"results":0} (module - (type $i32_=>_none (func (param i32))) - (type $i32_f32_=>_none (func (param i32 f32))) + (type $0 (func (param i32))) + (type $1 (func (param i32 f32))) (import "module" "base" (tag $a-tag-imp (param i32 f32))) (tag $a-tag (param i32)) (export "a-tag-exp" (tag $a-tag)) ) (module - (type $i32_f32_=>_none (func (param i32 f32))) + (type $0 (func (param i32 f32))) (import "module" "base" (tag $a-tag-imp (param i32 f32))) ) |