diff options
Diffstat (limited to 'test')
85 files changed, 3173 insertions, 3072 deletions
diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast index 2561d174f..5e84d771e 100644 --- a/test/dot_s/asm_const.wast +++ b/test/dot_s/asm_const.wast @@ -7,7 +7,7 @@ (export "main" (func $main)) (func $main (result i32) (drop - (call_import $emscripten_asm_const_vi + (call $emscripten_asm_const_vi (i32.const 0) ) ) diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast index e3801612f..77c1e1ab3 100644 --- a/test/dot_s/basics.wast +++ b/test/dot_s/basics.wast @@ -14,7 +14,7 @@ (elem (i32.const 0) $__wasm_nullptr $main) (func $main (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (drop - (call_import $puts + (call $puts (i32.const 16) ) ) diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast index 3833bc742..89fc2807f 100644 --- a/test/dot_s/bcp-1.wast +++ b/test/dot_s/bcp-1.wast @@ -288,34 +288,34 @@ ) ) (drop - (call_import $exit + (call $exit (get_local $0) ) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) diff --git a/test/dot_s/exit.wast b/test/dot_s/exit.wast index 8850a5bb4..a6abcbdf0 100644 --- a/test/dot_s/exit.wast +++ b/test/dot_s/exit.wast @@ -7,7 +7,7 @@ (func $main (result i32) (local $0 i32) (drop - (call_import $exit + (call $exit (i32.const 0) ) ) diff --git a/test/dot_s/fix_em_ehsjlj_names.wast b/test/dot_s/fix_em_ehsjlj_names.wast index 6f4a5471b..912716524 100644 --- a/test/dot_s/fix_em_ehsjlj_names.wast +++ b/test/dot_s/fix_em_ehsjlj_names.wast @@ -38,12 +38,12 @@ (local $2 i32) (local $3 i32) (drop - (call_import $invoke_v + (call $invoke_v (i32.const 1) ) ) (drop - (call_import $invoke_iiii + (call $invoke_iiii (i32.const 2) (i32.const 1) (i32.const 2) @@ -51,14 +51,14 @@ ) ) (drop - (call_import $invoke_ffd + (call $invoke_ffd (i32.const 3) (f32.const 1.5) (f64.const 3.4) ) ) (drop - (call_import $invoke_iii + (call $invoke_iii (i32.const 4) (i32.add (get_local $1) @@ -71,7 +71,7 @@ ) ) (drop - (call_import $emscripten_longjmp + (call $emscripten_longjmp (i32.const 5) (i32.const 6) ) diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast index 6be1df73f..b691c1c1b 100644 --- a/test/dot_s/indidx.wast +++ b/test/dot_s/indidx.wast @@ -30,7 +30,7 @@ (i32.load (i32.add (i32.shl - (call_import $getchar) + (call $getchar) (i32.const 2) ) (i32.const -176) diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast index 0d8434ebe..ff1550a12 100644 --- a/test/dot_s/indirect-import.wast +++ b/test/dot_s/indirect-import.wast @@ -48,7 +48,7 @@ ) ) (drop - (call_import $extern_vj + (call $extern_vj (i64.const 1) ) ) @@ -59,7 +59,7 @@ ) ) (drop - (call_import $extern_v) + (call $extern_v) ) (drop (i32.store offset=16 @@ -68,7 +68,7 @@ ) ) (drop - (call_import $extern_ijidf + (call $extern_ijidf (i64.const 1) (i32.const 2) (f64.const 3) @@ -110,20 +110,20 @@ (unreachable) ) (func $__importThunk_extern_fd (type $FUNCSIG$fd) (param $0 f64) (result f32) - (call_import $extern_fd + (call $extern_fd (get_local $0) ) ) (func $__importThunk_extern_vj (type $FUNCSIG$vj) (param $0 i64) - (call_import $extern_vj + (call $extern_vj (get_local $0) ) ) (func $__importThunk_extern_v (type $FUNCSIG$v) - (call_import $extern_v) + (call $extern_v) ) (func $__importThunk_extern_ijidf (type $FUNCSIG$ijidf) (param $0 i64) (param $1 i32) (param $2 f64) (param $3 f32) (result i32) - (call_import $extern_ijidf + (call $extern_ijidf (get_local $0) (get_local $1) (get_local $2) @@ -131,12 +131,12 @@ ) ) (func $__importThunk_extern_struct (type $FUNCSIG$vi) (param $0 i32) - (call_import $extern_struct + (call $extern_struct (get_local $0) ) ) (func $__importThunk_extern_sret (type $FUNCSIG$vi) (param $0 i32) - (call_import $extern_sret + (call $extern_sret (get_local $0) ) ) diff --git a/test/dot_s/macClangMetaData.wast b/test/dot_s/macClangMetaData.wast index 9f8fcc61a..3fbcf2d38 100644 --- a/test/dot_s/macClangMetaData.wast +++ b/test/dot_s/macClangMetaData.wast @@ -7,7 +7,7 @@ (export "main" (func $main)) (func $main (param $0 i32) (param $1 i32) (result i32) (drop - (call_import $puts + (call $puts (i32.const 16) ) ) diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast index 221ccbae2..fc6d21fa8 100644 --- a/test/dot_s/memops.wast +++ b/test/dot_s/memops.wast @@ -13,7 +13,7 @@ ) ) (drop - (call_import $emscripten_asm_const_vi + (call $emscripten_asm_const_vi (i32.const 0) ) ) diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm index 4966ce28a..624cd3fd1 100644 --- a/test/emcc_O2_hello_world.fromasm +++ b/test/emcc_O2_hello_world.fromasm @@ -1,5 +1,4 @@ (module - (memory 256 256) (data (get_global $memoryBase) "emcc_O2_hello_world.asm.js") (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) @@ -8,12 +7,12 @@ (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort (param i32))) (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32))) (import "env" "_pthread_self" (func $_pthread_self (result i32))) @@ -30,8 +29,8 @@ (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $_free)) @@ -52,31 +51,36 @@ (export "dynCall_ii" (func $dynCall_ii)) (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $0 i32) (result i32) (local $1 i32) @@ -227,7 +231,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -251,7 +255,7 @@ (get_local $5) ) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -469,7 +473,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -498,7 +502,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -609,7 +613,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $38 (get_local $19) @@ -866,7 +870,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -878,7 +882,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $2 (i32.load offset=24 @@ -986,7 +990,7 @@ (get_local $9) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -1008,7 +1012,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -1022,7 +1026,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1049,7 +1053,7 @@ (get_local $6) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1114,7 +1118,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1153,7 +1157,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $19) @@ -1170,7 +1174,7 @@ (get_local $0) (get_local $6) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $19) @@ -1196,7 +1200,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $19) @@ -1329,7 +1333,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $39 (get_local $6) @@ -1721,7 +1725,7 @@ (get_local $30) ) ) - (block + (block i32 (if (i32.eqz (tee_local $3 @@ -1984,7 +1988,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -1996,7 +2000,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -2104,7 +2108,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -2126,7 +2130,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -2140,7 +2144,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2167,7 +2171,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2232,7 +2236,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2271,7 +2275,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -2288,7 +2292,7 @@ (get_local $10) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -2314,7 +2318,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -2412,7 +2416,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $14 (get_local $5) @@ -2729,7 +2733,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $23) @@ -2800,7 +2804,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3029,7 +3033,7 @@ (i32.and (i32.add (tee_local $15 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3037,7 +3041,7 @@ ) (get_local $15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -3067,7 +3071,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3163,7 +3167,7 @@ (i32.const 0) (i32.eq (tee_local $6 - (block $label$break$L257 + (block $label$break$L257 i32 (if (i32.and (i32.load @@ -3172,7 +3176,7 @@ (i32.const 4) ) (i32.const 190) - (block + (block i32 (block $label$break$L259 (if (tee_local $3 @@ -3253,7 +3257,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $14) ) ) @@ -3311,7 +3315,7 @@ ) (i32.ne (tee_local $3 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -3404,7 +3408,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $0) ) ) @@ -3495,14 +3499,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $2) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) @@ -3559,12 +3563,12 @@ (i32.and (i32.lt_u (tee_local $1 - (call_import $_sbrk + (call $_sbrk (get_local $4) ) ) (tee_local $4 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -3817,7 +3821,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.const 192) (get_local $20) @@ -4036,7 +4040,7 @@ ) (i32.const 1) ) - (block + (block i32 (set_local $13 (i32.and (get_local $0) @@ -4161,7 +4165,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -4183,7 +4187,7 @@ ) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -4197,7 +4201,7 @@ ) (get_local $4) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4224,7 +4228,7 @@ (get_local $21) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4262,7 +4266,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4327,7 +4331,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $24) @@ -4349,7 +4353,7 @@ (get_local $9) (get_local $21) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $24) @@ -4378,7 +4382,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $24) @@ -4424,7 +4428,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$61 (i32.eq @@ -4434,7 +4438,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4480,7 +4484,7 @@ (get_local $21) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4501,7 +4505,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4619,7 +4623,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -4665,7 +4669,7 @@ (i32.const 480) (i32.shl (tee_local $3 - (block $do-once$67 + (block $do-once$67 i32 (if (tee_local $2 (i32.shr_u @@ -4673,12 +4677,14 @@ (i32.const 8) ) ) - (block - (br_if $do-once$67 - (i32.const 31) - (i32.gt_u - (get_local $15) - (i32.const 16777215) + (block i32 + (drop + (br_if $do-once$67 + (i32.const 31) + (i32.gt_u + (get_local $15) + (i32.const 16777215) + ) ) ) (i32.or @@ -4933,7 +4939,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $43) @@ -5004,7 +5010,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5351,7 +5357,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $44 (get_local $4) @@ -5663,7 +5669,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $45) @@ -5734,7 +5740,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5984,7 +5990,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6003,7 +6009,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $8 (i32.add @@ -6061,7 +6067,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6169,7 +6175,7 @@ (get_local $11) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6178,7 +6184,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6223,7 +6229,7 @@ (get_local $1) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6240,7 +6246,7 @@ (set_local $10 (get_local $3) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $10 @@ -6380,7 +6386,7 @@ (get_local $9) (get_local $14) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -6402,7 +6408,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6416,7 +6422,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6443,7 +6449,7 @@ (get_local $1) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6513,7 +6519,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6561,7 +6567,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -6583,7 +6589,7 @@ (get_local $3) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -6609,7 +6615,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -6654,7 +6660,7 @@ (get_local $2) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -6672,7 +6678,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -6925,7 +6931,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $3) @@ -6949,7 +6955,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6963,7 +6969,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6990,7 +6996,7 @@ (get_local $9) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7054,7 +7060,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7093,7 +7099,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $12) @@ -7115,7 +7121,7 @@ (get_local $0) (get_local $9) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $12) @@ -7141,7 +7147,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $12) @@ -7191,7 +7197,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7200,7 +7206,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7241,7 +7247,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7258,7 +7264,7 @@ (set_local $16 (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $16 @@ -7367,7 +7373,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $7) @@ -7651,7 +7657,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $18) @@ -7722,7 +7728,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7904,8 +7910,8 @@ (i32.load (i32.const 8) ) - (block - (call_import $_pthread_cleanup_push + (block i32 + (call $_pthread_cleanup_push (i32.const 4) (get_local $0) ) @@ -7925,18 +7931,18 @@ ) (set_local $9 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $12) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $9) ) - (block + (block i32 (i32.store (get_local $11) (i32.load @@ -7952,7 +7958,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $11) ) @@ -8006,7 +8012,7 @@ (get_local $4) (i32.const 2) ) - (block + (block i32 (i32.store (get_local $8) (i32.add @@ -8024,14 +8030,14 @@ ) (get_local $14) ) - (block + (block i32 (set_local $3 (get_local $5) ) (get_local $14) ) ) - (block + (block i32 (i32.store (get_local $8) (tee_local $3 @@ -8270,7 +8276,7 @@ ) ) (set_local $1 - (block $label$break$L10 + (block $label$break$L10 i32 (if (i32.gt_s (i32.load8_s offset=75 @@ -8278,7 +8284,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -8363,7 +8369,7 @@ (get_local $3) ) ) - (block + (block i32 (set_local $2 (i32.const 0) ) @@ -8402,10 +8408,10 @@ (func $_fflush (param $0 i32) (result i32) (local $1 i32) (local $2 i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.le_s (i32.load offset=76 @@ -8434,7 +8440,7 @@ (if (get_local $1) (get_local $2) - (block + (block i32 (call $___unlockfile (get_local $0) ) @@ -8442,7 +8448,7 @@ ) ) ) - (block + (block i32 (set_local $0 (if (i32.load @@ -8456,7 +8462,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (if @@ -8525,7 +8531,7 @@ (get_local $0) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (get_local $2) @@ -8866,7 +8872,7 @@ ) ) ) - (block + (block i32 (drop (call_indirect $FUNCSIG$iiii (get_local $0) @@ -8892,7 +8898,7 @@ (i32.const 0) ) (i32.const -1) - (block + (block i32 (if (i32.lt_u (tee_local $4 @@ -8968,7 +8974,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -9274,7 +9280,7 @@ ) ) (set_local $0 - (block $do-once$0 + (block $do-once$0 i32 (if (i32.lt_s (call $_fputs @@ -9284,7 +9290,7 @@ (i32.const 0) ) (i32.const 1) - (block + (block i32 (if (if (i32.ne @@ -9397,14 +9403,14 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $0) (i32.const -1) @@ -9453,7 +9459,7 @@ ) (i32.const 8) ) - (block + (block i32 (i32.store (get_local $0) (i32.or @@ -9463,7 +9469,7 @@ ) (i32.const -1) ) - (block + (block i32 (i32.store offset=8 (get_local $0) (i32.const 0) @@ -9516,7 +9522,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $5 (i32.eqz (call $___lockfile @@ -9534,7 +9540,7 @@ (if (get_local $5) (get_local $0) - (block + (block i32 (call $___unlockfile (get_local $3) ) @@ -9552,7 +9558,7 @@ (get_local $4) ) (get_local $2) - (call_import $i32u-div + (call $i32u-div (get_local $0) (get_local $1) ) @@ -9586,7 +9592,7 @@ (i32.const 64) ) (i32.const 0) - (block + (block i32 (i32.store (get_local $3) (i32.load offset=60 @@ -9605,7 +9611,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -9702,7 +9708,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -9745,7 +9751,7 @@ (get_local $0) (i32.const -4096) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.sub @@ -9800,7 +9806,7 @@ (i32.const 8) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -9878,7 +9884,7 @@ ) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (i32.const 0) @@ -9894,7 +9900,7 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (i32.const 0) @@ -9920,7 +9926,7 @@ (get_global $STACKTOP) ) (func $b2 (param $0 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise index e0f340478..7b84b9c38 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise +++ b/test/emcc_O2_hello_world.fromasm.imprecise @@ -1,5 +1,4 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) @@ -7,12 +6,12 @@ (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort (param i32))) (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32))) (import "env" "_pthread_self" (func $_pthread_self (result i32))) @@ -28,8 +27,8 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $_free)) @@ -50,31 +49,36 @@ (export "dynCall_ii" (func $dynCall_ii)) (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $0 i32) (result i32) (local $1 i32) @@ -225,7 +229,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -249,7 +253,7 @@ (get_local $5) ) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -467,7 +471,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -496,7 +500,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -607,7 +611,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $38 (get_local $19) @@ -864,7 +868,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -876,7 +880,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $2 (i32.load offset=24 @@ -984,7 +988,7 @@ (get_local $9) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -1006,7 +1010,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -1020,7 +1024,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1047,7 +1051,7 @@ (get_local $6) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1112,7 +1116,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -1151,7 +1155,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $19) @@ -1168,7 +1172,7 @@ (get_local $0) (get_local $6) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $19) @@ -1194,7 +1198,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $19) @@ -1327,7 +1331,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $39 (get_local $6) @@ -1719,7 +1723,7 @@ (get_local $30) ) ) - (block + (block i32 (if (i32.eqz (tee_local $3 @@ -1982,7 +1986,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -1994,7 +1998,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -2102,7 +2106,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -2124,7 +2128,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -2138,7 +2142,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2165,7 +2169,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2230,7 +2234,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -2269,7 +2273,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -2286,7 +2290,7 @@ (get_local $10) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -2312,7 +2316,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -2410,7 +2414,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $14 (get_local $5) @@ -2727,7 +2731,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $23) @@ -2798,7 +2802,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3027,7 +3031,7 @@ (i32.and (i32.add (tee_local $15 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3035,7 +3039,7 @@ ) (get_local $15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -3065,7 +3069,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3161,7 +3165,7 @@ (i32.const 0) (i32.eq (tee_local $6 - (block $label$break$L257 + (block $label$break$L257 i32 (if (i32.and (i32.load @@ -3170,7 +3174,7 @@ (i32.const 4) ) (i32.const 190) - (block + (block i32 (block $label$break$L259 (if (tee_local $3 @@ -3251,7 +3255,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $14) ) ) @@ -3309,7 +3313,7 @@ ) (i32.ne (tee_local $3 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -3402,7 +3406,7 @@ (if (i32.eq (tee_local $9 - (call_import $_sbrk + (call $_sbrk (get_local $0) ) ) @@ -3493,14 +3497,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $2) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) @@ -3557,12 +3561,12 @@ (i32.and (i32.lt_u (tee_local $1 - (call_import $_sbrk + (call $_sbrk (get_local $4) ) ) (tee_local $4 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -3815,7 +3819,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.const 192) (get_local $20) @@ -4034,7 +4038,7 @@ ) (i32.const 1) ) - (block + (block i32 (set_local $13 (i32.and (get_local $0) @@ -4159,7 +4163,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -4181,7 +4185,7 @@ ) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -4195,7 +4199,7 @@ ) (get_local $4) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4222,7 +4226,7 @@ (get_local $21) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4260,7 +4264,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4325,7 +4329,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $24) @@ -4347,7 +4351,7 @@ (get_local $9) (get_local $21) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $24) @@ -4376,7 +4380,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $24) @@ -4422,7 +4426,7 @@ (get_local $9) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$61 (i32.eq @@ -4432,7 +4436,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4478,7 +4482,7 @@ (get_local $21) (get_local $17) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -4499,7 +4503,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -4617,7 +4621,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -4663,7 +4667,7 @@ (i32.const 480) (i32.shl (tee_local $3 - (block $do-once$67 + (block $do-once$67 i32 (if (tee_local $2 (i32.shr_u @@ -4671,12 +4675,14 @@ (i32.const 8) ) ) - (block - (br_if $do-once$67 - (i32.const 31) - (i32.gt_u - (get_local $15) - (i32.const 16777215) + (block i32 + (drop + (br_if $do-once$67 + (i32.const 31) + (i32.gt_u + (get_local $15) + (i32.const 16777215) + ) ) ) (i32.or @@ -4931,7 +4937,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $43) @@ -5002,7 +5008,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5349,7 +5355,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $44 (get_local $4) @@ -5661,7 +5667,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $45) @@ -5732,7 +5738,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5982,7 +5988,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6001,7 +6007,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $8 (i32.add @@ -6059,7 +6065,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6167,7 +6173,7 @@ (get_local $11) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6176,7 +6182,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6221,7 +6227,7 @@ (get_local $1) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6238,7 +6244,7 @@ (set_local $10 (get_local $3) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $10 @@ -6378,7 +6384,7 @@ (get_local $9) (get_local $14) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $9) @@ -6400,7 +6406,7 @@ ) (get_local $14) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6414,7 +6420,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6441,7 +6447,7 @@ (get_local $1) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -6511,7 +6517,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6559,7 +6565,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -6581,7 +6587,7 @@ (get_local $3) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -6607,7 +6613,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -6652,7 +6658,7 @@ (get_local $2) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -6670,7 +6676,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -6923,7 +6929,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $3) @@ -6947,7 +6953,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -6961,7 +6967,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -6988,7 +6994,7 @@ (get_local $9) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7052,7 +7058,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7091,7 +7097,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $12) @@ -7113,7 +7119,7 @@ (get_local $0) (get_local $9) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $12) @@ -7139,7 +7145,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $12) @@ -7189,7 +7195,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7198,7 +7204,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7239,7 +7245,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7256,7 +7262,7 @@ (set_local $16 (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $16 @@ -7365,7 +7371,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $7) @@ -7649,7 +7655,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $18) @@ -7720,7 +7726,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7902,8 +7908,8 @@ (i32.load (i32.const 8) ) - (block - (call_import $_pthread_cleanup_push + (block i32 + (call $_pthread_cleanup_push (i32.const 4) (get_local $0) ) @@ -7923,18 +7929,18 @@ ) (set_local $9 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $12) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $9) ) - (block + (block i32 (i32.store (get_local $11) (i32.load @@ -7950,7 +7956,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $11) ) @@ -8004,7 +8010,7 @@ (get_local $4) (i32.const 2) ) - (block + (block i32 (i32.store (get_local $8) (i32.add @@ -8022,14 +8028,14 @@ ) (get_local $14) ) - (block + (block i32 (set_local $3 (get_local $5) ) (get_local $14) ) ) - (block + (block i32 (i32.store (get_local $8) (tee_local $3 @@ -8268,7 +8274,7 @@ ) ) (set_local $1 - (block $label$break$L10 + (block $label$break$L10 i32 (if (i32.gt_s (i32.load8_s offset=75 @@ -8276,7 +8282,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -8361,7 +8367,7 @@ (get_local $3) ) ) - (block + (block i32 (set_local $2 (i32.const 0) ) @@ -8400,10 +8406,10 @@ (func $_fflush (param $0 i32) (result i32) (local $1 i32) (local $2 i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.le_s (i32.load offset=76 @@ -8432,7 +8438,7 @@ (if (get_local $1) (get_local $2) - (block + (block i32 (call $___unlockfile (get_local $0) ) @@ -8440,7 +8446,7 @@ ) ) ) - (block + (block i32 (set_local $0 (if (i32.load @@ -8454,7 +8460,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (if @@ -8523,7 +8529,7 @@ (get_local $0) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (get_local $2) @@ -8864,7 +8870,7 @@ ) ) ) - (block + (block i32 (drop (call_indirect $FUNCSIG$iiii (get_local $0) @@ -8890,7 +8896,7 @@ (i32.const 0) ) (i32.const -1) - (block + (block i32 (if (i32.lt_u (tee_local $4 @@ -8966,7 +8972,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -9272,7 +9278,7 @@ ) ) (set_local $0 - (block $do-once$0 + (block $do-once$0 i32 (if (i32.lt_s (call $_fputs @@ -9282,7 +9288,7 @@ (i32.const 0) ) (i32.const 1) - (block + (block i32 (if (if (i32.ne @@ -9395,14 +9401,14 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $0) (i32.const -1) @@ -9451,7 +9457,7 @@ ) (i32.const 8) ) - (block + (block i32 (i32.store (get_local $0) (i32.or @@ -9461,7 +9467,7 @@ ) (i32.const -1) ) - (block + (block i32 (i32.store offset=8 (get_local $0) (i32.const 0) @@ -9514,7 +9520,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $5 (i32.eqz (call $___lockfile @@ -9532,7 +9538,7 @@ (if (get_local $5) (get_local $0) - (block + (block i32 (call $___unlockfile (get_local $3) ) @@ -9584,7 +9590,7 @@ (i32.const 64) ) (i32.const 0) - (block + (block i32 (i32.store (get_local $3) (i32.load offset=60 @@ -9603,7 +9609,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -9700,7 +9706,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -9743,7 +9749,7 @@ (get_local $0) (i32.const -4096) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.sub @@ -9798,7 +9804,7 @@ (i32.const 8) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -9876,7 +9882,7 @@ ) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (i32.const 0) @@ -9892,7 +9898,7 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (i32.const 0) @@ -9918,7 +9924,7 @@ (get_global $STACKTOP) ) (func $b2 (param $0 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts index d158d27bf..0a5967f3e 100644 --- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts @@ -1,5 +1,4 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) @@ -7,12 +6,12 @@ (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort (param i32))) (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32))) (import "env" "_pthread_self" (func $_pthread_self (result i32))) @@ -28,8 +27,8 @@ (import "env" "___unlock" (func $___unlock (param i32))) (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $_free)) @@ -50,31 +49,36 @@ (export "dynCall_ii" (func $dynCall_ii)) (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $i1 i32) (result i32) (local $i2 i32) @@ -274,7 +278,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -300,7 +304,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -545,7 +549,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i11 (i32.add @@ -576,7 +580,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -702,7 +706,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i19 (get_local $i16) @@ -1008,7 +1012,7 @@ (get_local $i22) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.add @@ -1021,7 +1025,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.load @@ -1168,7 +1172,7 @@ (get_local $i28) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i28) @@ -1195,7 +1199,7 @@ (get_local $i14) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i17 (i32.add @@ -1210,7 +1214,7 @@ ) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -1239,7 +1243,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1309,7 +1313,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -1354,7 +1358,7 @@ (get_local $i24) (get_local $i12) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -1379,7 +1383,7 @@ (get_local $i7) (get_local $i12) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1417,7 +1421,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1575,7 +1579,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i29 (get_local $i12) @@ -2348,7 +2352,7 @@ (get_local $i44) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i8 (i32.add @@ -2361,7 +2365,7 @@ (get_local $i44) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.load @@ -2508,7 +2512,7 @@ (get_local $i49) (get_local $i15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i49) @@ -2535,7 +2539,7 @@ (get_local $i2) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -2550,7 +2554,7 @@ ) (get_local $i44) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.add @@ -2579,7 +2583,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2649,7 +2653,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i7 (i32.add @@ -2694,7 +2698,7 @@ (get_local $i45) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -2719,7 +2723,7 @@ (get_local $i15) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2757,7 +2761,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2873,7 +2877,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i50 (get_local $i3) @@ -3240,7 +3244,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i54) @@ -3338,7 +3342,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3604,7 +3608,7 @@ ) (block (set_local $i53 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3647,7 +3651,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3657,7 +3661,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3722,13 +3726,13 @@ (get_local $i52) (i32.const 0) ) - (block + (block i32 (set_local $i51 (i32.load (i32.const 608) ) ) - (block + (block i32 (set_local $i50 (i32.add (get_local $i51) @@ -3794,7 +3798,7 @@ (get_local $i51) (get_local $i52) ) - (block + (block i32 (set_local $i45 (i32.add (get_local $i50) @@ -3863,7 +3867,7 @@ ) (block (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i50) ) ) @@ -3924,9 +3928,9 @@ (get_local $i36) (i32.const 173) ) - (block + (block i32 (set_local $i52 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4030,7 +4034,7 @@ (br $do-once$39) ) (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i62) ) ) @@ -4100,13 +4104,13 @@ ) ) ) - (block + (block i32 (set_local $i52 (i32.load (i32.const 656) ) ) - (block + (block i32 (set_local $i5 (i32.and (i32.add @@ -4132,14 +4136,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $i5) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $i45) ) ) @@ -4213,15 +4217,15 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $i63 - (call_import $_sbrk + (call $_sbrk (get_local $i43) ) ) - (block + (block i32 (set_local $i43 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4245,7 +4249,7 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $i60 (i32.sub (get_local $i43) @@ -4923,7 +4927,7 @@ (get_local $i76) (get_local $i68) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i76) @@ -4950,7 +4954,7 @@ (get_local $i5) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i52 (i32.add @@ -4965,7 +4969,7 @@ ) (get_local $i43) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -4994,7 +4998,7 @@ ) (br $do-once$53) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5038,7 +5042,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -5110,7 +5114,7 @@ (get_local $i72) (get_local $i55) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -5138,7 +5142,7 @@ (get_local $i45) (get_local $i55) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5180,7 +5184,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5241,7 +5245,7 @@ (get_local $i45) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -5255,7 +5259,7 @@ ) (br $do-once$61) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5301,7 +5305,7 @@ (get_local $i55) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -5323,7 +5327,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5485,7 +5489,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5833,7 +5837,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i84) @@ -5931,7 +5935,7 @@ ) (br $do-once$50) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5995,7 +5999,7 @@ (get_local $i63) (get_local $i60) ) - (block + (block i32 (set_local $i53 (i32.add (get_local $i63) @@ -6344,7 +6348,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i87 (get_local $i43) @@ -6705,7 +6709,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i91) @@ -6803,7 +6807,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7116,7 +7120,7 @@ (get_local $i2) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.load @@ -7137,7 +7141,7 @@ (get_local $i1) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.and @@ -7191,7 +7195,7 @@ (get_local $i8) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7312,7 +7316,7 @@ (get_local $i7) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7324,7 +7328,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7369,7 +7373,7 @@ (get_local $i10) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7387,7 +7391,7 @@ (set_local $i15 (get_local $i14) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i15 @@ -7562,7 +7566,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i22) @@ -7589,7 +7593,7 @@ (get_local $i11) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i16 (i32.add @@ -7604,7 +7608,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7633,7 +7637,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7708,7 +7712,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i10 (i32.add @@ -7761,7 +7765,7 @@ (get_local $i18) (get_local $i10) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -7789,7 +7793,7 @@ (get_local $i14) (get_local $i10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7827,7 +7831,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7887,7 +7891,7 @@ (get_local $i12) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -7907,7 +7911,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -8184,7 +8188,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i27) @@ -8213,7 +8217,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -8228,7 +8232,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i20 (i32.add @@ -8257,7 +8261,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8326,7 +8330,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i22 (i32.add @@ -8371,7 +8375,7 @@ (get_local $i23) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -8399,7 +8403,7 @@ (get_local $i8) (get_local $i22) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8437,7 +8441,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8502,7 +8506,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -8514,7 +8518,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8555,7 +8559,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i21 (i32.add @@ -8573,7 +8577,7 @@ (set_local $i28 (get_local $i21) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i28 @@ -8722,7 +8726,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i30 (get_local $i13) @@ -9050,7 +9054,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i35) @@ -9148,7 +9152,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9390,7 +9394,7 @@ ) (set_local $i14 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i5) ) @@ -9398,7 +9402,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 4) (get_local $i1) ) @@ -9424,13 +9428,13 @@ ) (set_local $i11 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i6) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $i14 @@ -10050,7 +10054,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (set_local $i4 @@ -10153,7 +10157,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (set_local $i2 @@ -10465,7 +10469,7 @@ (get_local $i6) (get_local $i8) ) - (block + (block i32 (set_local $i11 (i32.and (get_local $i2) @@ -10572,7 +10576,7 @@ (get_local $i3) ) ) - (block + (block i32 (drop (call_indirect $FUNCSIG$iiii (get_local $i1) @@ -10695,7 +10699,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $i1) (get_local $i2) (get_local $i3) @@ -11068,14 +11072,14 @@ ) (i32.const 10) ) - (block + (block i32 (set_local $i5 (i32.add (get_local $i2) (i32.const 20) ) ) - (block + (block i32 (set_local $i6 (i32.load (get_local $i5) @@ -11203,7 +11207,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $i5) ) @@ -11455,7 +11459,7 @@ ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $i5) (i32.load @@ -11465,7 +11469,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.add (get_local $i5) @@ -11473,7 +11477,7 @@ ) (i32.const 21505) ) - (block + (block i32 (i32.store (i32.add (get_local $i5) @@ -11485,7 +11489,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $i5) ) @@ -11636,7 +11640,7 @@ ) (set_local $i1 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $i3) ) @@ -11774,7 +11778,7 @@ (set_local $i1 (i32.load (i32.add - (call_import $_pthread_self) + (call $_pthread_self) (i32.const 60) ) ) @@ -11865,7 +11869,7 @@ ) ) (func $b1 (param $i1 i32) (param $i2 i32) (param $i3 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (return @@ -11883,7 +11887,7 @@ ) ) (func $b0 (param $i1 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (return @@ -11919,7 +11923,7 @@ ) ) (func $b2 (param $i1 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts index 618b0f593..f40a19522 100644 --- a/test/emcc_O2_hello_world.fromasm.no-opts +++ b/test/emcc_O2_hello_world.fromasm.no-opts @@ -1,5 +1,4 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) @@ -7,12 +6,12 @@ (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort (param i32))) (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32))) (import "env" "_pthread_self" (func $_pthread_self (result i32))) @@ -29,8 +28,8 @@ (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $_free)) @@ -51,31 +50,36 @@ (export "dynCall_ii" (func $dynCall_ii)) (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2) (func $_malloc (param $i1 i32) (result i32) (local $i2 i32) @@ -275,7 +279,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -301,7 +305,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) (i32.store @@ -546,7 +550,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i11 (i32.add @@ -577,7 +581,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) (block @@ -703,7 +707,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i19 (get_local $i16) @@ -1009,7 +1013,7 @@ (get_local $i22) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.add @@ -1022,7 +1026,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.load @@ -1169,7 +1173,7 @@ (get_local $i28) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i28) @@ -1196,7 +1200,7 @@ (get_local $i14) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (set_local $i17 (i32.add @@ -1211,7 +1215,7 @@ ) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -1240,7 +1244,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -1310,7 +1314,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i12 (i32.add @@ -1355,7 +1359,7 @@ (get_local $i24) (get_local $i12) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -1380,7 +1384,7 @@ (get_local $i7) (get_local $i12) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1418,7 +1422,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -1576,7 +1580,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i29 (get_local $i12) @@ -2349,7 +2353,7 @@ (get_local $i44) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i8 (i32.add @@ -2362,7 +2366,7 @@ (get_local $i44) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i3 (i32.load @@ -2509,7 +2513,7 @@ (get_local $i49) (get_local $i15) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i49) @@ -2536,7 +2540,7 @@ (get_local $i2) (get_local $i15) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -2551,7 +2555,7 @@ ) (get_local $i44) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.add @@ -2580,7 +2584,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -2650,7 +2654,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i7 (i32.add @@ -2695,7 +2699,7 @@ (get_local $i45) (get_local $i7) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -2720,7 +2724,7 @@ (get_local $i15) (get_local $i7) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2758,7 +2762,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -2874,7 +2878,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i50 (get_local $i3) @@ -3241,7 +3245,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i54) @@ -3339,7 +3343,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3605,7 +3609,7 @@ ) (block (set_local $i53 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -3648,7 +3652,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -3658,7 +3662,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -3723,13 +3727,13 @@ (get_local $i52) (i32.const 0) ) - (block + (block i32 (set_local $i51 (i32.load (i32.const 608) ) ) - (block + (block i32 (set_local $i50 (i32.add (get_local $i51) @@ -3795,7 +3799,7 @@ (get_local $i51) (get_local $i52) ) - (block + (block i32 (set_local $i45 (i32.add (get_local $i50) @@ -3864,7 +3868,7 @@ ) (block (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i50) ) ) @@ -3925,9 +3929,9 @@ (get_local $i36) (i32.const 173) ) - (block + (block i32 (set_local $i52 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4031,7 +4035,7 @@ (br $do-once$39) ) (set_local $i45 - (call_import $_sbrk + (call $_sbrk (get_local $i62) ) ) @@ -4101,13 +4105,13 @@ ) ) ) - (block + (block i32 (set_local $i52 (i32.load (i32.const 656) ) ) - (block + (block i32 (set_local $i5 (i32.and (i32.add @@ -4133,14 +4137,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $i5) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $i45) ) ) @@ -4214,15 +4218,15 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $i63 - (call_import $_sbrk + (call $_sbrk (get_local $i43) ) ) - (block + (block i32 (set_local $i43 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -4246,7 +4250,7 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $i60 (i32.sub (get_local $i43) @@ -4924,7 +4928,7 @@ (get_local $i76) (get_local $i68) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i76) @@ -4951,7 +4955,7 @@ (get_local $i5) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i52 (i32.add @@ -4966,7 +4970,7 @@ ) (get_local $i43) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -4995,7 +4999,7 @@ ) (br $do-once$53) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5039,7 +5043,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i45 (i32.add @@ -5111,7 +5115,7 @@ (get_local $i72) (get_local $i55) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -5139,7 +5143,7 @@ (get_local $i45) (get_local $i55) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5181,7 +5185,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -5242,7 +5246,7 @@ (get_local $i45) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -5256,7 +5260,7 @@ ) (br $do-once$61) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5302,7 +5306,7 @@ (get_local $i55) (get_local $i68) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -5324,7 +5328,7 @@ (br $do-once$63) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5486,7 +5490,7 @@ (br $do-once$65) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5834,7 +5838,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i84) @@ -5932,7 +5936,7 @@ ) (br $do-once$50) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -5996,7 +6000,7 @@ (get_local $i63) (get_local $i60) ) - (block + (block i32 (set_local $i53 (i32.add (get_local $i63) @@ -6345,7 +6349,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i87 (get_local $i43) @@ -6706,7 +6710,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i91) @@ -6804,7 +6808,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7117,7 +7121,7 @@ (get_local $i2) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i4 (i32.load @@ -7138,7 +7142,7 @@ (get_local $i1) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.and @@ -7192,7 +7196,7 @@ (get_local $i8) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -7313,7 +7317,7 @@ (get_local $i7) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -7325,7 +7329,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7370,7 +7374,7 @@ (get_local $i10) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7388,7 +7392,7 @@ (set_local $i15 (get_local $i14) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i15 @@ -7563,7 +7567,7 @@ (get_local $i22) (get_local $i3) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i22) @@ -7590,7 +7594,7 @@ (get_local $i11) (get_local $i3) ) - (call_import $_abort) + (call $_abort) ) (set_local $i16 (i32.add @@ -7605,7 +7609,7 @@ ) (get_local $i8) ) - (call_import $_abort) + (call $_abort) ) (set_local $i14 (i32.add @@ -7634,7 +7638,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -7709,7 +7713,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i10 (i32.add @@ -7762,7 +7766,7 @@ (get_local $i18) (get_local $i10) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -7790,7 +7794,7 @@ (get_local $i14) (get_local $i10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7828,7 +7832,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -7888,7 +7892,7 @@ (get_local $i12) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i5 (i32.add @@ -7908,7 +7912,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -8185,7 +8189,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i27) @@ -8214,7 +8218,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i15 (i32.add @@ -8229,7 +8233,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) (set_local $i20 (i32.add @@ -8258,7 +8262,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8327,7 +8331,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i22 (i32.add @@ -8372,7 +8376,7 @@ (get_local $i23) (get_local $i22) ) - (call_import $_abort) + (call $_abort) ) (i32.store (i32.add @@ -8400,7 +8404,7 @@ (get_local $i8) (get_local $i22) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8438,7 +8442,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.add @@ -8503,7 +8507,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -8515,7 +8519,7 @@ ) (get_local $i6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8556,7 +8560,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $i21 (i32.add @@ -8574,7 +8578,7 @@ (set_local $i28 (get_local $i21) ) - (call_import $_abort) + (call $_abort) ) ) (set_local $i28 @@ -8723,7 +8727,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $i30 (get_local $i13) @@ -9051,7 +9055,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $i35) @@ -9149,7 +9153,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9391,7 +9395,7 @@ ) (set_local $i14 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i5) ) @@ -9399,7 +9403,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 4) (get_local $i1) ) @@ -9425,13 +9429,13 @@ ) (set_local $i11 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $i6) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $i14 @@ -10051,7 +10055,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 36) ) (set_local $i4 @@ -10154,7 +10158,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 36) ) (set_local $i2 @@ -10466,7 +10470,7 @@ (get_local $i6) (get_local $i8) ) - (block + (block i32 (set_local $i11 (i32.and (get_local $i2) @@ -10573,7 +10577,7 @@ (get_local $i3) ) ) - (block + (block i32 (drop (call_indirect $FUNCSIG$iiii (get_local $i1) @@ -10696,7 +10700,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $i1) (get_local $i2) (get_local $i3) @@ -11069,14 +11073,14 @@ ) (i32.const 10) ) - (block + (block i32 (set_local $i5 (i32.add (get_local $i2) (i32.const 20) ) ) - (block + (block i32 (set_local $i6 (i32.load (get_local $i5) @@ -11204,7 +11208,7 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $i5) ) @@ -11413,7 +11417,7 @@ (get_local $i3) ) (set_local $i9 - (call_import $i32u-div + (call $i32u-div (get_local $i8) (get_local $i2) ) @@ -11456,7 +11460,7 @@ ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $i5) (i32.load @@ -11466,7 +11470,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.add (get_local $i5) @@ -11474,7 +11478,7 @@ ) (i32.const 21505) ) - (block + (block i32 (i32.store (i32.add (get_local $i5) @@ -11486,7 +11490,7 @@ ) ) (i32.ne - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $i5) ) @@ -11637,7 +11641,7 @@ ) (set_local $i1 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $i3) ) @@ -11775,7 +11779,7 @@ (set_local $i1 (i32.load (i32.add - (call_import $_pthread_self) + (call $_pthread_self) (i32.const 60) ) ) @@ -11866,7 +11870,7 @@ ) ) (func $b1 (param $i1 i32) (param $i2 i32) (param $i3 i32) (result i32) - (call_import $abort + (call $abort (i32.const 1) ) (return @@ -11884,7 +11888,7 @@ ) ) (func $b0 (param $i1 i32) (result i32) - (call_import $abort + (call $abort (i32.const 0) ) (return @@ -11920,7 +11924,7 @@ ) ) (func $b2 (param $i1 i32) - (call_import $abort + (call $abort (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm index a4bf51c56..f2074155b 100644 --- a/test/emcc_hello_world.fromasm +++ b/test/emcc_hello_world.fromasm @@ -1,5 +1,4 @@ (module - (memory 256 256) (data (get_global $memoryBase) "emcc_hello_world.asm.js") (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$id (func (param f64) (result i32))) @@ -9,13 +8,13 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "env" "cttz_i8" (global $cttz_i8 i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "env" "cttz_i8" (global $cttz_i8$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort)) (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32))) (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32))) @@ -39,8 +38,8 @@ (import "asm2wasm" "i32s-rem" (func $i32s-rem (param i32 i32) (result i32))) (import "asm2wasm" "i32u-rem" (func $i32u-rem (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_i64Subtract" (func $_i64Subtract)) @@ -66,31 +65,37 @@ (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) (export "___udivmoddi4" (func $___udivmoddi4)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $cttz_i8 (mut i32) (get_global $cttz_i8$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $0 i32) (result i32) (local $1 i32) @@ -117,7 +122,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (get_local $1) ) @@ -252,7 +257,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (drop (call $_printf @@ -288,7 +293,7 @@ (i32.const 52) ) ) - (block $switch$0 + (block $switch$0 f64 (block $switch-default$3 (block $switch-case$2 (block $switch-case$1 @@ -311,7 +316,7 @@ (get_local $0) (f64.const 0) ) - (block + (block i32 (set_local $0 (call $_frexp (f64.mul @@ -489,7 +494,7 @@ (i32.const 16) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -511,7 +516,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $2 @@ -523,7 +528,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -552,7 +557,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $3 (get_local $4) @@ -592,7 +597,7 @@ (get_local $5) ) (if - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -632,7 +637,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -667,14 +672,14 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $0) (i32.const -1) @@ -694,10 +699,10 @@ (func $_fflush (param $0 i32) (result i32) (local $1 i32) (local $2 i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.le_s (i32.load offset=76 @@ -726,7 +731,7 @@ (if (get_local $2) (get_local $1) - (block + (block i32 (call $___unlockfile (get_local $0) ) @@ -734,7 +739,7 @@ ) ) ) - (block + (block i32 (set_local $0 (if (i32.load @@ -748,7 +753,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (if @@ -806,7 +811,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (get_local $0) @@ -831,7 +836,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -886,7 +891,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $8 (i32.add @@ -964,7 +969,7 @@ ) ) (set_local $0 - (block $jumpthreading$outer$1 + (block $jumpthreading$outer$1 i32 (block $jumpthreading$inner$1 (block $jumpthreading$inner$0 (loop $while-in$1 @@ -976,8 +981,8 @@ (i32.load (i32.const 16) ) - (block - (call_import $_pthread_cleanup_push + (block i32 + (call $_pthread_cleanup_push (i32.const 5) (get_local $0) ) @@ -997,18 +1002,18 @@ ) (set_local $3 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $9) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $3) ) - (block + (block i32 (i32.store (get_local $8) (i32.load @@ -1024,7 +1029,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $8) ) @@ -1057,7 +1062,7 @@ ) ) ) - (block + (block i32 (i32.store (get_local $6) (tee_local $3 @@ -1097,7 +1102,7 @@ (get_local $4) (i32.const 2) ) - (block + (block i32 (i32.store (get_local $6) (i32.add @@ -1115,7 +1120,7 @@ ) (get_local $12) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -1242,7 +1247,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (i32.add @@ -1308,7 +1313,7 @@ (i32.const 0) ) (i32.const -1) - (block + (block i32 (set_local $12 (if (i32.gt_s @@ -1367,7 +1372,7 @@ (get_local $8) (get_local $9) ) - (block + (block i32 (set_local $2 (i32.load (tee_local $7 @@ -1427,7 +1432,7 @@ ) (if (get_local $2) - (block + (block i32 (drop (call_indirect $FUNCSIG$iiii (get_local $0) @@ -1590,7 +1595,7 @@ ) (drop (call $_memcpy - (block $label$break$L10 + (block $label$break$L10 i32 (if (i32.gt_s (i32.load8_s offset=75 @@ -1598,7 +1603,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -1677,7 +1682,7 @@ (get_local $5) ) ) - (block + (block i32 (set_local $2 (i32.const 0) ) @@ -1742,7 +1747,7 @@ ) (i32.const 8) ) - (block + (block i32 (i32.store (get_local $0) (i32.or @@ -1752,7 +1757,7 @@ ) (i32.const -1) ) - (block + (block i32 (i32.store offset=8 (get_local $0) (i32.const 0) @@ -1787,10 +1792,10 @@ ) ) (func $_wcrtomb (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.lt_u (get_local $1) @@ -1916,7 +1921,7 @@ ) (i32.const 1048576) ) - (block + (block i32 (i32.store8 (get_local $0) (i32.and @@ -1977,7 +1982,7 @@ ) (i32.const 4) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.const 84) @@ -2254,7 +2259,7 @@ (get_local $0) (i32.const -4096) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.sub @@ -2274,7 +2279,7 @@ (local $4 i32) (local $5 i32) (local $6 i32) - (block $jumpthreading$outer$0 + (block $jumpthreading$outer$0 i32 (block $jumpthreading$inner$0 (br_if $jumpthreading$inner$0 (i32.le_u @@ -2465,7 +2470,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $20 (i32.add @@ -2614,7 +2619,7 @@ (get_local $15) ) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.const 75) @@ -2827,7 +2832,7 @@ ) (i32.const 10) ) - (block + (block i32 (set_local $5 (i32.load8_s (tee_local $10 @@ -2862,7 +2867,7 @@ (get_local $8) ) ) - (block + (block i32 (set_local $7 (get_local $13) ) @@ -2991,7 +2996,7 @@ ) (block (set_local $13 - (block $jumpthreading$outer$0 + (block $jumpthreading$outer$0 i32 (block $jumpthreading$inner$0 (br_if $jumpthreading$inner$0 (i32.ge_u @@ -3124,7 +3129,7 @@ (get_local $7) (i32.const 0) ) - (block + (block i32 (set_local $17 (i32.sub (i32.const 0) @@ -3136,7 +3141,7 @@ (i32.const 8192) ) ) - (block + (block i32 (set_local $17 (get_local $7) ) @@ -3245,7 +3250,7 @@ ) ) (set_local $9 - (block $label$break$L46 + (block $label$break$L46 i32 (if (i32.eq (i32.load8_s @@ -3253,7 +3258,7 @@ ) (i32.const 46) ) - (block + (block i32 (if (i32.ne (i32.shr_s @@ -3420,7 +3425,7 @@ ) (if (get_local $33) - (block + (block i32 (set_local $7 (i32.load (tee_local $5 @@ -3445,7 +3450,7 @@ ) (get_local $9) ) - (block + (block i32 (set_local $7 (i32.const 0) ) @@ -3453,7 +3458,7 @@ ) ) ) - (block + (block i32 (set_local $7 (i32.const -1) ) @@ -4266,7 +4271,7 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $30 (i32.const 1) ) @@ -4282,13 +4287,13 @@ (get_local $10) (i32.const 2048) ) - (block + (block i32 (set_local $30 (i32.const 1) ) (i32.const 4111) ) - (block + (block i32 (set_local $30 (tee_local $1 (i32.and @@ -4314,7 +4319,7 @@ (get_local $5) ) (set_local $5 - (block $do-once$56 + (block $do-once$56 i32 (if (i32.or (i32.lt_u @@ -4336,7 +4341,7 @@ (i32.const 0) ) ) - (block + (block i32 (if (tee_local $5 (f64.ne @@ -4411,7 +4416,7 @@ ) ) (get_local $22) - (block + (block f64 (set_local $14 (f64.const 8) ) @@ -4499,7 +4504,7 @@ ) (get_local $37) ) - (block + (block i32 (i32.store8 (get_local $48) (i32.const 48) @@ -4566,7 +4571,7 @@ (i32.load8_s (i32.add (tee_local $6 - (call_import $f64-to-int + (call $f64-to-int (get_local $14) ) ) @@ -4592,7 +4597,7 @@ ) ) (set_local $5 - (block $do-once$64 + (block $do-once$64 i32 (if (i32.eq (i32.sub @@ -4606,16 +4611,18 @@ ) (i32.const 1) ) - (block - (br_if $do-once$64 - (get_local $6) - (i32.and - (get_local $16) + (block i32 + (drop + (br_if $do-once$64 + (get_local $6) (i32.and - (get_local $12) - (f64.eq - (get_local $14) - (f64.const 0) + (get_local $16) + (i32.and + (get_local $12) + (f64.eq + (get_local $14) + (f64.const 0) + ) ) ) ) @@ -4807,7 +4814,7 @@ (i32.lt_s (if (get_local $5) - (block + (block i32 (i32.store (get_local $20) (tee_local $5 @@ -4827,7 +4834,7 @@ ) (get_local $5) ) - (block + (block i32 (set_local $14 (get_local $22) ) @@ -4848,7 +4855,7 @@ (i32.store (get_local $6) (tee_local $5 - (call_import $f64-to-int + (call $f64-to-int (get_local $14) ) ) @@ -4901,7 +4908,7 @@ ) ) (set_local $9 - (block $do-once$70 + (block $do-once$70 i32 (if (i32.lt_u (tee_local $7 @@ -4913,7 +4920,7 @@ (get_local $9) ) (get_local $9) - (block + (block i32 (set_local $5 (i32.const 0) ) @@ -4965,10 +4972,12 @@ ) ) ) - (br_if $do-once$70 - (get_local $9) - (i32.eqz - (get_local $5) + (drop + (br_if $do-once$70 + (get_local $9) + (i32.eqz + (get_local $5) + ) ) ) (i32.store @@ -5058,7 +5067,7 @@ (set_local $12 (i32.add (i32.and - (call_import $i32s-div + (call $i32s-div (i32.add (get_local $19) (i32.const 25) @@ -5099,13 +5108,13 @@ (select (get_local $8) (tee_local $5 - (block $do-once$78 + (block $do-once$78 i32 (if (i32.lt_u (get_local $5) (get_local $6) ) - (block + (block i32 (set_local $44 (i32.add (i32.shl @@ -5175,10 +5184,12 @@ ) ) ) - (br_if $do-once$78 - (get_local $5) - (i32.eqz - (get_local $9) + (drop + (br_if $do-once$78 + (get_local $5) + (i32.eqz + (get_local $9) + ) ) ) (i32.store @@ -5362,7 +5373,7 @@ (i32.const -9) ) ) - (block + (block i32 (set_local $7 (i32.add (i32.add @@ -5372,7 +5383,7 @@ (i32.shl (i32.add (i32.and - (call_import $i32s-div + (call $i32s-div (tee_local $11 (i32.add (get_local $7) @@ -5394,7 +5405,7 @@ (tee_local $11 (i32.add (i32.and - (call_import $i32s-rem + (call $i32s-rem (get_local $11) (i32.const 9) ) @@ -5449,7 +5460,7 @@ (i32.eqz (tee_local $31 (i32.and - (call_import $i32u-rem + (call $i32u-rem (tee_local $11 (i32.load (get_local $7) @@ -5470,7 +5481,7 @@ (f64.const 9007199254740992) (i32.and (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $11) (get_local $12) ) @@ -5486,7 +5497,7 @@ (get_local $31) (tee_local $25 (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $12) (i32.const 2) ) @@ -5509,17 +5520,19 @@ ) ) (set_local $22 - (block $do-once$90 + (block $do-once$90 f64 (if (get_local $30) - (block - (br_if $do-once$90 - (get_local $22) - (i32.ne - (i32.load8_s - (get_local $36) + (block f64 + (drop + (br_if $do-once$90 + (get_local $22) + (i32.ne + (i32.load8_s + (get_local $36) + ) + (i32.const 45) ) - (i32.const 45) ) ) (set_local $14 @@ -5583,7 +5596,7 @@ ) (get_local $5) ) - (block + (block i32 (i32.store (tee_local $5 (i32.add @@ -5684,7 +5697,7 @@ ) (get_local $5) ) - (block + (block i32 (set_local $11 (get_local $6) ) @@ -5745,10 +5758,10 @@ ) ) (set_local $19 - (block $do-once$98 + (block $do-once$98 i32 (if (get_local $21) - (block + (block i32 (set_local $16 (if (i32.and @@ -5772,7 +5785,7 @@ (i32.const -5) ) ) - (block + (block i32 (set_local $6 (i32.add (get_local $16) @@ -5787,7 +5800,7 @@ (get_local $11) ) ) - (block + (block i32 (set_local $6 (i32.add (get_local $16) @@ -5841,7 +5854,7 @@ ) (if (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $19) (i32.const 10) ) @@ -5872,7 +5885,7 @@ (br_if $while-in$103 (i32.eqz (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $19) (tee_local $7 (i32.mul @@ -5915,7 +5928,7 @@ ) (i32.const 102) ) - (block + (block i32 (set_local $5 (select (get_local $16) @@ -5942,7 +5955,7 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $5 (select (get_local $16) @@ -5974,7 +5987,7 @@ ) ) ) - (block + (block i32 (set_local $5 (get_local $19) ) @@ -6014,7 +6027,7 @@ (i32.const 102) ) ) - (block + (block i32 (set_local $6 (select (get_local $11) @@ -6027,7 +6040,7 @@ ) (i32.const 0) ) - (block + (block i32 (if (i32.lt_s (i32.sub @@ -6461,7 +6474,7 @@ ) (get_local $34) ) - (block + (block i32 (i32.store8 (get_local $38) (i32.const 48) @@ -6673,7 +6686,7 @@ ) ) ) - (block + (block i32 (set_local $7 (select (i32.const 0) @@ -6737,7 +6750,7 @@ (i32.const 32) ) (get_local $5) - (block + (block i32 (drop (call $___fwritex (get_local $36) @@ -7251,7 +7264,7 @@ ) ) ) - (block + (block i32 (set_local $11 (select (get_local $7) @@ -7281,7 +7294,7 @@ ) (get_local $6) ) - (block + (block i32 (set_local $11 (i32.const 0) ) @@ -7938,7 +7951,7 @@ ) ) ) - (block + (block i32 (loop $while-in$1 (set_local $3 (call $___uremdi3 @@ -8023,7 +8036,7 @@ (i32.and (i32.or (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $0) (i32.const 10) ) @@ -8036,7 +8049,7 @@ ) (set_local $2 (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $0) (i32.const 10) ) @@ -8084,7 +8097,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (get_local $6) @@ -8160,7 +8173,7 @@ (tee_local $1 (if (get_local $3) - (block + (block i32 (drop (call $___fwritex (get_local $5) @@ -8359,7 +8372,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8383,7 +8396,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8606,7 +8619,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8635,7 +8648,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8728,7 +8741,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $12 (get_local $3) @@ -8977,7 +8990,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -8989,7 +9002,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $11 (i32.load offset=24 @@ -9090,7 +9103,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -9112,7 +9125,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -9126,7 +9139,7 @@ ) (get_local $2) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9153,7 +9166,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9218,7 +9231,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9257,7 +9270,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -9274,7 +9287,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -9300,7 +9313,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -9433,7 +9446,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $13 (get_local $3) @@ -9824,7 +9837,7 @@ (get_local $2) ) ) - (block + (block i32 (if (i32.eqz (tee_local $5 @@ -10064,7 +10077,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -10076,7 +10089,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -10177,7 +10190,7 @@ (get_local $0) (get_local $8) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10199,7 +10212,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -10213,7 +10226,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10240,7 +10253,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -10305,7 +10318,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10344,7 +10357,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $10) @@ -10361,7 +10374,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $10) @@ -10387,7 +10400,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $10) @@ -10516,7 +10529,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $20 (get_local $2) @@ -10822,7 +10835,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10891,7 +10904,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -11089,7 +11102,7 @@ (i32.and (i32.add (tee_local $1 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -11097,7 +11110,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -11127,7 +11140,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -11297,7 +11310,7 @@ (if (i32.eq (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11324,7 +11337,7 @@ (if (i32.ne (tee_local $2 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -11410,7 +11423,7 @@ (br_if $jumpthreading$inner$12 (i32.eq (tee_local $3 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11477,14 +11490,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $4) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $3) ) ) @@ -11526,12 +11539,12 @@ (i32.and (i32.lt_u (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) (tee_local $1 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -11742,7 +11755,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.const 192) (get_local $2) @@ -11974,7 +11987,7 @@ ) (i32.const 1) ) - (block + (block i32 (set_local $5 (i32.and (get_local $1) @@ -12026,7 +12039,7 @@ (get_local $4) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$55 (i32.eq @@ -12036,7 +12049,7 @@ (get_local $8) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12082,7 +12095,7 @@ (get_local $3) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12103,7 +12116,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12217,7 +12230,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12239,7 +12252,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -12253,7 +12266,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12280,7 +12293,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12343,7 +12356,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12383,7 +12396,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $11) @@ -12405,7 +12418,7 @@ (get_local $1) (get_local $3) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $11) @@ -12434,7 +12447,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $11) @@ -12552,7 +12565,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -12598,7 +12611,7 @@ (i32.const 480) (i32.shl (tee_local $3 - (block $do-once$69 + (block $do-once$69 i32 (if (tee_local $0 (i32.shr_u @@ -12606,12 +12619,14 @@ (i32.const 8) ) ) - (block - (br_if $do-once$69 - (i32.const 31) - (i32.gt_u - (get_local $2) - (i32.const 16777215) + (block i32 + (drop + (br_if $do-once$69 + (i32.const 31) + (i32.gt_u + (get_local $2) + (i32.const 16777215) + ) ) ) (i32.or @@ -12855,7 +12870,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12924,7 +12939,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13242,7 +13257,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $23 (get_local $3) @@ -13543,7 +13558,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -13612,7 +13627,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13856,7 +13871,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -13875,7 +13890,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $6 (i32.add @@ -13933,7 +13948,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14041,7 +14056,7 @@ (get_local $4) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14050,7 +14065,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14101,7 +14116,7 @@ (get_local $2) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14118,7 +14133,7 @@ (set_local $5 (get_local $1) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14239,7 +14254,7 @@ (get_local $5) (get_local $11) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $5) @@ -14261,7 +14276,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14275,7 +14290,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14302,7 +14317,7 @@ (get_local $2) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14372,7 +14387,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14420,7 +14435,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $7) @@ -14442,7 +14457,7 @@ (get_local $5) (get_local $2) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $7) @@ -14468,7 +14483,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $7) @@ -14513,7 +14528,7 @@ (get_local $4) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -14531,7 +14546,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -14707,7 +14722,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14716,7 +14731,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14763,7 +14778,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14780,7 +14795,7 @@ (set_local $14 (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14896,7 +14911,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -14920,7 +14935,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14934,7 +14949,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14961,7 +14976,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15025,7 +15040,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -15064,7 +15079,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -15086,7 +15101,7 @@ (get_local $1) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -15112,7 +15127,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -15218,7 +15233,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $0) @@ -15485,7 +15500,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $2) @@ -15554,7 +15569,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15916,7 +15931,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -16681,19 +16696,19 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (i32.const 0) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (i32.const 0) ) (func $b2 (param $0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise index bc1e15b0d..a43f347b1 100644 --- a/test/emcc_hello_world.fromasm.imprecise +++ b/test/emcc_hello_world.fromasm.imprecise @@ -1,5 +1,4 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) @@ -7,13 +6,13 @@ (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "env" "cttz_i8" (global $cttz_i8 i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "env" "cttz_i8" (global $cttz_i8$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort)) (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32))) (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32))) @@ -32,8 +31,8 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_i64Subtract" (func $_i64Subtract)) @@ -59,31 +58,37 @@ (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) (export "___udivmoddi4" (func $___udivmoddi4)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $cttz_i8 (mut i32) (get_global $cttz_i8$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $0 i32) (result i32) (local $1 i32) @@ -110,7 +115,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (get_local $1) ) @@ -245,7 +250,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (drop (call $_printf @@ -281,7 +286,7 @@ (i32.const 52) ) ) - (block $switch$0 + (block $switch$0 f64 (block $switch-default$3 (block $switch-case$2 (block $switch-case$1 @@ -304,7 +309,7 @@ (get_local $0) (f64.const 0) ) - (block + (block i32 (set_local $0 (call $_frexp (f64.mul @@ -482,7 +487,7 @@ (i32.const 16) ) (i32.load offset=60 - (call_import $_pthread_self) + (call $_pthread_self) ) (i32.const 60) ) @@ -504,7 +509,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $2 @@ -516,7 +521,7 @@ ) (set_local $0 (call $___syscall_ret - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $2) ) @@ -545,7 +550,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $3 (get_local $4) @@ -585,7 +590,7 @@ (get_local $5) ) (if - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $3) ) @@ -625,7 +630,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -660,14 +665,14 @@ (if (i32.lt_s (call $___syscall_ret - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $3) ) ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $0) (i32.const -1) @@ -687,10 +692,10 @@ (func $_fflush (param $0 i32) (result i32) (local $1 i32) (local $2 i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.le_s (i32.load offset=76 @@ -719,7 +724,7 @@ (if (get_local $2) (get_local $1) - (block + (block i32 (call $___unlockfile (get_local $0) ) @@ -727,7 +732,7 @@ ) ) ) - (block + (block i32 (set_local $0 (if (i32.load @@ -741,7 +746,7 @@ (i32.const 0) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (if @@ -799,7 +804,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (get_local $0) @@ -824,7 +829,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (i32.store (tee_local $3 @@ -879,7 +884,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $8 (i32.add @@ -957,7 +962,7 @@ ) ) (set_local $0 - (block $jumpthreading$outer$1 + (block $jumpthreading$outer$1 i32 (block $jumpthreading$inner$1 (block $jumpthreading$inner$0 (loop $while-in$1 @@ -969,8 +974,8 @@ (i32.load (i32.const 16) ) - (block - (call_import $_pthread_cleanup_push + (block i32 + (call $_pthread_cleanup_push (i32.const 5) (get_local $0) ) @@ -990,18 +995,18 @@ ) (set_local $3 (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $9) ) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (get_local $3) ) - (block + (block i32 (i32.store (get_local $8) (i32.load @@ -1017,7 +1022,7 @@ (get_local $4) ) (call $___syscall_ret - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $8) ) @@ -1050,7 +1055,7 @@ ) ) ) - (block + (block i32 (i32.store (get_local $6) (tee_local $3 @@ -1090,7 +1095,7 @@ (get_local $4) (i32.const 2) ) - (block + (block i32 (i32.store (get_local $6) (i32.add @@ -1108,7 +1113,7 @@ ) (get_local $12) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -1235,7 +1240,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (i32.add @@ -1301,7 +1306,7 @@ (i32.const 0) ) (i32.const -1) - (block + (block i32 (set_local $12 (if (i32.gt_s @@ -1360,7 +1365,7 @@ (get_local $8) (get_local $9) ) - (block + (block i32 (set_local $2 (i32.load (tee_local $7 @@ -1420,7 +1425,7 @@ ) (if (get_local $2) - (block + (block i32 (drop (call_indirect $FUNCSIG$iiii (get_local $0) @@ -1583,7 +1588,7 @@ ) (drop (call $_memcpy - (block $label$break$L10 + (block $label$break$L10 i32 (if (i32.gt_s (i32.load8_s offset=75 @@ -1591,7 +1596,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -1670,7 +1675,7 @@ (get_local $5) ) ) - (block + (block i32 (set_local $2 (i32.const 0) ) @@ -1735,7 +1740,7 @@ ) (i32.const 8) ) - (block + (block i32 (i32.store (get_local $0) (i32.or @@ -1745,7 +1750,7 @@ ) (i32.const -1) ) - (block + (block i32 (i32.store offset=8 (get_local $0) (i32.const 0) @@ -1780,10 +1785,10 @@ ) ) (func $_wcrtomb (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.lt_u (get_local $1) @@ -1909,7 +1914,7 @@ ) (i32.const 1048576) ) - (block + (block i32 (i32.store8 (get_local $0) (i32.and @@ -1970,7 +1975,7 @@ ) (i32.const 4) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.const 84) @@ -2247,7 +2252,7 @@ (get_local $0) (i32.const -4096) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.sub @@ -2267,7 +2272,7 @@ (local $4 i32) (local $5 i32) (local $6 i32) - (block $jumpthreading$outer$0 + (block $jumpthreading$outer$0 i32 (block $jumpthreading$inner$0 (br_if $jumpthreading$inner$0 (i32.le_u @@ -2458,7 +2463,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $20 (i32.add @@ -2607,7 +2612,7 @@ (get_local $15) ) ) - (block + (block i32 (i32.store (call $___errno_location) (i32.const 75) @@ -2820,7 +2825,7 @@ ) (i32.const 10) ) - (block + (block i32 (set_local $5 (i32.load8_s (tee_local $10 @@ -2855,7 +2860,7 @@ (get_local $8) ) ) - (block + (block i32 (set_local $7 (get_local $13) ) @@ -2984,7 +2989,7 @@ ) (block (set_local $13 - (block $jumpthreading$outer$0 + (block $jumpthreading$outer$0 i32 (block $jumpthreading$inner$0 (br_if $jumpthreading$inner$0 (i32.ge_u @@ -3117,7 +3122,7 @@ (get_local $7) (i32.const 0) ) - (block + (block i32 (set_local $17 (i32.sub (i32.const 0) @@ -3129,7 +3134,7 @@ (i32.const 8192) ) ) - (block + (block i32 (set_local $17 (get_local $7) ) @@ -3238,7 +3243,7 @@ ) ) (set_local $9 - (block $label$break$L46 + (block $label$break$L46 i32 (if (i32.eq (i32.load8_s @@ -3246,7 +3251,7 @@ ) (i32.const 46) ) - (block + (block i32 (if (i32.ne (i32.shr_s @@ -3413,7 +3418,7 @@ ) (if (get_local $33) - (block + (block i32 (set_local $7 (i32.load (tee_local $5 @@ -3438,7 +3443,7 @@ ) (get_local $9) ) - (block + (block i32 (set_local $7 (i32.const 0) ) @@ -3446,7 +3451,7 @@ ) ) ) - (block + (block i32 (set_local $7 (i32.const -1) ) @@ -4259,7 +4264,7 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $30 (i32.const 1) ) @@ -4275,13 +4280,13 @@ (get_local $10) (i32.const 2048) ) - (block + (block i32 (set_local $30 (i32.const 1) ) (i32.const 4111) ) - (block + (block i32 (set_local $30 (tee_local $1 (i32.and @@ -4307,7 +4312,7 @@ (get_local $5) ) (set_local $5 - (block $do-once$56 + (block $do-once$56 i32 (if (i32.or (i32.lt_u @@ -4329,7 +4334,7 @@ (i32.const 0) ) ) - (block + (block i32 (if (tee_local $5 (f64.ne @@ -4404,7 +4409,7 @@ ) ) (get_local $22) - (block + (block f64 (set_local $14 (f64.const 8) ) @@ -4492,7 +4497,7 @@ ) (get_local $37) ) - (block + (block i32 (i32.store8 (get_local $48) (i32.const 48) @@ -4585,7 +4590,7 @@ ) ) (set_local $5 - (block $do-once$64 + (block $do-once$64 i32 (if (i32.eq (i32.sub @@ -4599,16 +4604,18 @@ ) (i32.const 1) ) - (block - (br_if $do-once$64 - (get_local $6) - (i32.and - (get_local $16) + (block i32 + (drop + (br_if $do-once$64 + (get_local $6) (i32.and - (get_local $12) - (f64.eq - (get_local $14) - (f64.const 0) + (get_local $16) + (i32.and + (get_local $12) + (f64.eq + (get_local $14) + (f64.const 0) + ) ) ) ) @@ -4800,7 +4807,7 @@ (i32.lt_s (if (get_local $5) - (block + (block i32 (i32.store (get_local $20) (tee_local $5 @@ -4820,7 +4827,7 @@ ) (get_local $5) ) - (block + (block i32 (set_local $14 (get_local $22) ) @@ -4894,7 +4901,7 @@ ) ) (set_local $9 - (block $do-once$70 + (block $do-once$70 i32 (if (i32.lt_u (tee_local $7 @@ -4906,7 +4913,7 @@ (get_local $9) ) (get_local $9) - (block + (block i32 (set_local $5 (i32.const 0) ) @@ -4958,10 +4965,12 @@ ) ) ) - (br_if $do-once$70 - (get_local $9) - (i32.eqz - (get_local $5) + (drop + (br_if $do-once$70 + (get_local $9) + (i32.eqz + (get_local $5) + ) ) ) (i32.store @@ -5092,13 +5101,13 @@ (select (get_local $8) (tee_local $5 - (block $do-once$78 + (block $do-once$78 i32 (if (i32.lt_u (get_local $5) (get_local $6) ) - (block + (block i32 (set_local $44 (i32.add (i32.shl @@ -5168,10 +5177,12 @@ ) ) ) - (br_if $do-once$78 - (get_local $5) - (i32.eqz - (get_local $9) + (drop + (br_if $do-once$78 + (get_local $5) + (i32.eqz + (get_local $9) + ) ) ) (i32.store @@ -5355,7 +5366,7 @@ (i32.const -9) ) ) - (block + (block i32 (set_local $7 (i32.add (i32.add @@ -5502,17 +5513,19 @@ ) ) (set_local $22 - (block $do-once$90 + (block $do-once$90 f64 (if (get_local $30) - (block - (br_if $do-once$90 - (get_local $22) - (i32.ne - (i32.load8_s - (get_local $36) + (block f64 + (drop + (br_if $do-once$90 + (get_local $22) + (i32.ne + (i32.load8_s + (get_local $36) + ) + (i32.const 45) ) - (i32.const 45) ) ) (set_local $14 @@ -5576,7 +5589,7 @@ ) (get_local $5) ) - (block + (block i32 (i32.store (tee_local $5 (i32.add @@ -5677,7 +5690,7 @@ ) (get_local $5) ) - (block + (block i32 (set_local $11 (get_local $6) ) @@ -5738,10 +5751,10 @@ ) ) (set_local $19 - (block $do-once$98 + (block $do-once$98 i32 (if (get_local $21) - (block + (block i32 (set_local $16 (if (i32.and @@ -5765,7 +5778,7 @@ (i32.const -5) ) ) - (block + (block i32 (set_local $6 (i32.add (get_local $16) @@ -5780,7 +5793,7 @@ (get_local $11) ) ) - (block + (block i32 (set_local $6 (i32.add (get_local $16) @@ -5908,7 +5921,7 @@ ) (i32.const 102) ) - (block + (block i32 (set_local $5 (select (get_local $16) @@ -5935,7 +5948,7 @@ ) (i32.const 0) ) - (block + (block i32 (set_local $5 (select (get_local $16) @@ -5967,7 +5980,7 @@ ) ) ) - (block + (block i32 (set_local $5 (get_local $19) ) @@ -6007,7 +6020,7 @@ (i32.const 102) ) ) - (block + (block i32 (set_local $6 (select (get_local $11) @@ -6020,7 +6033,7 @@ ) (i32.const 0) ) - (block + (block i32 (if (i32.lt_s (i32.sub @@ -6454,7 +6467,7 @@ ) (get_local $34) ) - (block + (block i32 (i32.store8 (get_local $38) (i32.const 48) @@ -6666,7 +6679,7 @@ ) ) ) - (block + (block i32 (set_local $7 (select (i32.const 0) @@ -6730,7 +6743,7 @@ (i32.const 32) ) (get_local $5) - (block + (block i32 (drop (call $___fwritex (get_local $36) @@ -7244,7 +7257,7 @@ ) ) ) - (block + (block i32 (set_local $11 (select (get_local $7) @@ -7274,7 +7287,7 @@ ) (get_local $6) ) - (block + (block i32 (set_local $11 (i32.const 0) ) @@ -7931,7 +7944,7 @@ ) ) ) - (block + (block i32 (loop $while-in$1 (set_local $3 (call $___uremdi3 @@ -8077,7 +8090,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $5 (get_local $6) @@ -8153,7 +8166,7 @@ (tee_local $1 (if (get_local $3) - (block + (block i32 (drop (call $___fwritex (get_local $5) @@ -8352,7 +8365,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8376,7 +8389,7 @@ (get_local $4) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8599,7 +8612,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -8628,7 +8641,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -8721,7 +8734,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $12 (get_local $3) @@ -8970,7 +8983,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -8982,7 +8995,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $11 (i32.load offset=24 @@ -9083,7 +9096,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -9105,7 +9118,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -9119,7 +9132,7 @@ ) (get_local $2) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9146,7 +9159,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -9211,7 +9224,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -9250,7 +9263,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $5) @@ -9267,7 +9280,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $5) @@ -9293,7 +9306,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $5) @@ -9426,7 +9439,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $13 (get_local $3) @@ -9817,7 +9830,7 @@ (get_local $2) ) ) - (block + (block i32 (if (i32.eqz (tee_local $5 @@ -10057,7 +10070,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ge_u @@ -10069,7 +10082,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (set_local $5 (i32.load offset=24 @@ -10170,7 +10183,7 @@ (get_local $0) (get_local $8) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10192,7 +10205,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -10206,7 +10219,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10233,7 +10246,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -10298,7 +10311,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -10337,7 +10350,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $10) @@ -10354,7 +10367,7 @@ (get_local $0) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $10) @@ -10380,7 +10393,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $10) @@ -10509,7 +10522,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $20 (get_local $2) @@ -10815,7 +10828,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -10884,7 +10897,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -11082,7 +11095,7 @@ (i32.and (i32.add (tee_local $1 - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -11090,7 +11103,7 @@ ) (get_local $1) ) - (call_import $_abort) + (call $_abort) (block (i32.store (i32.const 656) @@ -11120,7 +11133,7 @@ (i32.const 648) (i32.xor (i32.and - (call_import $_time + (call $_time (i32.const 0) ) (i32.const -16) @@ -11290,7 +11303,7 @@ (if (i32.eq (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11317,7 +11330,7 @@ (if (i32.ne (tee_local $2 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -11403,7 +11416,7 @@ (br_if $jumpthreading$inner$12 (i32.eq (tee_local $3 - (call_import $_sbrk + (call $_sbrk (get_local $1) ) ) @@ -11470,14 +11483,14 @@ ) (if (i32.eq - (call_import $_sbrk + (call $_sbrk (get_local $4) ) (i32.const -1) ) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $3) ) ) @@ -11519,12 +11532,12 @@ (i32.and (i32.lt_u (tee_local $2 - (call_import $_sbrk + (call $_sbrk (get_local $9) ) ) (tee_local $1 - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -11735,7 +11748,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.const 192) (get_local $2) @@ -11967,7 +11980,7 @@ ) (i32.const 1) ) - (block + (block i32 (set_local $5 (i32.and (get_local $1) @@ -12019,7 +12032,7 @@ (get_local $4) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (br_if $do-once$55 (i32.eq @@ -12029,7 +12042,7 @@ (get_local $8) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12075,7 +12088,7 @@ (get_local $3) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12096,7 +12109,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12210,7 +12223,7 @@ (get_local $0) (get_local $10) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12232,7 +12245,7 @@ ) (get_local $10) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -12246,7 +12259,7 @@ ) (get_local $8) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12273,7 +12286,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -12336,7 +12349,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -12376,7 +12389,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $11) @@ -12398,7 +12411,7 @@ (get_local $1) (get_local $3) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $11) @@ -12427,7 +12440,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $11) @@ -12545,7 +12558,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) (block (i32.store @@ -12591,7 +12604,7 @@ (i32.const 480) (i32.shl (tee_local $3 - (block $do-once$69 + (block $do-once$69 i32 (if (tee_local $0 (i32.shr_u @@ -12599,12 +12612,14 @@ (i32.const 8) ) ) - (block - (br_if $do-once$69 - (i32.const 31) - (i32.gt_u - (get_local $2) - (i32.const 16777215) + (block i32 + (drop + (br_if $do-once$69 + (i32.const 31) + (i32.gt_u + (get_local $2) + (i32.const 16777215) + ) ) ) (i32.or @@ -12848,7 +12863,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $0) @@ -12917,7 +12932,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13235,7 +13250,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $23 (get_local $3) @@ -13536,7 +13551,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -13605,7 +13620,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -13849,7 +13864,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -13868,7 +13883,7 @@ ) (i32.const 1) ) - (call_import $_abort) + (call $_abort) ) (set_local $6 (i32.add @@ -13926,7 +13941,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14034,7 +14049,7 @@ (get_local $4) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14043,7 +14058,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14094,7 +14109,7 @@ (get_local $2) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14111,7 +14126,7 @@ (set_local $5 (get_local $1) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14232,7 +14247,7 @@ (get_local $5) (get_local $11) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $5) @@ -14254,7 +14269,7 @@ ) (get_local $11) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14268,7 +14283,7 @@ ) (get_local $0) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14295,7 +14310,7 @@ (get_local $2) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14365,7 +14380,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14413,7 +14428,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $7) @@ -14435,7 +14450,7 @@ (get_local $5) (get_local $2) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $7) @@ -14461,7 +14476,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $7) @@ -14506,7 +14521,7 @@ (get_local $4) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eqz @@ -14524,7 +14539,7 @@ (i32.const 1) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.and @@ -14700,7 +14715,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14709,7 +14724,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14756,7 +14771,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14773,7 +14788,7 @@ (set_local $14 (get_local $0) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -14889,7 +14904,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $1) @@ -14913,7 +14928,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.ne @@ -14927,7 +14942,7 @@ ) (get_local $6) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -14954,7 +14969,7 @@ (get_local $0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15018,7 +15033,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) ) (if (i32.eq @@ -15057,7 +15072,7 @@ ) ) ) - (call_import $_abort) + (call $_abort) ) (i32.store offset=24 (get_local $9) @@ -15079,7 +15094,7 @@ (get_local $1) (get_local $0) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=16 (get_local $9) @@ -15105,7 +15120,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store offset=20 (get_local $9) @@ -15211,7 +15226,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (set_local $15 (get_local $0) @@ -15478,7 +15493,7 @@ (i32.const 192) ) ) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $2) @@ -15547,7 +15562,7 @@ (i32.const 0) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -15909,7 +15924,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $0) (get_local $1) (get_local $2) @@ -16674,19 +16689,19 @@ ) ) (func $b0 (param $0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (i32.const 0) ) (func $b1 (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (i32.const 0) ) (func $b2 (param $0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts index d7bbe58e8..fa62da5fd 100644 --- a/test/emcc_hello_world.fromasm.imprecise.no-opts +++ b/test/emcc_hello_world.fromasm.imprecise.no-opts @@ -1,5 +1,4 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) @@ -7,13 +6,13 @@ (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "env" "cttz_i8" (global $cttz_i8 i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "env" "cttz_i8" (global $cttz_i8$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort)) (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32))) (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32))) @@ -32,8 +31,8 @@ (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32))) (import "env" "_sysconf" (func $_sysconf (param i32) (result i32))) (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_i64Subtract" (func $_i64Subtract)) @@ -59,31 +58,37 @@ (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) (export "___udivmoddi4" (func $___udivmoddi4)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $cttz_i8 (mut i32) (get_global $cttz_i8$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $size i32) (result i32) (local $ret i32) @@ -110,7 +115,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (return (get_local $ret) @@ -315,7 +320,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -788,7 +793,7 @@ ) (block (set_local $$call$i - (call_import $_pthread_self) + (call $_pthread_self) ) (set_local $$errno_ptr (i32.add @@ -832,7 +837,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -853,7 +858,7 @@ (get_local $$0) ) (set_local $$call - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $$vararg_buffer) ) @@ -901,7 +906,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -978,7 +983,7 @@ (get_local $$tio) ) (set_local $$call - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $$vararg_buffer) ) @@ -1052,7 +1057,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -1119,7 +1124,7 @@ (get_local $$whence) ) (set_local $$call - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $$vararg_buffer) ) @@ -1248,7 +1253,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (set_local $$f$addr$0$19 @@ -1412,7 +1417,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (set_local $$retval$0 @@ -1510,7 +1515,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap (get_local $sp) @@ -1642,7 +1647,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer3 (i32.add @@ -1794,7 +1799,7 @@ (get_local $$iovcnt$0) ) (set_local $$call9 - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer3) ) @@ -1809,7 +1814,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 5) (get_local $$f) ) @@ -1843,7 +1848,7 @@ (get_local $$iovcnt$0) ) (set_local $$call - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer) ) @@ -1853,7 +1858,7 @@ (get_local $$call) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $$cnt$0 @@ -2274,7 +2279,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap2 (i32.add @@ -5708,7 +5713,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$big$i (i32.add @@ -16105,7 +16110,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$pad (get_local $sp) @@ -17673,7 +17678,7 @@ ) (if (get_local $$cmp15) - (call_import $_abort) + (call $_abort) ) (set_local $$bk (i32.add @@ -17705,7 +17710,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18047,7 +18052,7 @@ ) (if (get_local $$cmp76) - (call_import $_abort) + (call $_abort) ) (set_local $$bk78 (i32.add @@ -18087,7 +18092,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18263,7 +18268,7 @@ ) (if (get_local $$cmp113) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$16) @@ -18655,7 +18660,7 @@ ) (if (get_local $$cmp33$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i (i32.add @@ -18673,7 +18678,7 @@ (i32.eqz (get_local $$cmp35$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i (i32.add @@ -18852,7 +18857,7 @@ ) (if (get_local $$cmp81$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$lcssa) @@ -18885,7 +18890,7 @@ ) (if (get_local $$cmp45$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk47$i (i32.add @@ -18908,7 +18913,7 @@ (i32.eqz (get_local $$cmp48$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd50$i (i32.add @@ -18943,7 +18948,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -19052,7 +19057,7 @@ ) (if (get_local $$cmp107$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx113$i (i32.add @@ -19115,7 +19120,7 @@ ) (if (get_local $$cmp130$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent135$i (i32.add @@ -19158,7 +19163,7 @@ ) (if (get_local $$cmp142$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx148$i (i32.add @@ -19221,7 +19226,7 @@ ) (if (get_local $$cmp159$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx165$i (i32.add @@ -19469,7 +19474,7 @@ ) (if (get_local $$cmp208$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$iZ2D (get_local $$48) @@ -20489,7 +20494,7 @@ ) (if (get_local $$cmp121$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i$161 (i32.add @@ -20507,7 +20512,7 @@ (i32.eqz (get_local $$cmp123$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i$162 (i32.add @@ -20686,7 +20691,7 @@ ) (if (get_local $$cmp171$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$167$lcssa) @@ -20719,7 +20724,7 @@ ) (if (get_local $$cmp133$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk136$i (i32.add @@ -20742,7 +20747,7 @@ (i32.eqz (get_local $$cmp137$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd139$i (i32.add @@ -20777,7 +20782,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -20886,7 +20891,7 @@ ) (if (get_local $$cmp198$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx204$i (i32.add @@ -20949,7 +20954,7 @@ ) (if (get_local $$cmp221$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent226$i (i32.add @@ -20992,7 +20997,7 @@ ) (if (get_local $$cmp233$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx239$i (i32.add @@ -21055,7 +21060,7 @@ ) (if (get_local $$cmp250$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx256$i (i32.add @@ -21292,7 +21297,7 @@ ) (if (get_local $$cmp301$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$178Z2D (get_local $$83) @@ -21781,7 +21786,7 @@ ) (if (get_local $$cmp401$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx394$i$lcssa) @@ -21910,7 +21915,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22206,7 +22211,7 @@ (get_local $$cmp$i$179) (block (set_local $$call$i$i - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -22256,7 +22261,7 @@ (i32.const 0) ) (set_local $$call6$i$i - (call_import $_time + (call $_time (i32.const 0) ) ) @@ -22278,7 +22283,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22551,7 +22556,7 @@ (get_local $$cmp81$i$191) (block (set_local $$call83$i - (call_import $_sbrk + (call $_sbrk (get_local $$and80$i) ) ) @@ -22629,7 +22634,7 @@ ) (block (set_local $$call37$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -22784,7 +22789,7 @@ ) ) (set_local $$call68$i - (call_import $_sbrk + (call $_sbrk (get_local $$ssize$0$i) ) ) @@ -22913,7 +22918,7 @@ (get_local $$cmp105$i) (block (set_local $$call107$i - (call_import $_sbrk + (call $_sbrk (get_local $$and104$i) ) ) @@ -22927,7 +22932,7 @@ (get_local $$cmp108$i) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $$sub112$i) ) ) @@ -23023,12 +23028,12 @@ (get_local $$cmp127$i) (block (set_local $$call131$i - (call_import $_sbrk + (call $_sbrk (get_local $$and11$i) ) ) (set_local $$call132$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -24150,7 +24155,7 @@ ) (if (get_local $$cmp42$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk43$i$i (i32.add @@ -24173,7 +24178,7 @@ (get_local $$cmp44$i$i) (br $do-once$55) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24245,7 +24250,7 @@ ) (if (get_local $$cmp57$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$fd59$i$i (i32.add @@ -24273,7 +24278,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24470,7 +24475,7 @@ ) (if (get_local $$cmp112$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$i$lcssa) @@ -24503,7 +24508,7 @@ ) (if (get_local $$cmp81$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82$i$i (i32.add @@ -24526,7 +24531,7 @@ (i32.eqz (get_local $$cmp83$i$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd85$i$i (i32.add @@ -24561,7 +24566,7 @@ ) (br $do-once$59) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24670,7 +24675,7 @@ ) (if (get_local $$cmp137$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx143$i$i (i32.add @@ -24734,7 +24739,7 @@ ) (if (get_local $$cmp160$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent165$i$i (i32.add @@ -24777,7 +24782,7 @@ ) (if (get_local $$cmp172$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx178$i$i (i32.add @@ -24839,7 +24844,7 @@ ) (if (get_local $$cmp189$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx195$i$i (i32.add @@ -25059,7 +25064,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -25543,7 +25548,7 @@ ) (if (get_local $$cmp332$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx325$i$i$lcssa) @@ -25672,7 +25677,7 @@ ) (br $do-once$52) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -26225,7 +26230,7 @@ ) (if (get_local $$cmp46$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$iZ2D (get_local $$196) @@ -26708,7 +26713,7 @@ ) (if (get_local $$cmp133$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx126$i$i$lcssa) @@ -26837,7 +26842,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27334,7 +27339,7 @@ ) (if (get_local $$cmp1) - (call_import $_abort) + (call $_abort) ) (set_local $$head (i32.add @@ -27361,7 +27366,7 @@ ) (if (get_local $$cmp2) - (call_import $_abort) + (call $_abort) ) (set_local $$and5 (i32.and @@ -27432,7 +27437,7 @@ ) (if (get_local $$cmp18) - (call_import $_abort) + (call $_abort) ) (set_local $$3 (i32.load @@ -27599,7 +27604,7 @@ ) (if (get_local $$cmp31) - (call_import $_abort) + (call $_abort) ) (set_local $$bk34 (i32.add @@ -27622,7 +27627,7 @@ (i32.eqz (get_local $$cmp35) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27699,7 +27704,7 @@ ) (if (get_local $$cmp53) - (call_import $_abort) + (call $_abort) ) (set_local $$fd56 (i32.add @@ -27723,7 +27728,7 @@ (set_local $$fd67$pre$phiZ2D (get_local $$fd56) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27927,7 +27932,7 @@ ) (if (get_local $$cmp118) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$lcssa) @@ -27960,7 +27965,7 @@ ) (if (get_local $$cmp80) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82 (i32.add @@ -27983,7 +27988,7 @@ (i32.eqz (get_local $$cmp83) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd86 (i32.add @@ -28018,7 +28023,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28138,7 +28143,7 @@ ) (if (get_local $$cmp143) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx149 (i32.add @@ -28209,7 +28214,7 @@ ) (if (get_local $$cmp165) - (call_import $_abort) + (call $_abort) ) (set_local $$parent170 (i32.add @@ -28252,7 +28257,7 @@ ) (if (get_local $$cmp176) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx182 (i32.add @@ -28321,7 +28326,7 @@ ) (if (get_local $$cmp192) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx198 (i32.add @@ -28377,7 +28382,7 @@ (i32.eqz (get_local $$cmp228) ) - (call_import $_abort) + (call $_abort) ) (set_local $$head231 (i32.add @@ -28404,7 +28409,7 @@ ) (if (get_local $$tobool233) - (call_import $_abort) + (call $_abort) ) (set_local $$and240 (i32.and @@ -28649,7 +28654,7 @@ ) (if (get_local $$cmp283) - (call_import $_abort) + (call $_abort) ) (set_local $$bk286 (i32.add @@ -28672,7 +28677,7 @@ (i32.eqz (get_local $$cmp287) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28748,7 +28753,7 @@ ) (if (get_local $$cmp308) - (call_import $_abort) + (call $_abort) ) (set_local $$fd311 (i32.add @@ -28772,7 +28777,7 @@ (set_local $$fd322$pre$phiZ2D (get_local $$fd311) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28974,7 +28979,7 @@ ) (if (get_local $$cmp386) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP360$1$lcssa) @@ -29012,7 +29017,7 @@ ) (if (get_local $$cmp340) - (call_import $_abort) + (call $_abort) ) (set_local $$bk343 (i32.add @@ -29035,7 +29040,7 @@ (i32.eqz (get_local $$cmp344) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd347 (i32.add @@ -29070,7 +29075,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -29178,7 +29183,7 @@ ) (if (get_local $$cmp413) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx419 (i32.add @@ -29241,7 +29246,7 @@ ) (if (get_local $$cmp435) - (call_import $_abort) + (call $_abort) ) (set_local $$parent442 (i32.add @@ -29284,7 +29289,7 @@ ) (if (get_local $$cmp448) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx454 (i32.add @@ -29347,7 +29352,7 @@ ) (if (get_local $$cmp464) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx470 (i32.add @@ -29576,7 +29581,7 @@ ) (if (get_local $$cmp519) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$63) @@ -30065,7 +30070,7 @@ ) (if (get_local $$cmp605) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx599$lcssa) @@ -30194,7 +30199,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -30296,7 +30301,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (get_local $h) @@ -30331,7 +30336,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (get_local $h) @@ -30630,7 +30635,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $dest) (get_local $src) (get_local $num) @@ -30907,7 +30912,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (i32.add @@ -31310,7 +31315,7 @@ (get_local $__stackBase__) ) (return - (block + (block i32 (block (set_global $tempRet0 (get_local $$10$1) @@ -31351,7 +31356,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (i32.or @@ -31428,7 +31433,7 @@ (get_local $__stackBase__) ) (return - (block + (block i32 (block (set_global $tempRet0 (i32.load @@ -31548,7 +31553,7 @@ ) ) (func $b0 (param $p0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (return @@ -31556,7 +31561,7 @@ ) ) (func $b1 (param $p0 i32) (param $p1 i32) (param $p2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (return @@ -31564,7 +31569,7 @@ ) ) (func $b2 (param $p0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts index 0231444cc..6942c296b 100644 --- a/test/emcc_hello_world.fromasm.no-opts +++ b/test/emcc_hello_world.fromasm.no-opts @@ -1,5 +1,4 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$id (func (param f64) (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) @@ -8,13 +7,13 @@ (type $FUNCSIG$v (func)) (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $STACKTOP i32)) - (import "env" "STACK_MAX" (global $STACK_MAX i32)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "ABORT" (global $ABORT i32)) - (import "env" "cttz_i8" (global $cttz_i8 i32)) - (import "global" "NaN" (global $nan f64)) - (import "global" "Infinity" (global $inf f64)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $STACK_MAX$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "ABORT" (global $ABORT$asm2wasm$import i32)) + (import "env" "cttz_i8" (global $cttz_i8$asm2wasm$import i32)) + (import "global" "NaN" (global $nan$asm2wasm$import f64)) + (import "global" "Infinity" (global $inf$asm2wasm$import f64)) (import "env" "abort" (func $abort)) (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32))) (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32))) @@ -38,8 +37,8 @@ (import "asm2wasm" "i32s-rem" (func $i32s-rem (param i32 i32) (result i32))) (import "asm2wasm" "i32u-rem" (func $i32u-rem (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 18 18 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_i64Subtract" (func $_i64Subtract)) @@ -65,31 +64,37 @@ (export "dynCall_iiii" (func $dynCall_iiii)) (export "dynCall_vi" (func $dynCall_vi)) (export "___udivmoddi4" (func $___udivmoddi4)) - (global $__THREW__ i32 (i32.const 0)) - (global $threwValue i32 (i32.const 0)) - (global $setjmpId i32 (i32.const 0)) - (global $undef i32 (i32.const 0)) - (global $tempInt i32 (i32.const 0)) - (global $tempBigInt i32 (i32.const 0)) - (global $tempBigIntP i32 (i32.const 0)) - (global $tempBigIntS i32 (i32.const 0)) - (global $tempBigIntR f64 (f64.const 0)) - (global $tempBigIntI i32 (i32.const 0)) - (global $tempBigIntD i32 (i32.const 0)) - (global $tempValue i32 (i32.const 0)) - (global $tempDouble f64 (f64.const 0)) - (global $tempRet0 i32 (i32.const 0)) - (global $tempRet1 i32 (i32.const 0)) - (global $tempRet2 i32 (i32.const 0)) - (global $tempRet3 i32 (i32.const 0)) - (global $tempRet4 i32 (i32.const 0)) - (global $tempRet5 i32 (i32.const 0)) - (global $tempRet6 i32 (i32.const 0)) - (global $tempRet7 i32 (i32.const 0)) - (global $tempRet8 i32 (i32.const 0)) - (global $tempRet9 i32 (i32.const 0)) - (global $tempFloat f64 (f64.const 0)) - (table 18 18 anyfunc) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) + (global $STACK_MAX (mut i32) (get_global $STACK_MAX$asm2wasm$import)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $ABORT (mut i32) (get_global $ABORT$asm2wasm$import)) + (global $cttz_i8 (mut i32) (get_global $cttz_i8$asm2wasm$import)) + (global $__THREW__ (mut i32) (i32.const 0)) + (global $threwValue (mut i32) (i32.const 0)) + (global $setjmpId (mut i32) (i32.const 0)) + (global $undef (mut i32) (i32.const 0)) + (global $nan (mut f64) (get_global $nan$asm2wasm$import)) + (global $inf (mut f64) (get_global $inf$asm2wasm$import)) + (global $tempInt (mut i32) (i32.const 0)) + (global $tempBigInt (mut i32) (i32.const 0)) + (global $tempBigIntP (mut i32) (i32.const 0)) + (global $tempBigIntS (mut i32) (i32.const 0)) + (global $tempBigIntR (mut f64) (f64.const 0)) + (global $tempBigIntI (mut i32) (i32.const 0)) + (global $tempBigIntD (mut i32) (i32.const 0)) + (global $tempValue (mut i32) (i32.const 0)) + (global $tempDouble (mut f64) (f64.const 0)) + (global $tempRet0 (mut i32) (i32.const 0)) + (global $tempRet1 (mut i32) (i32.const 0)) + (global $tempRet2 (mut i32) (i32.const 0)) + (global $tempRet3 (mut i32) (i32.const 0)) + (global $tempRet4 (mut i32) (i32.const 0)) + (global $tempRet5 (mut i32) (i32.const 0)) + (global $tempRet6 (mut i32) (i32.const 0)) + (global $tempRet7 (mut i32) (i32.const 0)) + (global $tempRet8 (mut i32) (i32.const 0)) + (global $tempRet9 (mut i32) (i32.const 0)) + (global $tempFloat (mut f64) (f64.const 0)) (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2) (func $stackAlloc (param $size i32) (result i32) (local $ret i32) @@ -116,7 +121,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (return (get_local $ret) @@ -321,7 +326,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -794,7 +799,7 @@ ) (block (set_local $$call$i - (call_import $_pthread_self) + (call $_pthread_self) ) (set_local $$errno_ptr (i32.add @@ -838,7 +843,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -859,7 +864,7 @@ (get_local $$0) ) (set_local $$call - (call_import $___syscall6 + (call $___syscall6 (i32.const 6) (get_local $$vararg_buffer) ) @@ -907,7 +912,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -984,7 +989,7 @@ (get_local $$tio) ) (set_local $$call - (call_import $___syscall54 + (call $___syscall54 (i32.const 54) (get_local $$vararg_buffer) ) @@ -1058,7 +1063,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer (get_local $sp) @@ -1125,7 +1130,7 @@ (get_local $$whence) ) (set_local $$call - (call_import $___syscall140 + (call $___syscall140 (i32.const 140) (get_local $$vararg_buffer) ) @@ -1254,7 +1259,7 @@ ) ) ) - (call_import $___lock + (call $___lock (i32.const 44) ) (set_local $$f$addr$0$19 @@ -1418,7 +1423,7 @@ ) ) ) - (call_import $___unlock + (call $___unlock (i32.const 44) ) (set_local $$retval$0 @@ -1516,7 +1521,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap (get_local $sp) @@ -1648,7 +1653,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$vararg_buffer3 (i32.add @@ -1800,7 +1805,7 @@ (get_local $$iovcnt$0) ) (set_local $$call9 - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer3) ) @@ -1815,7 +1820,7 @@ ) ) (block - (call_import $_pthread_cleanup_push + (call $_pthread_cleanup_push (i32.const 5) (get_local $$f) ) @@ -1849,7 +1854,7 @@ (get_local $$iovcnt$0) ) (set_local $$call - (call_import $___syscall146 + (call $___syscall146 (i32.const 146) (get_local $$vararg_buffer) ) @@ -1859,7 +1864,7 @@ (get_local $$call) ) ) - (call_import $_pthread_cleanup_pop + (call $_pthread_cleanup_pop (i32.const 0) ) (set_local $$cnt$0 @@ -2280,7 +2285,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$ap2 (i32.add @@ -5714,7 +5719,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$big$i (i32.add @@ -9384,7 +9389,7 @@ (loop $while-in$63 (block $while-out$62 (set_local $$conv116$i - (call_import $f64-to-int + (call $f64-to-int (get_local $$y$addr$2$i) ) ) @@ -9855,7 +9860,7 @@ (loop $while-in$67 (block $while-out$66 (set_local $$conv216$i - (call_import $f64-to-int + (call $f64-to-int (get_local $$y$addr$4$i) ) ) @@ -10226,7 +10231,7 @@ ) (set_local $$div274$i (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $$add273$i) (i32.const 9) ) @@ -10780,7 +10785,7 @@ ) (set_local $$div356$i (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $$add355$i) (i32.const 9) ) @@ -10804,7 +10809,7 @@ ) (set_local $$rem360$i (i32.and - (call_import $i32s-rem + (call $i32s-rem (get_local $$add355$i) (i32.const 9) ) @@ -10884,7 +10889,7 @@ ) (set_local $$rem370$i (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$231) (get_local $$i$1$lcssa$i) ) @@ -10932,7 +10937,7 @@ (block (set_local $$div378$i (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $$231) (get_local $$i$1$lcssa$i) ) @@ -10960,7 +10965,7 @@ ) (set_local $$div384$i (i32.and - (call_import $i32s-div + (call $i32s-div (get_local $$i$1$lcssa$i) (i32.const 2) ) @@ -11589,7 +11594,7 @@ ) (set_local $$rem494$510$i (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$237) (i32.const 10) ) @@ -11635,7 +11640,7 @@ ) (set_local $$rem494$i (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$237) (get_local $$mul499$i) ) @@ -16000,7 +16005,7 @@ (block $while-out$2 (set_local $$rem4 (i32.and - (call_import $i32u-rem + (call $i32u-rem (get_local $$y$010) (i32.const 10) ) @@ -16031,7 +16036,7 @@ ) (set_local $$div9 (i32.and - (call_import $i32u-div + (call $i32u-div (get_local $$y$010) (i32.const 10) ) @@ -16111,7 +16116,7 @@ (get_global $STACKTOP) (get_global $STACK_MAX) ) - (call_import $abort) + (call $abort) ) (set_local $$pad (get_local $sp) @@ -17679,7 +17684,7 @@ ) (if (get_local $$cmp15) - (call_import $_abort) + (call $_abort) ) (set_local $$bk (i32.add @@ -17711,7 +17716,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18053,7 +18058,7 @@ ) (if (get_local $$cmp76) - (call_import $_abort) + (call $_abort) ) (set_local $$bk78 (i32.add @@ -18093,7 +18098,7 @@ ) (br $do-once$4) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -18269,7 +18274,7 @@ ) (if (get_local $$cmp113) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$16) @@ -18661,7 +18666,7 @@ ) (if (get_local $$cmp33$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i (i32.add @@ -18679,7 +18684,7 @@ (i32.eqz (get_local $$cmp35$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i (i32.add @@ -18858,7 +18863,7 @@ ) (if (get_local $$cmp81$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$lcssa) @@ -18891,7 +18896,7 @@ ) (if (get_local $$cmp45$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk47$i (i32.add @@ -18914,7 +18919,7 @@ (i32.eqz (get_local $$cmp48$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd50$i (i32.add @@ -18949,7 +18954,7 @@ ) (br $do-once$8) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -19058,7 +19063,7 @@ ) (if (get_local $$cmp107$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx113$i (i32.add @@ -19121,7 +19126,7 @@ ) (if (get_local $$cmp130$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent135$i (i32.add @@ -19164,7 +19169,7 @@ ) (if (get_local $$cmp142$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx148$i (i32.add @@ -19227,7 +19232,7 @@ ) (if (get_local $$cmp159$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx165$i (i32.add @@ -19475,7 +19480,7 @@ ) (if (get_local $$cmp208$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$iZ2D (get_local $$48) @@ -20495,7 +20500,7 @@ ) (if (get_local $$cmp121$i) - (call_import $_abort) + (call $_abort) ) (set_local $$add$ptr$i$161 (i32.add @@ -20513,7 +20518,7 @@ (i32.eqz (get_local $$cmp123$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$parent$i$162 (i32.add @@ -20692,7 +20697,7 @@ ) (if (get_local $$cmp171$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$167$lcssa) @@ -20725,7 +20730,7 @@ ) (if (get_local $$cmp133$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk136$i (i32.add @@ -20748,7 +20753,7 @@ (i32.eqz (get_local $$cmp137$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd139$i (i32.add @@ -20783,7 +20788,7 @@ ) (br $do-once$21) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -20892,7 +20897,7 @@ ) (if (get_local $$cmp198$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx204$i (i32.add @@ -20955,7 +20960,7 @@ ) (if (get_local $$cmp221$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent226$i (i32.add @@ -20998,7 +21003,7 @@ ) (if (get_local $$cmp233$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx239$i (i32.add @@ -21061,7 +21066,7 @@ ) (if (get_local $$cmp250$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx256$i (i32.add @@ -21298,7 +21303,7 @@ ) (if (get_local $$cmp301$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$178Z2D (get_local $$83) @@ -21787,7 +21792,7 @@ ) (if (get_local $$cmp401$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx394$i$lcssa) @@ -21916,7 +21921,7 @@ ) (br $do-once$29) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22212,7 +22217,7 @@ (get_local $$cmp$i$179) (block (set_local $$call$i$i - (call_import $_sysconf + (call $_sysconf (i32.const 30) ) ) @@ -22262,7 +22267,7 @@ (i32.const 0) ) (set_local $$call6$i$i - (call_import $_time + (call $_time (i32.const 0) ) ) @@ -22284,7 +22289,7 @@ ) (br $do-once$33) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -22557,7 +22562,7 @@ (get_local $$cmp81$i$191) (block (set_local $$call83$i - (call_import $_sbrk + (call $_sbrk (get_local $$and80$i) ) ) @@ -22635,7 +22640,7 @@ ) (block (set_local $$call37$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -22790,7 +22795,7 @@ ) ) (set_local $$call68$i - (call_import $_sbrk + (call $_sbrk (get_local $$ssize$0$i) ) ) @@ -22919,7 +22924,7 @@ (get_local $$cmp105$i) (block (set_local $$call107$i - (call_import $_sbrk + (call $_sbrk (get_local $$and104$i) ) ) @@ -22933,7 +22938,7 @@ (get_local $$cmp108$i) (block (drop - (call_import $_sbrk + (call $_sbrk (get_local $$sub112$i) ) ) @@ -23029,12 +23034,12 @@ (get_local $$cmp127$i) (block (set_local $$call131$i - (call_import $_sbrk + (call $_sbrk (get_local $$and11$i) ) ) (set_local $$call132$i - (call_import $_sbrk + (call $_sbrk (i32.const 0) ) ) @@ -24156,7 +24161,7 @@ ) (if (get_local $$cmp42$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk43$i$i (i32.add @@ -24179,7 +24184,7 @@ (get_local $$cmp44$i$i) (br $do-once$55) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24251,7 +24256,7 @@ ) (if (get_local $$cmp57$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$fd59$i$i (i32.add @@ -24279,7 +24284,7 @@ (br $do-once$57) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24476,7 +24481,7 @@ ) (if (get_local $$cmp112$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$i$i$lcssa) @@ -24509,7 +24514,7 @@ ) (if (get_local $$cmp81$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82$i$i (i32.add @@ -24532,7 +24537,7 @@ (i32.eqz (get_local $$cmp83$i$i) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd85$i$i (i32.add @@ -24567,7 +24572,7 @@ ) (br $do-once$59) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -24676,7 +24681,7 @@ ) (if (get_local $$cmp137$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx143$i$i (i32.add @@ -24740,7 +24745,7 @@ ) (if (get_local $$cmp160$i$i) - (call_import $_abort) + (call $_abort) ) (set_local $$parent165$i$i (i32.add @@ -24783,7 +24788,7 @@ ) (if (get_local $$cmp172$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx178$i$i (i32.add @@ -24845,7 +24850,7 @@ ) (if (get_local $$cmp189$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx195$i$i (i32.add @@ -25065,7 +25070,7 @@ (br $do-once$67) ) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -25549,7 +25554,7 @@ ) (if (get_local $$cmp332$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx325$i$i$lcssa) @@ -25678,7 +25683,7 @@ ) (br $do-once$52) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -26231,7 +26236,7 @@ ) (if (get_local $$cmp46$i$i) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phi$i$iZ2D (get_local $$196) @@ -26714,7 +26719,7 @@ ) (if (get_local $$cmp133$i$i) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx126$i$i$lcssa) @@ -26843,7 +26848,7 @@ ) (br $do-once$44) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27340,7 +27345,7 @@ ) (if (get_local $$cmp1) - (call_import $_abort) + (call $_abort) ) (set_local $$head (i32.add @@ -27367,7 +27372,7 @@ ) (if (get_local $$cmp2) - (call_import $_abort) + (call $_abort) ) (set_local $$and5 (i32.and @@ -27438,7 +27443,7 @@ ) (if (get_local $$cmp18) - (call_import $_abort) + (call $_abort) ) (set_local $$3 (i32.load @@ -27605,7 +27610,7 @@ ) (if (get_local $$cmp31) - (call_import $_abort) + (call $_abort) ) (set_local $$bk34 (i32.add @@ -27628,7 +27633,7 @@ (i32.eqz (get_local $$cmp35) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27705,7 +27710,7 @@ ) (if (get_local $$cmp53) - (call_import $_abort) + (call $_abort) ) (set_local $$fd56 (i32.add @@ -27729,7 +27734,7 @@ (set_local $$fd67$pre$phiZ2D (get_local $$fd56) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -27933,7 +27938,7 @@ ) (if (get_local $$cmp118) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP$1$lcssa) @@ -27966,7 +27971,7 @@ ) (if (get_local $$cmp80) - (call_import $_abort) + (call $_abort) ) (set_local $$bk82 (i32.add @@ -27989,7 +27994,7 @@ (i32.eqz (get_local $$cmp83) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd86 (i32.add @@ -28024,7 +28029,7 @@ ) (br $do-once$2) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28144,7 +28149,7 @@ ) (if (get_local $$cmp143) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx149 (i32.add @@ -28215,7 +28220,7 @@ ) (if (get_local $$cmp165) - (call_import $_abort) + (call $_abort) ) (set_local $$parent170 (i32.add @@ -28258,7 +28263,7 @@ ) (if (get_local $$cmp176) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx182 (i32.add @@ -28327,7 +28332,7 @@ ) (if (get_local $$cmp192) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx198 (i32.add @@ -28383,7 +28388,7 @@ (i32.eqz (get_local $$cmp228) ) - (call_import $_abort) + (call $_abort) ) (set_local $$head231 (i32.add @@ -28410,7 +28415,7 @@ ) (if (get_local $$tobool233) - (call_import $_abort) + (call $_abort) ) (set_local $$and240 (i32.and @@ -28655,7 +28660,7 @@ ) (if (get_local $$cmp283) - (call_import $_abort) + (call $_abort) ) (set_local $$bk286 (i32.add @@ -28678,7 +28683,7 @@ (i32.eqz (get_local $$cmp287) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28754,7 +28759,7 @@ ) (if (get_local $$cmp308) - (call_import $_abort) + (call $_abort) ) (set_local $$fd311 (i32.add @@ -28778,7 +28783,7 @@ (set_local $$fd322$pre$phiZ2D (get_local $$fd311) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -28980,7 +28985,7 @@ ) (if (get_local $$cmp386) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$RP360$1$lcssa) @@ -29018,7 +29023,7 @@ ) (if (get_local $$cmp340) - (call_import $_abort) + (call $_abort) ) (set_local $$bk343 (i32.add @@ -29041,7 +29046,7 @@ (i32.eqz (get_local $$cmp344) ) - (call_import $_abort) + (call $_abort) ) (set_local $$fd347 (i32.add @@ -29076,7 +29081,7 @@ ) (br $do-once$10) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -29184,7 +29189,7 @@ ) (if (get_local $$cmp413) - (call_import $_abort) + (call $_abort) ) (set_local $$arrayidx419 (i32.add @@ -29247,7 +29252,7 @@ ) (if (get_local $$cmp435) - (call_import $_abort) + (call $_abort) ) (set_local $$parent442 (i32.add @@ -29290,7 +29295,7 @@ ) (if (get_local $$cmp448) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx454 (i32.add @@ -29353,7 +29358,7 @@ ) (if (get_local $$cmp464) - (call_import $_abort) + (call $_abort) (block (set_local $$arrayidx470 (i32.add @@ -29582,7 +29587,7 @@ ) (if (get_local $$cmp519) - (call_import $_abort) + (call $_abort) (block (set_local $$$pre$phiZ2D (get_local $$63) @@ -30071,7 +30076,7 @@ ) (if (get_local $$cmp605) - (call_import $_abort) + (call $_abort) (block (i32.store (get_local $$arrayidx599$lcssa) @@ -30200,7 +30205,7 @@ ) (br $do-once$16) ) - (call_import $_abort) + (call $_abort) ) ) ) @@ -30302,7 +30307,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (get_local $h) @@ -30337,7 +30342,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (get_local $h) @@ -30636,7 +30641,7 @@ (i32.const 4096) ) (return - (call_import $_emscripten_memcpy_big + (call $_emscripten_memcpy_big (get_local $dest) (get_local $src) (get_local $num) @@ -30913,7 +30918,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (i32.add @@ -31316,7 +31321,7 @@ (get_local $__stackBase__) ) (return - (block + (block i32 (block (set_global $tempRet0 (get_local $$10$1) @@ -31357,7 +31362,7 @@ ) ) (return - (block + (block i32 (block (set_global $tempRet0 (i32.or @@ -31434,7 +31439,7 @@ (get_local $__stackBase__) ) (return - (block + (block i32 (block (set_global $tempRet0 (i32.load @@ -31554,7 +31559,7 @@ ) ) (func $b0 (param $p0 i32) (result i32) - (call_import $nullFunc_ii + (call $nullFunc_ii (i32.const 0) ) (return @@ -31562,7 +31567,7 @@ ) ) (func $b1 (param $p0 i32) (param $p1 i32) (param $p2 i32) (result i32) - (call_import $nullFunc_iiii + (call $nullFunc_iiii (i32.const 1) ) (return @@ -31570,7 +31575,7 @@ ) ) (func $b2 (param $p0 i32) - (call_import $nullFunc_vi + (call $nullFunc_vi (i32.const 2) ) ) diff --git a/test/empty.fromasm b/test/empty.fromasm index 67c1135d4..83d404801 100644 --- a/test/empty.fromasm +++ b/test/empty.fromasm @@ -1,8 +1,7 @@ (module - (memory 256 256) (data (get_global $memoryBase) "empty.asm.js") - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) ) diff --git a/test/empty.fromasm.imprecise b/test/empty.fromasm.imprecise index 5fbd4b5f8..7e9ff6f81 100644 --- a/test/empty.fromasm.imprecise +++ b/test/empty.fromasm.imprecise @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) ) diff --git a/test/empty.fromasm.imprecise.no-opts b/test/empty.fromasm.imprecise.no-opts index 5fbd4b5f8..7e9ff6f81 100644 --- a/test/empty.fromasm.imprecise.no-opts +++ b/test/empty.fromasm.imprecise.no-opts @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) ) diff --git a/test/empty.fromasm.no-opts b/test/empty.fromasm.no-opts index 5fbd4b5f8..7e9ff6f81 100644 --- a/test/empty.fromasm.no-opts +++ b/test/empty.fromasm.no-opts @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) ) diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index 9f1021b30..28d7b759b 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -21,10 +21,10 @@ BinaryenFloat64: 4 (elem (i32.const 0) "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) - (block $the-body + (block $the-body i32 (block $the-nothing (drop - (block $the-value + (block $the-value i32 (drop (i32.clz (i32.const -10) @@ -422,9 +422,11 @@ BinaryenFloat64: 4 (i32.const 0) ) ) - (br_if $the-value - (i32.const 1) - (i32.const 0) + (drop + (br_if $the-value + (i32.const 1) + (i32.const 0) + ) ) (br_if $the-nothing (i32.const 2) @@ -453,7 +455,7 @@ BinaryenFloat64: 4 (drop (i32.eqz (i32.trunc_s/f32 - (call_import $an-imported + (call $an-imported (i32.const 13) (f64.const 3.7) ) @@ -541,14 +543,14 @@ raw: (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -556,7 +558,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -564,7 +566,7 @@ raw: (func $two-blocks-plus-code (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -575,7 +577,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -584,7 +586,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -592,7 +594,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -605,7 +607,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -616,7 +618,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -630,18 +632,18 @@ raw: ) (func $split (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -649,7 +651,7 @@ raw: ) (func $split-plus-code (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if @@ -659,7 +661,7 @@ raw: (i32.const 10) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -669,7 +671,7 @@ raw: (i32.const 20) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -679,13 +681,13 @@ raw: (func $if (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -696,7 +698,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -704,7 +706,7 @@ raw: (func $if-plus-code (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -714,7 +716,7 @@ raw: (i32.const -1) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -734,7 +736,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -742,13 +744,13 @@ raw: (func $if-else (type $v) (local $0 i32) (block $block$4$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -756,7 +758,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (block @@ -766,7 +768,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -776,7 +778,7 @@ raw: (block $block$3$break (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -784,7 +786,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (if @@ -796,7 +798,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -804,7 +806,7 @@ raw: (func $nontrivial-loop-plus-phi-to-head (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -819,7 +821,7 @@ raw: (block $block$4$break (loop $shape$1$continue (block $block$3$break - (call_import $check + (call $check (i32.const 1) ) (if @@ -834,7 +836,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (if @@ -852,13 +854,13 @@ raw: ) (block (block $block$6$break - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) (block - (call_import $check + (call $check (i32.const 4) ) (block @@ -869,7 +871,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 5) ) (block @@ -882,7 +884,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 6) ) ) @@ -890,7 +892,7 @@ raw: ) (func $switch (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -903,7 +905,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -915,7 +917,7 @@ raw: (i32.const 55) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -924,7 +926,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -943,7 +945,7 @@ raw: (block (block $block$3$break (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -974,7 +976,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (block @@ -993,7 +995,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (block @@ -1010,7 +1012,7 @@ raw: (func $return (type $i) (result i32) (local $0 i32) (block $the-list - (call_import $check + (call $check (i32.const 42) ) (return @@ -1027,81 +1029,81 @@ optimized: (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) ) (func $loop (type $v) (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br $shape$0$continue) ) ) (func $split (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) ) (func $if (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $if-else (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) - (call_import $check + (call $check (i32.const 3) ) ) (func $loop-tail (type $v) (block $block$3$break (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br_if $shape$0$continue @@ -1110,24 +1112,24 @@ optimized: (br $block$3$break) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $nontrivial-loop-plus-phi-to-head (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $block$7$break (block $block$4$break (loop $shape$1$continue - (call_import $check + (call $check (i32.const 1) ) (br_if $block$7$break (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (br_if $block$4$break @@ -1136,25 +1138,25 @@ optimized: (br $shape$1$continue) ) ) - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) - (call_import $check + (call $check (i32.const 4) ) ) - (call_import $check + (call $check (i32.const 5) ) ) - (call_import $check + (call $check (i32.const 6) ) ) (func $switch (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -1165,24 +1167,24 @@ optimized: (i32.const -99) ) ) - (call_import $check + (call $check (i32.const 1) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 2) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 3) ) ) ) (func $duffs-device (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (set_local $0 @@ -1195,7 +1197,7 @@ optimized: (i32.const 2) ) (block - (call_import $check + (call $check (i32.const 1) ) (set_local $0 @@ -1209,7 +1211,7 @@ optimized: (i32.const 3) ) (block - (call_import $check + (call $check (i32.const 2) ) (set_local $0 @@ -1222,7 +1224,7 @@ optimized: ) ) (func $return (type $i) (result i32) - (call_import $check + (call $check (i32.const 42) ) (i32.const 1337) @@ -1246,7 +1248,7 @@ module loaded from binary form: (type $v (func)) (import "spectest" "print" (func $print-i32 (param i32))) (func $starter (type $v) - (call_import $print-i32 + (call $print-i32 (i32.const 1234) ) ) @@ -1612,10 +1614,10 @@ int main() { (elem (i32.const 0) "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) - (block $the-body + (block $the-body i32 (block $the-nothing (drop - (block $the-value + (block $the-value i32 (drop (i32.clz (i32.const -10) @@ -2013,9 +2015,11 @@ int main() { (i32.const 0) ) ) - (br_if $the-value - (i32.const 1) - (i32.const 0) + (drop + (br_if $the-value + (i32.const 1) + (i32.const 0) + ) ) (br_if $the-nothing (i32.const 2) @@ -2044,7 +2048,7 @@ int main() { (drop (i32.eqz (i32.trunc_s/f32 - (call_import $an-imported + (call $an-imported (i32.const 13) (f64.const 3.7) ) @@ -2592,14 +2596,14 @@ raw: (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2607,7 +2611,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2615,7 +2619,7 @@ raw: (func $two-blocks-plus-code (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2626,7 +2630,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2635,7 +2639,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2643,7 +2647,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2656,7 +2660,7 @@ raw: (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2667,7 +2671,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2681,18 +2685,18 @@ raw: ) (func $split (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2700,7 +2704,7 @@ raw: ) (func $split-plus-code (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if @@ -2710,7 +2714,7 @@ raw: (i32.const 10) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2720,7 +2724,7 @@ raw: (i32.const 20) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2730,13 +2734,13 @@ raw: (func $if (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2747,7 +2751,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2755,7 +2759,7 @@ raw: (func $if-plus-code (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -2765,7 +2769,7 @@ raw: (i32.const -1) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2785,7 +2789,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2793,13 +2797,13 @@ raw: (func $if-else (type $v) (local $0 i32) (block $block$4$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -2807,7 +2811,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (block @@ -2817,7 +2821,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -2827,7 +2831,7 @@ raw: (block $block$3$break (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2835,7 +2839,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 1) ) (if @@ -2847,7 +2851,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2855,7 +2859,7 @@ raw: (func $nontrivial-loop-plus-phi-to-head (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -2870,7 +2874,7 @@ raw: (block $block$4$break (loop $shape$1$continue (block $block$3$break - (call_import $check + (call $check (i32.const 1) ) (if @@ -2885,7 +2889,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 2) ) (if @@ -2903,13 +2907,13 @@ raw: ) (block (block $block$6$break - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) (block - (call_import $check + (call $check (i32.const 4) ) (block @@ -2920,7 +2924,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 5) ) (block @@ -2933,7 +2937,7 @@ raw: ) ) (block - (call_import $check + (call $check (i32.const 6) ) ) @@ -2941,7 +2945,7 @@ raw: ) (func $switch (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -2954,7 +2958,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -2966,7 +2970,7 @@ raw: (i32.const 55) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -2975,7 +2979,7 @@ raw: ) (block (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -2994,7 +2998,7 @@ raw: (block (block $block$3$break (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -3025,7 +3029,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (block @@ -3044,7 +3048,7 @@ raw: (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (block @@ -3061,7 +3065,7 @@ raw: (func $return (type $i) (result i32) (local $0 i32) (block $the-list - (call_import $check + (call $check (i32.const 42) ) (return @@ -3082,81 +3086,81 @@ optimized: (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) ) (func $loop (type $v) (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br $shape$0$continue) ) ) (func $split (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) ) (func $if (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $if-else (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) - (call_import $check + (call $check (i32.const 3) ) ) (func $loop-tail (type $v) (block $block$3$break (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br_if $shape$0$continue @@ -3165,24 +3169,24 @@ optimized: (br $block$3$break) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $nontrivial-loop-plus-phi-to-head (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $block$7$break (block $block$4$break (loop $shape$1$continue - (call_import $check + (call $check (i32.const 1) ) (br_if $block$7$break (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (br_if $block$4$break @@ -3191,25 +3195,25 @@ optimized: (br $shape$1$continue) ) ) - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) - (call_import $check + (call $check (i32.const 4) ) ) - (call_import $check + (call $check (i32.const 5) ) ) - (call_import $check + (call $check (i32.const 6) ) ) (func $switch (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -3220,24 +3224,24 @@ optimized: (i32.const -99) ) ) - (call_import $check + (call $check (i32.const 1) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 2) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 3) ) ) ) (func $duffs-device (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (set_local $0 @@ -3250,7 +3254,7 @@ optimized: (i32.const 2) ) (block - (call_import $check + (call $check (i32.const 1) ) (set_local $0 @@ -3264,7 +3268,7 @@ optimized: (i32.const 3) ) (block - (call_import $check + (call $check (i32.const 2) ) (set_local $0 @@ -3277,7 +3281,7 @@ optimized: ) ) (func $return (type $i) (result i32) - (call_import $check + (call $check (i32.const 42) ) (i32.const 1337) diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt index 022bcc2e3..f66b714eb 100644 --- a/test/example/c-api-kitchen-sink.txt.txt +++ b/test/example/c-api-kitchen-sink.txt.txt @@ -16,10 +16,10 @@ (elem (i32.const 0) "$kitchen()sinker") (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32) (local $4 i32) - (block $the-body + (block $the-body i32 (block $the-nothing (drop - (block $the-value + (block $the-value i32 (drop (i32.clz (i32.const -10) @@ -417,9 +417,11 @@ (i32.const 0) ) ) - (br_if $the-value - (i32.const 1) - (i32.const 0) + (drop + (br_if $the-value + (i32.const 1) + (i32.const 0) + ) ) (br_if $the-nothing (i32.const 2) @@ -448,7 +450,7 @@ (drop (i32.eqz (i32.trunc_s/f32 - (call_import $an-imported + (call $an-imported (i32.const 13) (f64.const 3.7) ) @@ -535,14 +537,14 @@ (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -550,7 +552,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -558,7 +560,7 @@ (func $two-blocks-plus-code (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -569,7 +571,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -578,7 +580,7 @@ (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -586,7 +588,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -599,7 +601,7 @@ (local $0 i32) (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -610,7 +612,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -624,18 +626,18 @@ ) (func $split (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -643,7 +645,7 @@ ) (func $split-plus-code (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (if @@ -653,7 +655,7 @@ (i32.const 10) ) (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -663,7 +665,7 @@ (i32.const 20) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -673,13 +675,13 @@ (func $if (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -690,7 +692,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -698,7 +700,7 @@ (func $if-plus-code (type $v) (local $0 i32) (block $block$3$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -708,7 +710,7 @@ (i32.const -1) ) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -728,7 +730,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -736,13 +738,13 @@ (func $if-else (type $v) (local $0 i32) (block $block$4$break - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) (block - (call_import $check + (call $check (i32.const 1) ) (block @@ -750,7 +752,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) (block @@ -760,7 +762,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -770,7 +772,7 @@ (block $block$3$break (loop $shape$0$continue (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -778,7 +780,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 1) ) (if @@ -790,7 +792,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -798,7 +800,7 @@ (func $nontrivial-loop-plus-phi-to-head (type $v) (local $0 i32) (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (block @@ -813,7 +815,7 @@ (block $block$4$break (loop $shape$1$continue (block $block$3$break - (call_import $check + (call $check (i32.const 1) ) (if @@ -828,7 +830,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 2) ) (if @@ -846,13 +848,13 @@ ) (block (block $block$6$break - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) (block - (call_import $check + (call $check (i32.const 4) ) (block @@ -863,7 +865,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 5) ) (block @@ -876,7 +878,7 @@ ) ) (block - (call_import $check + (call $check (i32.const 6) ) ) @@ -884,7 +886,7 @@ ) (func $switch (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -897,7 +899,7 @@ ) (block (block - (call_import $check + (call $check (i32.const 1) ) ) @@ -909,7 +911,7 @@ (i32.const 55) ) (block - (call_import $check + (call $check (i32.const 2) ) ) @@ -918,7 +920,7 @@ ) (block (block - (call_import $check + (call $check (i32.const 3) ) ) @@ -937,7 +939,7 @@ (block (block $block$3$break (block $block$2$break - (call_import $check + (call $check (i32.const 0) ) (if @@ -968,7 +970,7 @@ (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (block @@ -987,7 +989,7 @@ (set_local $3 (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (block @@ -1004,7 +1006,7 @@ (func $return (type $i) (result i32) (local $0 i32) (block $the-list - (call_import $check + (call $check (i32.const 42) ) (return @@ -1020,81 +1022,81 @@ (type $i (func (result i32))) (import "module" "check" (func $check (param i32))) (func $just-one-block (type $v) - (call_import $check + (call $check (i32.const 1337) ) ) (func $two-blocks (type $v) - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) ) (func $loop (type $v) (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br $shape$0$continue) ) ) (func $split (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) ) (func $if (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $if-else (type $v) - (call_import $check + (call $check (i32.const 0) ) (if (i32.const 55) - (call_import $check + (call $check (i32.const 1) ) - (call_import $check + (call $check (i32.const 2) ) ) - (call_import $check + (call $check (i32.const 3) ) ) (func $loop-tail (type $v) (block $block$3$break (loop $shape$0$continue - (call_import $check + (call $check (i32.const 0) ) - (call_import $check + (call $check (i32.const 1) ) (br_if $shape$0$continue @@ -1103,24 +1105,24 @@ (br $block$3$break) ) ) - (call_import $check + (call $check (i32.const 2) ) ) (func $nontrivial-loop-plus-phi-to-head (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $block$7$break (block $block$4$break (loop $shape$1$continue - (call_import $check + (call $check (i32.const 1) ) (br_if $block$7$break (i32.const 0) ) - (call_import $check + (call $check (i32.const 2) ) (br_if $block$4$break @@ -1129,25 +1131,25 @@ (br $shape$1$continue) ) ) - (call_import $check + (call $check (i32.const 3) ) (if (i32.const -10) - (call_import $check + (call $check (i32.const 4) ) ) - (call_import $check + (call $check (i32.const 5) ) ) - (call_import $check + (call $check (i32.const 6) ) ) (func $switch (type $v) - (call_import $check + (call $check (i32.const 0) ) (block $switch$1$leave @@ -1158,24 +1160,24 @@ (i32.const -99) ) ) - (call_import $check + (call $check (i32.const 1) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 2) ) (br $switch$1$leave) ) - (call_import $check + (call $check (i32.const 3) ) ) ) (func $duffs-device (type $v) (local $0 i32) - (call_import $check + (call $check (i32.const 0) ) (set_local $0 @@ -1188,7 +1190,7 @@ (i32.const 2) ) (block - (call_import $check + (call $check (i32.const 1) ) (set_local $0 @@ -1202,7 +1204,7 @@ (i32.const 3) ) (block - (call_import $check + (call $check (i32.const 2) ) (set_local $0 @@ -1215,7 +1217,7 @@ ) ) (func $return (type $i) (result i32) - (call_import $check + (call $check (i32.const 42) ) (i32.const 1337) diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt index 5db33f21e..a5a098b32 100644 --- a/test/example/relooper-fuzz.txt +++ b/test/example/relooper-fuzz.txt @@ -25,7 +25,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -157,7 +157,7 @@ (block $block$6$break (block $block$5$break (block - (call_import $print + (call $print (i32.const 0) ) (set_local $0 @@ -180,7 +180,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 8) ) (set_local $0 @@ -207,7 +207,7 @@ (i32.const 0) ) (block - (call_import $print + (call $print (i32.const 5) ) (set_local $0 @@ -236,7 +236,7 @@ (block (block $block$3$break (block - (call_import $print + (call $print (i32.const 4) ) (set_local $0 @@ -272,7 +272,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 2) ) (set_local $0 @@ -318,7 +318,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -445,7 +445,7 @@ (i32.const 112) (i32.const 34) ) - (call_import $print + (call $print (i32.const 0) ) (if @@ -454,7 +454,7 @@ (i32.const 2) ) (block - (call_import $print + (call $print (i32.const 8) ) (drop @@ -475,7 +475,7 @@ (set_local $0 (i32.const 0) ) - (call_import $print + (call $print (i32.const 5) ) (br_if $shape$3$continue @@ -492,7 +492,7 @@ (br $shape$3$continue) ) ) - (call_import $print + (call $print (i32.const 4) ) (br_if $shape$3$continue @@ -520,7 +520,7 @@ (br $shape$3$continue) ) ) - (call_import $print + (call $print (i32.const 2) ) (drop diff --git a/test/example/relooper-fuzz1.txt b/test/example/relooper-fuzz1.txt index b4ad8b5a1..9424160e3 100644 --- a/test/example/relooper-fuzz1.txt +++ b/test/example/relooper-fuzz1.txt @@ -25,7 +25,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -169,7 +169,7 @@ (block $block$4$break (block $block$3$break (block - (call_import $print + (call $print (i32.const 0) ) (set_local $0 @@ -195,7 +195,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 7) ) (set_local $0 @@ -220,7 +220,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 2) ) (set_local $0 @@ -242,7 +242,7 @@ ) (loop $shape$6$continue (block - (call_import $print + (call $print (i32.const 3) ) (set_local $0 @@ -256,7 +256,7 @@ ) (block (block - (call_import $print + (call $print (i32.const 9) ) (set_local $0 @@ -294,7 +294,7 @@ (i32.const 4) ) ) - (call_import $print + (call $print (i32.sub (i32.const 0) (i32.load offset=4 @@ -434,7 +434,7 @@ ) (block $block$10$break (block $block$4$break - (call_import $print + (call $print (i32.const 0) ) (if @@ -453,7 +453,7 @@ (i32.const 2) ) (block - (call_import $print + (call $print (i32.const 7) ) (br_if $block$10$break @@ -466,7 +466,7 @@ (br $block$4$break) ) ) - (call_import $print + (call $print (i32.const 2) ) (br_if $block$10$break @@ -477,7 +477,7 @@ ) ) (loop $shape$6$continue - (call_import $print + (call $print (i32.const 3) ) (drop @@ -486,7 +486,7 @@ (br $shape$6$continue) ) ) - (call_import $print + (call $print (i32.const 9) ) (drop diff --git a/test/hello_world.fromasm b/test/hello_world.fromasm index 23aba7d9d..02625d09e 100644 --- a/test/hello_world.fromasm +++ b/test/hello_world.fromasm @@ -1,8 +1,7 @@ (module - (memory 256 256) (data (get_global $memoryBase) "hello_world.asm.js") - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "add" (func $add)) diff --git a/test/hello_world.fromasm.imprecise b/test/hello_world.fromasm.imprecise index 6bfc4bf68..21ac8112c 100644 --- a/test/hello_world.fromasm.imprecise +++ b/test/hello_world.fromasm.imprecise @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "add" (func $add)) diff --git a/test/hello_world.fromasm.imprecise.no-opts b/test/hello_world.fromasm.imprecise.no-opts index 31ce2e573..8ef16e1e0 100644 --- a/test/hello_world.fromasm.imprecise.no-opts +++ b/test/hello_world.fromasm.imprecise.no-opts @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "add" (func $add)) diff --git a/test/hello_world.fromasm.no-opts b/test/hello_world.fromasm.no-opts index 31ce2e573..8ef16e1e0 100644 --- a/test/hello_world.fromasm.no-opts +++ b/test/hello_world.fromasm.no-opts @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "add" (func $add)) diff --git a/test/kitchen_sink.wast b/test/kitchen_sink.wast index 01fc1e241..c6cd0a8b3 100644 --- a/test/kitchen_sink.wast +++ b/test/kitchen_sink.wast @@ -3,7 +3,7 @@ (data (i32.const 1026) "\14\00") (type $0 (func (result i32))) (func $kitchensink (type $0) (result i32) - (block $block0 + (block $block0 i32 (drop (i32.add (i32.const 10) diff --git a/test/kitchen_sink.wast.fromBinary b/test/kitchen_sink.wast.fromBinary index 4c3da110c..5aba809f6 100644 --- a/test/kitchen_sink.wast.fromBinary +++ b/test/kitchen_sink.wast.fromBinary @@ -3,7 +3,7 @@ (data (i32.const 1026) "\14\00") (type $0 (func (result i32))) (func $kitchensink (type $0) (result i32) - (block $label$0 + (block $label$0 i32 (drop (i32.add (i32.const 10) diff --git a/test/llvm_autogenerated/byval.wast b/test/llvm_autogenerated/byval.wast index 122446985..9549ef683 100644 --- a/test/llvm_autogenerated/byval.wast +++ b/test/llvm_autogenerated/byval.wast @@ -43,7 +43,7 @@ ) ) (drop - (call_import $ext_byval_func + (call $ext_byval_func (i32.add (get_local $1) (i32.const 12) @@ -85,7 +85,7 @@ ) ) (drop - (call_import $ext_byval_func_align8 + (call $ext_byval_func_align8 (i32.add (get_local $1) (i32.const 8) @@ -141,7 +141,7 @@ ) ) (drop - (call_import $ext_byval_func_alignedstruct + (call $ext_byval_func_alignedstruct (get_local $1) ) ) @@ -158,7 +158,7 @@ ) (func $byval_param (param $0 i32) (drop - (call_import $ext_func + (call $ext_func (get_local $0) ) ) @@ -166,7 +166,7 @@ ) (func $byval_empty_caller (param $0 i32) (drop - (call_import $ext_byval_func_empty + (call $ext_byval_func_empty (get_local $0) ) ) @@ -174,7 +174,7 @@ ) (func $byval_empty_callee (param $0 i32) (drop - (call_import $ext_func_empty + (call $ext_func_empty (get_local $0) ) ) @@ -196,9 +196,9 @@ ) ) (drop - (call_import $big_byval_callee + (call $big_byval_callee (tee_local $0 - (call_import $memcpy + (call $memcpy (get_local $1) (get_local $0) (i32.const 131072) diff --git a/test/llvm_autogenerated/call.wast b/test/llvm_autogenerated/call.wast index 5e91ea75f..9b547f132 100644 --- a/test/llvm_autogenerated/call.wast +++ b/test/llvm_autogenerated/call.wast @@ -34,40 +34,40 @@ (elem (i32.const 0) $__wasm_nullptr $__importThunk_void_nullary) (func $call_i32_nullary (result i32) (return - (call_import $i32_nullary) + (call $i32_nullary) ) ) (func $call_i64_nullary (result i64) (return - (call_import $i64_nullary) + (call $i64_nullary) ) ) (func $call_float_nullary (result f32) (return - (call_import $float_nullary) + (call $float_nullary) ) ) (func $call_double_nullary (result f64) (return - (call_import $double_nullary) + (call $double_nullary) ) ) (func $call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) (func $call_i32_unary (param $0 i32) (result i32) (return - (call_import $i32_unary + (call $i32_unary (get_local $0) ) ) ) (func $call_i32_binary (param $0 i32) (param $1 i32) (result i32) (return - (call_import $i32_binary + (call $i32_binary (get_local $0) (get_local $1) ) @@ -90,19 +90,19 @@ ) (func $tail_call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) (func $fastcc_tail_call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) (func $coldcc_tail_call_void_nullary (drop - (call_import $void_nullary) + (call $void_nullary) ) (return) ) @@ -110,7 +110,7 @@ (unreachable) ) (func $__importThunk_void_nullary (type $FUNCSIG$v) - (call_import $void_nullary) + (call $void_nullary) ) (func $dynCall_v (param $fptr i32) (call_indirect $FUNCSIG$v diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast index bfea4a853..87d8c430d 100644 --- a/test/llvm_autogenerated/cfg-stackify.wast +++ b/test/llvm_autogenerated/cfg-stackify.wast @@ -54,7 +54,7 @@ ) ) (drop - (call_import $something) + (call $something) ) (br $label$0) ) @@ -81,7 +81,7 @@ ) ) (drop - (call_import $something) + (call $something) ) (br $label$0) ) @@ -512,7 +512,7 @@ (unreachable) ) (drop - (call_import $bar) + (call $bar) ) (br $label$1) ) @@ -787,7 +787,7 @@ (br_if $label$1 (i32.eqz (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -804,7 +804,7 @@ (br_if $label$4 (i32.eqz (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -817,7 +817,7 @@ ) (br_if $label$2 (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -831,7 +831,7 @@ ) (br_if $label$2 (i32.and - (call_import $a) + (call $a) (i32.const 1) ) ) @@ -1120,7 +1120,7 @@ ) ) (drop - (call_import $test15_callee1) + (call $test15_callee1) ) (br $label$0) ) @@ -1157,7 +1157,7 @@ ) ) (drop - (call_import $test15_callee0) + (call $test15_callee0) ) (return) ) diff --git a/test/llvm_autogenerated/f32.wast b/test/llvm_autogenerated/f32.wast index f660676e5..f4b5243b0 100644 --- a/test/llvm_autogenerated/f32.wast +++ b/test/llvm_autogenerated/f32.wast @@ -134,7 +134,7 @@ ) (func $fma32 (param $0 f32) (param $1 f32) (param $2 f32) (result f32) (return - (call_import $fmaf + (call $fmaf (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/f64.wast b/test/llvm_autogenerated/f64.wast index 07a49840b..19ba5ae04 100644 --- a/test/llvm_autogenerated/f64.wast +++ b/test/llvm_autogenerated/f64.wast @@ -134,7 +134,7 @@ ) (func $fma64 (param $0 f64) (param $1 f64) (param $2 f64) (result f64) (return - (call_import $fma + (call $fma (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/frem.wast b/test/llvm_autogenerated/frem.wast index bc69d93f1..ec213e457 100644 --- a/test/llvm_autogenerated/frem.wast +++ b/test/llvm_autogenerated/frem.wast @@ -10,7 +10,7 @@ (export "frem64" (func $frem64)) (func $frem32 (param $0 f32) (param $1 f32) (result f32) (return - (call_import $fmodf + (call $fmodf (get_local $0) (get_local $1) ) @@ -18,7 +18,7 @@ ) (func $frem64 (param $0 f64) (param $1 f64) (result f64) (return - (call_import $fmod + (call $fmod (get_local $0) (get_local $1) ) diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast index 57aca9ffc..3c34312e3 100644 --- a/test/llvm_autogenerated/global.wast +++ b/test/llvm_autogenerated/global.wast @@ -27,7 +27,7 @@ ) (func $call_memcpy (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memcpy + (call $memcpy (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/i128.wast b/test/llvm_autogenerated/i128.wast index 9b4fd8970..570947567 100644 --- a/test/llvm_autogenerated/i128.wast +++ b/test/llvm_autogenerated/i128.wast @@ -125,7 +125,7 @@ ) ) (drop - (call_import $__multi3 + (call $__multi3 (get_local $5) (get_local $1) (get_local $2) @@ -182,7 +182,7 @@ ) ) (drop - (call_import $__divti3 + (call $__divti3 (get_local $5) (get_local $1) (get_local $2) @@ -239,7 +239,7 @@ ) ) (drop - (call_import $__udivti3 + (call $__udivti3 (get_local $5) (get_local $1) (get_local $2) @@ -296,7 +296,7 @@ ) ) (drop - (call_import $__modti3 + (call $__modti3 (get_local $5) (get_local $1) (get_local $2) @@ -353,7 +353,7 @@ ) ) (drop - (call_import $__umodti3 + (call $__umodti3 (get_local $5) (get_local $1) (get_local $2) @@ -482,7 +482,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (get_local $5) (get_local $1) (get_local $2) @@ -540,7 +540,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $5) (get_local $1) (get_local $2) @@ -598,7 +598,7 @@ ) ) (drop - (call_import $__ashrti3 + (call $__ashrti3 (get_local $5) (get_local $1) (get_local $2) @@ -819,7 +819,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $5) (i32.const 16) @@ -832,7 +832,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $5) (get_local $1) (get_local $2) @@ -909,7 +909,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $5) (i32.const 16) @@ -927,7 +927,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $5) (get_local $1) (get_local $2) @@ -1004,7 +1004,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $5) (i32.const 16) @@ -1017,7 +1017,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (get_local $5) (get_local $1) (get_local $2) @@ -1094,7 +1094,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $5) (i32.const 16) @@ -1112,7 +1112,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (get_local $5) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast index 5ef162889..4c32851ed 100644 --- a/test/llvm_autogenerated/legalize.wast +++ b/test/llvm_autogenerated/legalize.wast @@ -97,7 +97,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 512) @@ -112,7 +112,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 528) @@ -123,7 +123,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 544) @@ -139,7 +139,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 560) @@ -155,7 +155,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 736) @@ -171,7 +171,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 720) @@ -187,7 +187,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 752) @@ -203,7 +203,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 592) @@ -214,7 +214,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 608) @@ -225,7 +225,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 624) @@ -236,7 +236,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 688) @@ -252,7 +252,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 640) @@ -263,7 +263,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 656) @@ -279,7 +279,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 672) @@ -290,7 +290,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 576) @@ -301,7 +301,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 704) @@ -312,7 +312,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 480) @@ -326,7 +326,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 464) @@ -342,7 +342,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 496) @@ -356,7 +356,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 352) @@ -372,7 +372,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 336) @@ -388,7 +388,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 368) @@ -404,7 +404,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 432) @@ -420,7 +420,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 864) @@ -431,7 +431,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 848) @@ -442,7 +442,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 880) @@ -453,7 +453,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 1008) @@ -464,7 +464,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 960) @@ -475,7 +475,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 976) @@ -486,7 +486,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 816) @@ -497,7 +497,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 240) @@ -513,7 +513,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 192) @@ -524,7 +524,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 208) @@ -540,7 +540,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 224) @@ -551,7 +551,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 768) @@ -562,7 +562,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 784) @@ -573,7 +573,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 800) @@ -584,7 +584,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 992) @@ -595,7 +595,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 832) @@ -606,7 +606,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 384) @@ -617,7 +617,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 400) @@ -631,7 +631,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 416) @@ -642,7 +642,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 320) @@ -653,7 +653,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 448) @@ -664,7 +664,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 128) @@ -675,7 +675,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 144) @@ -689,7 +689,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 160) @@ -700,7 +700,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (get_local $52) (get_local $1) (get_local $2) @@ -708,7 +708,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 16) @@ -719,7 +719,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 32) @@ -730,7 +730,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 64) @@ -746,7 +746,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 896) @@ -757,7 +757,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 256) @@ -768,7 +768,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 912) @@ -779,7 +779,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 928) @@ -790,7 +790,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 944) @@ -801,7 +801,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 80) @@ -812,7 +812,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 96) @@ -826,7 +826,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 112) @@ -837,7 +837,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 48) @@ -848,7 +848,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 176) @@ -859,7 +859,7 @@ ) ) (drop - (call_import $__lshrti3 + (call $__lshrti3 (i32.add (get_local $52) (i32.const 288) @@ -870,7 +870,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 272) @@ -881,7 +881,7 @@ ) ) (drop - (call_import $__ashlti3 + (call $__ashlti3 (i32.add (get_local $52) (i32.const 304) diff --git a/test/llvm_autogenerated/mem-intrinsics.wast b/test/llvm_autogenerated/mem-intrinsics.wast index 90ec611af..21085a2b2 100644 --- a/test/llvm_autogenerated/mem-intrinsics.wast +++ b/test/llvm_autogenerated/mem-intrinsics.wast @@ -21,7 +21,7 @@ (export "tail_dup_to_reuse_result" (func $tail_dup_to_reuse_result)) (func $copy_yes (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memcpy + (call $memcpy (get_local $0) (get_local $1) (get_local $2) @@ -30,7 +30,7 @@ ) (func $copy_no (param $0 i32) (param $1 i32) (param $2 i32) (drop - (call_import $memcpy + (call $memcpy (get_local $0) (get_local $1) (get_local $2) @@ -40,7 +40,7 @@ ) (func $move_yes (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memmove + (call $memmove (get_local $0) (get_local $1) (get_local $2) @@ -49,7 +49,7 @@ ) (func $move_no (param $0 i32) (param $1 i32) (param $2 i32) (drop - (call_import $memmove + (call $memmove (get_local $0) (get_local $1) (get_local $2) @@ -59,7 +59,7 @@ ) (func $set_yes (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (return - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) @@ -68,7 +68,7 @@ ) (func $set_no (param $0 i32) (param $1 i32) (param $2 i32) (drop - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) @@ -92,7 +92,7 @@ ) ) (drop - (call_import $memset + (call $memset (i32.add (get_local $0) (i32.const 2048) @@ -105,7 +105,7 @@ (i32.store offset=4 (i32.const 0) (i32.add - (call_import $memset + (call $memset (get_local $0) (i32.const 0) (i32.const 1024) @@ -126,7 +126,7 @@ ) ) (set_local $0 - (call_import $def) + (call $def) ) (br $label$1) ) @@ -137,21 +137,21 @@ ) ) (drop - (call_import $block_tail_dup) + (call $block_tail_dup) ) (return (get_local $0) ) ) (drop - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) ) ) (drop - (call_import $block_tail_dup) + (call $block_tail_dup) ) (return (get_local $0) @@ -167,7 +167,7 @@ ) ) (set_local $0 - (call_import $def) + (call $def) ) (br $label$1) ) @@ -182,7 +182,7 @@ ) ) (return - (call_import $memset + (call $memset (get_local $0) (get_local $1) (get_local $2) diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast index 299d85515..878397f19 100644 --- a/test/llvm_autogenerated/reg-stackify.wast +++ b/test/llvm_autogenerated/reg-stackify.wast @@ -119,13 +119,13 @@ ) ) (return - (call_import $readnone_callee) + (call $readnone_callee) ) ) (func $no_sink_readonly_call (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (local $3 i32) (set_local $3 - (call_import $readonly_callee) + (call $readonly_callee) ) (drop (i32.store @@ -210,7 +210,7 @@ ) ) (drop - (call_import $evoke_side_effects) + (call $evoke_side_effects) ) (drop (i64.store @@ -219,7 +219,7 @@ ) ) (drop - (call_import $evoke_side_effects) + (call $evoke_side_effects) ) (return) ) @@ -275,7 +275,7 @@ ) (func $simple_multiple_use (param $0 i32) (param $1 i32) (drop - (call_import $use_a + (call $use_a (tee_local $1 (i32.mul (get_local $1) @@ -285,7 +285,7 @@ ) ) (drop - (call_import $use_b + (call $use_b (get_local $1) ) ) @@ -293,7 +293,7 @@ ) (func $multiple_uses_in_same_insn (param $0 i32) (param $1 i32) (drop - (call_import $use_2 + (call $use_2 (tee_local $1 (i32.mul (get_local $1) @@ -309,24 +309,24 @@ (return (i32.add (i32.add - (call_import $red) - (call_import $green) + (call $red) + (call $green) ) - (call_import $blue) + (call $blue) ) ) ) (func $no_stackify_past_use (param $0 i32) (result i32) (local $1 i32) (set_local $1 - (call_import $callee + (call $callee (get_local $0) ) ) (return (i32.div_s (i32.sub - (call_import $callee + (call $callee (i32.add (get_local $0) (i32.const 1) @@ -343,13 +343,13 @@ (return (i32.mul (tee_local $1 - (call_import $callee + (call $callee (get_local $0) ) ) (i32.add (get_local $1) - (call_import $callee + (call $callee (i32.add (get_local $0) (i32.const 1) @@ -470,7 +470,7 @@ (local $0 i32) (local $1 i32) (set_local $0 - (call_import $red) + (call $red) ) (set_local $1 (i32.load offset=12 @@ -478,7 +478,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) @@ -499,7 +499,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) @@ -515,7 +515,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) @@ -545,7 +545,7 @@ ) ) (set_local $0 - (call_import $use_memory + (call $use_memory (i32.add (get_local $1) (i32.const 12) @@ -601,7 +601,7 @@ (func $stackpointer_dependency (param $0 i32) (result i32) (local $1 i32) (set_local $0 - (call_import $stackpointer_callee + (call $stackpointer_callee (get_local $0) (tee_local $1 (i32.load offset=4 diff --git a/test/llvm_autogenerated/switch.wast b/test/llvm_autogenerated/switch.wast index 7191df4de..988fc967a 100644 --- a/test/llvm_autogenerated/switch.wast +++ b/test/llvm_autogenerated/switch.wast @@ -30,32 +30,32 @@ ) ) (drop - (call_import $foo0) + (call $foo0) ) (return) ) (drop - (call_import $foo1) + (call $foo1) ) (return) ) (drop - (call_import $foo2) + (call $foo2) ) (return) ) (drop - (call_import $foo3) + (call $foo3) ) (return) ) (drop - (call_import $foo4) + (call $foo4) ) (return) ) (drop - (call_import $foo5) + (call $foo5) ) ) (return) @@ -81,32 +81,32 @@ ) ) (drop - (call_import $foo0) + (call $foo0) ) (return) ) (drop - (call_import $foo1) + (call $foo1) ) (return) ) (drop - (call_import $foo2) + (call $foo2) ) (return) ) (drop - (call_import $foo3) + (call $foo3) ) (return) ) (drop - (call_import $foo4) + (call $foo4) ) (return) ) (drop - (call_import $foo5) + (call $foo5) ) ) (return) diff --git a/test/llvm_autogenerated/unreachable.wast b/test/llvm_autogenerated/unreachable.wast index 5029f5083..837518400 100644 --- a/test/llvm_autogenerated/unreachable.wast +++ b/test/llvm_autogenerated/unreachable.wast @@ -9,7 +9,7 @@ (export "f3" (func $f3)) (func $f1 (result i32) (drop - (call_import $abort) + (call $abort) ) (unreachable) ) diff --git a/test/llvm_autogenerated/unused-argument.wast b/test/llvm_autogenerated/unused-argument.wast index 1248f2e50..878d92c57 100644 --- a/test/llvm_autogenerated/unused-argument.wast +++ b/test/llvm_autogenerated/unused-argument.wast @@ -19,7 +19,7 @@ ) (func $call_something (drop - (call_import $return_something) + (call $return_something) ) (return) ) diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast index b3e576121..d9b226378 100644 --- a/test/llvm_autogenerated/userstack.wast +++ b/test/llvm_autogenerated/userstack.wast @@ -130,7 +130,7 @@ ) ) (drop - (call_import $ext_func + (call $ext_func (i32.add (get_local $1) (i32.const 8) @@ -138,7 +138,7 @@ ) ) (drop - (call_import $ext_func + (call $ext_func (get_local $1) ) ) @@ -190,7 +190,7 @@ ) ) (drop - (call_import $ext_func + (call $ext_func (i32.const 0) ) ) @@ -232,7 +232,7 @@ ) ) (drop - (call_import $ext_func_i32 + (call $ext_func_i32 (get_local $0) ) ) @@ -370,7 +370,7 @@ (func $frameaddress_0 (local $0 i32) (drop - (call_import $use_i8_star + (call $use_i8_star (tee_local $0 (i32.load offset=4 (i32.const 0) @@ -388,7 +388,7 @@ ) (func $frameaddress_1 (drop - (call_import $use_i8_star + (call $use_i8_star (i32.const 0) ) ) diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast index e2ec13ebc..2bd953d8e 100644 --- a/test/llvm_autogenerated/varargs.wast +++ b/test/llvm_autogenerated/varargs.wast @@ -145,7 +145,7 @@ ) (func $caller_none (drop - (call_import $callee + (call $callee (i32.const 0) ) ) @@ -179,7 +179,7 @@ ) ) (drop - (call_import $callee + (call $callee (get_local $0) ) ) diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm index 70ef836b0..7847fa1dc 100644 --- a/test/memorygrowth.fromasm +++ b/test/memorygrowth.fromasm @@ -1,5 +1,4 @@ (module - (memory 256 256) (data (get_global $memoryBase) "memorygrowth.asm.js") (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) @@ -7,12 +6,12 @@ (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $r i32)) - (import "env" "STACK_MAX" (global $s i32)) - (import "env" "tempDoublePtr" (global $t i32)) - (import "env" "ABORT" (global $u i32)) - (import "global" "NaN" (global $z f64)) - (import "global" "Infinity" (global $A f64)) + (import "env" "STACKTOP" (global $r$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $s$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $t$asm2wasm$import i32)) + (import "env" "ABORT" (global $u$asm2wasm$import i32)) + (import "global" "NaN" (global $z$asm2wasm$import f64)) + (import "global" "Infinity" (global $A$asm2wasm$import f64)) (import "env" "abort" (func $ja (param i32))) (import "env" "_pthread_cleanup_pop" (func $oa (param i32))) (import "env" "___lock" (func $pa (param i32))) @@ -26,8 +25,8 @@ (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $fb)) @@ -50,31 +49,36 @@ (export "dynCall_iiii" (func $lb)) (export "dynCall_vi" (func $mb)) (export "__growWasmMemory" (func $__growWasmMemory)) - (global $v i32 (i32.const 0)) - (global $w i32 (i32.const 0)) - (global $x i32 (i32.const 0)) - (global $y i32 (i32.const 0)) - (global $B i32 (i32.const 0)) - (global $C i32 (i32.const 0)) - (global $D i32 (i32.const 0)) - (global $E i32 (i32.const 0)) - (global $F f64 (f64.const 0)) - (global $G i32 (i32.const 0)) - (global $H i32 (i32.const 0)) - (global $I i32 (i32.const 0)) - (global $J f64 (f64.const 0)) - (global $K i32 (i32.const 0)) - (global $L i32 (i32.const 0)) - (global $M i32 (i32.const 0)) - (global $N i32 (i32.const 0)) - (global $O i32 (i32.const 0)) - (global $P i32 (i32.const 0)) - (global $Q i32 (i32.const 0)) - (global $R i32 (i32.const 0)) - (global $S i32 (i32.const 0)) - (global $T i32 (i32.const 0)) - (global $za f64 (f64.const 0)) - (table 8 8 anyfunc) + (global $r (mut i32) (get_global $r$asm2wasm$import)) + (global $s (mut i32) (get_global $s$asm2wasm$import)) + (global $t (mut i32) (get_global $t$asm2wasm$import)) + (global $u (mut i32) (get_global $u$asm2wasm$import)) + (global $v (mut i32) (i32.const 0)) + (global $w (mut i32) (i32.const 0)) + (global $x (mut i32) (i32.const 0)) + (global $y (mut i32) (i32.const 0)) + (global $z (mut f64) (get_global $z$asm2wasm$import)) + (global $A (mut f64) (get_global $A$asm2wasm$import)) + (global $B (mut i32) (i32.const 0)) + (global $C (mut i32) (i32.const 0)) + (global $D (mut i32) (i32.const 0)) + (global $E (mut i32) (i32.const 0)) + (global $F (mut f64) (f64.const 0)) + (global $G (mut i32) (i32.const 0)) + (global $H (mut i32) (i32.const 0)) + (global $I (mut i32) (i32.const 0)) + (global $J (mut f64) (f64.const 0)) + (global $K (mut i32) (i32.const 0)) + (global $L (mut i32) (i32.const 0)) + (global $M (mut i32) (i32.const 0)) + (global $N (mut i32) (i32.const 0)) + (global $O (mut i32) (i32.const 0)) + (global $P (mut i32) (i32.const 0)) + (global $Q (mut i32) (i32.const 0)) + (global $R (mut i32) (i32.const 0)) + (global $S (mut i32) (i32.const 0)) + (global $T (mut i32) (i32.const 0)) + (global $za (mut f64) (f64.const 0)) (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $0 i32) (result i32) (local $1 i32) @@ -253,7 +257,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -277,7 +281,7 @@ (get_local $7) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -503,7 +507,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -532,7 +536,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -625,7 +629,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $41 (get_local $5) @@ -888,7 +892,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -900,7 +904,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $0 (i32.load offset=24 @@ -1007,7 +1011,7 @@ (get_local $6) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $6) @@ -1029,7 +1033,7 @@ ) (get_local $3) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -1043,7 +1047,7 @@ ) (get_local $1) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1070,7 +1074,7 @@ (get_local $17) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1135,7 +1139,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1174,7 +1178,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $23) @@ -1191,7 +1195,7 @@ (get_local $3) (get_local $17) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $23) @@ -1217,7 +1221,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $23) @@ -1350,7 +1354,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $42 (get_local $6) @@ -1757,7 +1761,7 @@ (get_local $33) ) ) - (block + (block i32 (if (i32.eqz (tee_local $6 @@ -2018,7 +2022,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -2030,7 +2034,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $5 (i32.load offset=24 @@ -2138,7 +2142,7 @@ (get_local $3) (get_local $10) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -2160,7 +2164,7 @@ ) (get_local $10) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -2174,7 +2178,7 @@ ) (get_local $11) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2201,7 +2205,7 @@ (get_local $3) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2266,7 +2270,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2305,7 +2309,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $22) @@ -2322,7 +2326,7 @@ (get_local $10) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $22) @@ -2348,7 +2352,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $22) @@ -2477,7 +2481,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $19 (get_local $2) @@ -2794,7 +2798,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $21) @@ -2865,7 +2869,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3195,7 +3199,7 @@ (if (i32.eq (tee_local $9 - (block $label$break$b + (block $label$break$b i32 (if (i32.and (i32.load @@ -3204,7 +3208,7 @@ (i32.const 4) ) (i32.const 188) - (block + (block i32 (block $label$break$c (if (tee_local $16 @@ -3284,7 +3288,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $7) ) ) @@ -3342,7 +3346,7 @@ (if (i32.ne (tee_local $16 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -3429,7 +3433,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $2) ) ) @@ -3519,14 +3523,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $0) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $19) ) ) @@ -3592,12 +3596,12 @@ (i32.and (i32.lt_u (tee_local $4 - (call_import $ta + (call $ta (get_local $13) ) ) (tee_local $13 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -3848,7 +3852,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.const 1224) (get_local $20) @@ -4091,7 +4095,7 @@ ) (i32.const 1) ) - (block + (block i32 (set_local $5 (i32.and (get_local $2) @@ -4143,7 +4147,7 @@ (get_local $21) (get_local $8) ) - (call_import $qa) + (call $qa) ) (br_if $do-once$53 (i32.eq @@ -4153,7 +4157,7 @@ (get_local $4) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4199,7 +4203,7 @@ (get_local $11) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4220,7 +4224,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4340,7 +4344,7 @@ (get_local $16) (get_local $8) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $16) @@ -4362,7 +4366,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -4376,7 +4380,7 @@ ) (get_local $4) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4403,7 +4407,7 @@ (get_local $0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4466,7 +4470,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4506,7 +4510,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $24) @@ -4528,7 +4532,7 @@ (get_local $11) (get_local $0) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $24) @@ -4557,7 +4561,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $24) @@ -4675,7 +4679,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) (block (i32.store @@ -4721,7 +4725,7 @@ (i32.const 1512) (i32.shl (tee_local $6 - (block $do-once$67 + (block $do-once$67 i32 (if (tee_local $0 (i32.shr_u @@ -4729,12 +4733,14 @@ (i32.const 8) ) ) - (block - (br_if $do-once$67 - (i32.const 31) - (i32.gt_u - (get_local $14) - (i32.const 16777215) + (block i32 + (drop + (br_if $do-once$67 + (i32.const 31) + (i32.gt_u + (get_local $14) + (i32.const 16777215) + ) ) ) (i32.or @@ -4989,7 +4995,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $46) @@ -5060,7 +5066,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5388,7 +5394,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $47 (get_local $5) @@ -5700,7 +5706,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $48) @@ -5771,7 +5777,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6027,7 +6033,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6046,7 +6052,7 @@ ) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $8 (i32.add @@ -6104,7 +6110,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6212,7 +6218,7 @@ (get_local $11) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6221,7 +6227,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6272,7 +6278,7 @@ (get_local $1) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6289,7 +6295,7 @@ (set_local $10 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6423,7 +6429,7 @@ (get_local $9) (get_local $14) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $9) @@ -6445,7 +6451,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6459,7 +6465,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6486,7 +6492,7 @@ (get_local $1) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6556,7 +6562,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6604,7 +6610,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $4) @@ -6626,7 +6632,7 @@ (get_local $3) (get_local $1) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $4) @@ -6652,7 +6658,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $4) @@ -6697,7 +6703,7 @@ (get_local $2) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -6715,7 +6721,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.and @@ -6894,7 +6900,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6903,7 +6909,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6950,7 +6956,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6967,7 +6973,7 @@ (set_local $17 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7088,7 +7094,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -7112,7 +7118,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7126,7 +7132,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7153,7 +7159,7 @@ (get_local $9) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7217,7 +7223,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7256,7 +7262,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $12) @@ -7278,7 +7284,7 @@ (get_local $0) (get_local $9) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $12) @@ -7304,7 +7310,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $12) @@ -7410,7 +7416,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $15 (get_local $4) @@ -7694,7 +7700,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $18) @@ -7765,7 +7771,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7947,8 +7953,8 @@ (i32.load (i32.const 1160) ) - (block - (call_import $ra + (block i32 + (call $ra (i32.const 1) (get_local $0) ) @@ -7968,18 +7974,18 @@ ) (set_local $9 (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $12) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (get_local $9) ) - (block + (block i32 (i32.store (get_local $11) (i32.load @@ -7995,7 +8001,7 @@ (get_local $4) ) (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $11) ) @@ -8044,7 +8050,7 @@ ) ) ) - (block + (block i32 (i32.store (get_local $8) (tee_local $3 @@ -8084,7 +8090,7 @@ (get_local $4) (i32.const 2) ) - (block + (block i32 (i32.store (get_local $8) (i32.add @@ -8102,7 +8108,7 @@ ) (get_local $14) ) - (block + (block i32 (set_local $3 (get_local $5) ) @@ -8313,7 +8319,7 @@ ) ) (set_local $1 - (block $label$break$b + (block $label$break$b i32 (if (i32.gt_s (i32.load8_s offset=75 @@ -8321,7 +8327,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -8406,7 +8412,7 @@ (get_local $3) ) ) - (block + (block i32 (set_local $2 (i32.const 0) ) @@ -8597,10 +8603,10 @@ (func $_a (param $0 i32) (result i32) (local $1 i32) (local $2 i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.le_s (i32.load offset=76 @@ -8629,7 +8635,7 @@ (if (get_local $2) (get_local $1) - (block + (block i32 (call $Ta (get_local $0) ) @@ -8637,7 +8643,7 @@ ) ) ) - (block + (block i32 (set_local $0 (if (i32.load @@ -8651,7 +8657,7 @@ (i32.const 0) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (if @@ -8720,7 +8726,7 @@ (get_local $0) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (get_local $2) @@ -9020,7 +9026,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $0) (get_local $1) (get_local $2) @@ -9325,7 +9331,7 @@ ) ) (set_local $0 - (block $do-once$0 + (block $do-once$0 i32 (if (i32.lt_s (call $cb @@ -9335,7 +9341,7 @@ (i32.const 0) ) (i32.const 1) - (block + (block i32 (if (i32.ne (i32.load8_s offset=75 @@ -9434,7 +9440,7 @@ ) (i32.const 8) ) - (block + (block i32 (i32.store (get_local $0) (i32.or @@ -9444,7 +9450,7 @@ ) (i32.const -1) ) - (block + (block i32 (i32.store offset=8 (get_local $0) (i32.const 0) @@ -9497,7 +9503,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $5 (i32.eqz (call $Ya @@ -9515,7 +9521,7 @@ (if (get_local $5) (get_local $0) - (block + (block i32 (call $Ta (get_local $3) ) @@ -9533,7 +9539,7 @@ (get_local $4) ) (get_local $2) - (call_import $i32u-div + (call $i32u-div (get_local $0) (get_local $1) ) @@ -9584,14 +9590,14 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $3) ) ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $0) (i32.const -1) @@ -9655,7 +9661,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $3) ) @@ -9750,7 +9756,7 @@ ) (set_local $0 (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $2) ) @@ -9767,7 +9773,7 @@ (get_local $0) (i32.const -4096) ) - (block + (block i32 (i32.store (call $Qa) (i32.sub @@ -9867,7 +9873,7 @@ ) ) (func $ob (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (i32.const 0) @@ -9932,7 +9938,7 @@ ) ) (func $nb (param $0 i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (i32.const 0) @@ -9952,7 +9958,7 @@ (nop) ) (func $pb (param $0 i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise index 4e4891a8d..febb33861 100644 --- a/test/memorygrowth.fromasm.imprecise +++ b/test/memorygrowth.fromasm.imprecise @@ -1,17 +1,16 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) - (import "env" "STACKTOP" (global $r i32)) - (import "env" "STACK_MAX" (global $s i32)) - (import "env" "tempDoublePtr" (global $t i32)) - (import "env" "ABORT" (global $u i32)) - (import "global" "NaN" (global $z f64)) - (import "global" "Infinity" (global $A f64)) + (import "env" "STACKTOP" (global $r$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $s$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $t$asm2wasm$import i32)) + (import "env" "ABORT" (global $u$asm2wasm$import i32)) + (import "global" "NaN" (global $z$asm2wasm$import f64)) + (import "global" "Infinity" (global $A$asm2wasm$import f64)) (import "env" "abort" (func $ja (param i32))) (import "env" "_pthread_cleanup_pop" (func $oa (param i32))) (import "env" "___lock" (func $pa (param i32))) @@ -24,8 +23,8 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $fb)) @@ -48,31 +47,36 @@ (export "dynCall_iiii" (func $lb)) (export "dynCall_vi" (func $mb)) (export "__growWasmMemory" (func $__growWasmMemory)) - (global $v i32 (i32.const 0)) - (global $w i32 (i32.const 0)) - (global $x i32 (i32.const 0)) - (global $y i32 (i32.const 0)) - (global $B i32 (i32.const 0)) - (global $C i32 (i32.const 0)) - (global $D i32 (i32.const 0)) - (global $E i32 (i32.const 0)) - (global $F f64 (f64.const 0)) - (global $G i32 (i32.const 0)) - (global $H i32 (i32.const 0)) - (global $I i32 (i32.const 0)) - (global $J f64 (f64.const 0)) - (global $K i32 (i32.const 0)) - (global $L i32 (i32.const 0)) - (global $M i32 (i32.const 0)) - (global $N i32 (i32.const 0)) - (global $O i32 (i32.const 0)) - (global $P i32 (i32.const 0)) - (global $Q i32 (i32.const 0)) - (global $R i32 (i32.const 0)) - (global $S i32 (i32.const 0)) - (global $T i32 (i32.const 0)) - (global $za f64 (f64.const 0)) - (table 8 8 anyfunc) + (global $r (mut i32) (get_global $r$asm2wasm$import)) + (global $s (mut i32) (get_global $s$asm2wasm$import)) + (global $t (mut i32) (get_global $t$asm2wasm$import)) + (global $u (mut i32) (get_global $u$asm2wasm$import)) + (global $v (mut i32) (i32.const 0)) + (global $w (mut i32) (i32.const 0)) + (global $x (mut i32) (i32.const 0)) + (global $y (mut i32) (i32.const 0)) + (global $z (mut f64) (get_global $z$asm2wasm$import)) + (global $A (mut f64) (get_global $A$asm2wasm$import)) + (global $B (mut i32) (i32.const 0)) + (global $C (mut i32) (i32.const 0)) + (global $D (mut i32) (i32.const 0)) + (global $E (mut i32) (i32.const 0)) + (global $F (mut f64) (f64.const 0)) + (global $G (mut i32) (i32.const 0)) + (global $H (mut i32) (i32.const 0)) + (global $I (mut i32) (i32.const 0)) + (global $J (mut f64) (f64.const 0)) + (global $K (mut i32) (i32.const 0)) + (global $L (mut i32) (i32.const 0)) + (global $M (mut i32) (i32.const 0)) + (global $N (mut i32) (i32.const 0)) + (global $O (mut i32) (i32.const 0)) + (global $P (mut i32) (i32.const 0)) + (global $Q (mut i32) (i32.const 0)) + (global $R (mut i32) (i32.const 0)) + (global $S (mut i32) (i32.const 0)) + (global $T (mut i32) (i32.const 0)) + (global $za (mut f64) (f64.const 0)) (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $0 i32) (result i32) (local $1 i32) @@ -251,7 +255,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -275,7 +279,7 @@ (get_local $7) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -501,7 +505,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -530,7 +534,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -623,7 +627,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $41 (get_local $5) @@ -886,7 +890,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -898,7 +902,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $0 (i32.load offset=24 @@ -1005,7 +1009,7 @@ (get_local $6) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $6) @@ -1027,7 +1031,7 @@ ) (get_local $3) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -1041,7 +1045,7 @@ ) (get_local $1) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1068,7 +1072,7 @@ (get_local $17) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1133,7 +1137,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -1172,7 +1176,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $23) @@ -1189,7 +1193,7 @@ (get_local $3) (get_local $17) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $23) @@ -1215,7 +1219,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $23) @@ -1348,7 +1352,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $42 (get_local $6) @@ -1755,7 +1759,7 @@ (get_local $33) ) ) - (block + (block i32 (if (i32.eqz (tee_local $6 @@ -2016,7 +2020,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ge_u @@ -2028,7 +2032,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (set_local $5 (i32.load offset=24 @@ -2136,7 +2140,7 @@ (get_local $3) (get_local $10) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -2158,7 +2162,7 @@ ) (get_local $10) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -2172,7 +2176,7 @@ ) (get_local $11) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2199,7 +2203,7 @@ (get_local $3) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2264,7 +2268,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -2303,7 +2307,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $22) @@ -2320,7 +2324,7 @@ (get_local $10) (get_local $3) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $22) @@ -2346,7 +2350,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $22) @@ -2475,7 +2479,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $19 (get_local $2) @@ -2792,7 +2796,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $21) @@ -2863,7 +2867,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3193,7 +3197,7 @@ (if (i32.eq (tee_local $9 - (block $label$break$b + (block $label$break$b i32 (if (i32.and (i32.load @@ -3202,7 +3206,7 @@ (i32.const 4) ) (i32.const 188) - (block + (block i32 (block $label$break$c (if (tee_local $16 @@ -3282,7 +3286,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $7) ) ) @@ -3340,7 +3344,7 @@ (if (i32.ne (tee_local $16 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -3427,7 +3431,7 @@ (if (i32.eq (tee_local $19 - (call_import $ta + (call $ta (get_local $2) ) ) @@ -3517,14 +3521,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $0) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $19) ) ) @@ -3590,12 +3594,12 @@ (i32.and (i32.lt_u (tee_local $4 - (call_import $ta + (call $ta (get_local $13) ) ) (tee_local $13 - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -3846,7 +3850,7 @@ ) ) ) - (block + (block i32 (i32.store (i32.const 1224) (get_local $20) @@ -4089,7 +4093,7 @@ ) (i32.const 1) ) - (block + (block i32 (set_local $5 (i32.and (get_local $2) @@ -4141,7 +4145,7 @@ (get_local $21) (get_local $8) ) - (call_import $qa) + (call $qa) ) (br_if $do-once$53 (i32.eq @@ -4151,7 +4155,7 @@ (get_local $4) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4197,7 +4201,7 @@ (get_local $11) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4218,7 +4222,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4338,7 +4342,7 @@ (get_local $16) (get_local $8) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $16) @@ -4360,7 +4364,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -4374,7 +4378,7 @@ ) (get_local $4) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4401,7 +4405,7 @@ (get_local $0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -4464,7 +4468,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -4504,7 +4508,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $24) @@ -4526,7 +4530,7 @@ (get_local $11) (get_local $0) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $24) @@ -4555,7 +4559,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $24) @@ -4673,7 +4677,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) (block (i32.store @@ -4719,7 +4723,7 @@ (i32.const 1512) (i32.shl (tee_local $6 - (block $do-once$67 + (block $do-once$67 i32 (if (tee_local $0 (i32.shr_u @@ -4727,12 +4731,14 @@ (i32.const 8) ) ) - (block - (br_if $do-once$67 - (i32.const 31) - (i32.gt_u - (get_local $14) - (i32.const 16777215) + (block i32 + (drop + (br_if $do-once$67 + (i32.const 31) + (i32.gt_u + (get_local $14) + (i32.const 16777215) + ) ) ) (i32.or @@ -4987,7 +4993,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $46) @@ -5058,7 +5064,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5386,7 +5392,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $47 (get_local $5) @@ -5698,7 +5704,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $48) @@ -5769,7 +5775,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6025,7 +6031,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6044,7 +6050,7 @@ ) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $8 (i32.add @@ -6102,7 +6108,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6210,7 +6216,7 @@ (get_local $11) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6219,7 +6225,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6270,7 +6276,7 @@ (get_local $1) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6287,7 +6293,7 @@ (set_local $10 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6421,7 +6427,7 @@ (get_local $9) (get_local $14) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $9) @@ -6443,7 +6449,7 @@ ) (get_local $14) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6457,7 +6463,7 @@ ) (get_local $0) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6484,7 +6490,7 @@ (get_local $1) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6554,7 +6560,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6602,7 +6608,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $4) @@ -6624,7 +6630,7 @@ (get_local $3) (get_local $1) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $4) @@ -6650,7 +6656,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $4) @@ -6695,7 +6701,7 @@ (get_local $2) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -6713,7 +6719,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.and @@ -6892,7 +6898,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -6901,7 +6907,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6948,7 +6954,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -6965,7 +6971,7 @@ (set_local $17 (get_local $3) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7086,7 +7092,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $3) @@ -7110,7 +7116,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7124,7 +7130,7 @@ ) (get_local $8) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7151,7 +7157,7 @@ (get_local $9) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7215,7 +7221,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7254,7 +7260,7 @@ ) ) ) - (call_import $qa) + (call $qa) ) (i32.store offset=24 (get_local $12) @@ -7276,7 +7282,7 @@ (get_local $0) (get_local $9) ) - (call_import $qa) + (call $qa) (block (i32.store offset=16 (get_local $12) @@ -7302,7 +7308,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store offset=20 (get_local $12) @@ -7408,7 +7414,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $15 (get_local $4) @@ -7692,7 +7698,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $18) @@ -7763,7 +7769,7 @@ (i32.const 0) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7945,8 +7951,8 @@ (i32.load (i32.const 1160) ) - (block - (call_import $ra + (block i32 + (call $ra (i32.const 1) (get_local $0) ) @@ -7966,18 +7972,18 @@ ) (set_local $9 (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $12) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (get_local $9) ) - (block + (block i32 (i32.store (get_local $11) (i32.load @@ -7993,7 +7999,7 @@ (get_local $4) ) (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $11) ) @@ -8042,7 +8048,7 @@ ) ) ) - (block + (block i32 (i32.store (get_local $8) (tee_local $3 @@ -8082,7 +8088,7 @@ (get_local $4) (i32.const 2) ) - (block + (block i32 (i32.store (get_local $8) (i32.add @@ -8100,7 +8106,7 @@ ) (get_local $14) ) - (block + (block i32 (set_local $3 (get_local $5) ) @@ -8311,7 +8317,7 @@ ) ) (set_local $1 - (block $label$break$b + (block $label$break$b i32 (if (i32.gt_s (i32.load8_s offset=75 @@ -8319,7 +8325,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $3 (get_local $1) ) @@ -8404,7 +8410,7 @@ (get_local $3) ) ) - (block + (block i32 (set_local $2 (i32.const 0) ) @@ -8595,10 +8601,10 @@ (func $_a (param $0 i32) (result i32) (local $1 i32) (local $2 i32) - (block $do-once$0 + (block $do-once$0 i32 (if (get_local $0) - (block + (block i32 (if (i32.le_s (i32.load offset=76 @@ -8627,7 +8633,7 @@ (if (get_local $2) (get_local $1) - (block + (block i32 (call $Ta (get_local $0) ) @@ -8635,7 +8641,7 @@ ) ) ) - (block + (block i32 (set_local $0 (if (i32.load @@ -8649,7 +8655,7 @@ (i32.const 0) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (if @@ -8718,7 +8724,7 @@ (get_local $0) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (get_local $2) @@ -9018,7 +9024,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $0) (get_local $1) (get_local $2) @@ -9323,7 +9329,7 @@ ) ) (set_local $0 - (block $do-once$0 + (block $do-once$0 i32 (if (i32.lt_s (call $cb @@ -9333,7 +9339,7 @@ (i32.const 0) ) (i32.const 1) - (block + (block i32 (if (i32.ne (i32.load8_s offset=75 @@ -9432,7 +9438,7 @@ ) (i32.const 8) ) - (block + (block i32 (i32.store (get_local $0) (i32.or @@ -9442,7 +9448,7 @@ ) (i32.const -1) ) - (block + (block i32 (i32.store offset=8 (get_local $0) (i32.const 0) @@ -9495,7 +9501,7 @@ ) (i32.const -1) ) - (block + (block i32 (set_local $5 (i32.eqz (call $Ya @@ -9513,7 +9519,7 @@ (if (get_local $5) (get_local $0) - (block + (block i32 (call $Ta (get_local $3) ) @@ -9582,14 +9588,14 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $3) ) ) (i32.const 0) ) - (block + (block i32 (i32.store (get_local $0) (i32.const -1) @@ -9653,7 +9659,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $3) ) @@ -9748,7 +9754,7 @@ ) (set_local $0 (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $2) ) @@ -9765,7 +9771,7 @@ (get_local $0) (i32.const -4096) ) - (block + (block i32 (i32.store (call $Qa) (i32.sub @@ -9865,7 +9871,7 @@ ) ) (func $ob (param $0 i32) (param $1 i32) (param $2 i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (i32.const 0) @@ -9930,7 +9936,7 @@ ) ) (func $nb (param $0 i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (i32.const 0) @@ -9950,7 +9956,7 @@ (nop) ) (func $pb (param $0 i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts index 064c1d821..0de4e25b3 100644 --- a/test/memorygrowth.fromasm.imprecise.no-opts +++ b/test/memorygrowth.fromasm.imprecise.no-opts @@ -1,17 +1,16 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) - (import "env" "STACKTOP" (global $r i32)) - (import "env" "STACK_MAX" (global $s i32)) - (import "env" "tempDoublePtr" (global $t i32)) - (import "env" "ABORT" (global $u i32)) - (import "global" "NaN" (global $z f64)) - (import "global" "Infinity" (global $A f64)) + (import "env" "STACKTOP" (global $r$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $s$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $t$asm2wasm$import i32)) + (import "env" "ABORT" (global $u$asm2wasm$import i32)) + (import "global" "NaN" (global $z$asm2wasm$import f64)) + (import "global" "Infinity" (global $A$asm2wasm$import f64)) (import "env" "abort" (func $ja (param i32))) (import "env" "_pthread_cleanup_pop" (func $oa (param i32))) (import "env" "___lock" (func $pa (param i32))) @@ -24,8 +23,8 @@ (import "env" "___syscall54" (func $wa (param i32 i32) (result i32))) (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $fb)) @@ -48,31 +47,36 @@ (export "dynCall_iiii" (func $lb)) (export "dynCall_vi" (func $mb)) (export "__growWasmMemory" (func $__growWasmMemory)) - (global $v i32 (i32.const 0)) - (global $w i32 (i32.const 0)) - (global $x i32 (i32.const 0)) - (global $y i32 (i32.const 0)) - (global $B i32 (i32.const 0)) - (global $C i32 (i32.const 0)) - (global $D i32 (i32.const 0)) - (global $E i32 (i32.const 0)) - (global $F f64 (f64.const 0)) - (global $G i32 (i32.const 0)) - (global $H i32 (i32.const 0)) - (global $I i32 (i32.const 0)) - (global $J f64 (f64.const 0)) - (global $K i32 (i32.const 0)) - (global $L i32 (i32.const 0)) - (global $M i32 (i32.const 0)) - (global $N i32 (i32.const 0)) - (global $O i32 (i32.const 0)) - (global $P i32 (i32.const 0)) - (global $Q i32 (i32.const 0)) - (global $R i32 (i32.const 0)) - (global $S i32 (i32.const 0)) - (global $T i32 (i32.const 0)) - (global $za f64 (f64.const 0)) - (table 8 8 anyfunc) + (global $r (mut i32) (get_global $r$asm2wasm$import)) + (global $s (mut i32) (get_global $s$asm2wasm$import)) + (global $t (mut i32) (get_global $t$asm2wasm$import)) + (global $u (mut i32) (get_global $u$asm2wasm$import)) + (global $v (mut i32) (i32.const 0)) + (global $w (mut i32) (i32.const 0)) + (global $x (mut i32) (i32.const 0)) + (global $y (mut i32) (i32.const 0)) + (global $z (mut f64) (get_global $z$asm2wasm$import)) + (global $A (mut f64) (get_global $A$asm2wasm$import)) + (global $B (mut i32) (i32.const 0)) + (global $C (mut i32) (i32.const 0)) + (global $D (mut i32) (i32.const 0)) + (global $E (mut i32) (i32.const 0)) + (global $F (mut f64) (f64.const 0)) + (global $G (mut i32) (i32.const 0)) + (global $H (mut i32) (i32.const 0)) + (global $I (mut i32) (i32.const 0)) + (global $J (mut f64) (f64.const 0)) + (global $K (mut i32) (i32.const 0)) + (global $L (mut i32) (i32.const 0)) + (global $M (mut i32) (i32.const 0)) + (global $N (mut i32) (i32.const 0)) + (global $O (mut i32) (i32.const 0)) + (global $P (mut i32) (i32.const 0)) + (global $Q (mut i32) (i32.const 0)) + (global $R (mut i32) (i32.const 0)) + (global $S (mut i32) (i32.const 0)) + (global $T (mut i32) (i32.const 0)) + (global $za (mut f64) (f64.const 0)) (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $a i32) (result i32) (local $b i32) @@ -299,7 +303,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -325,7 +329,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -578,7 +582,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $n (i32.add @@ -609,7 +613,7 @@ ) (br $do-once$4) ) - (call_import $qa) + (call $qa) ) ) ) @@ -737,7 +741,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $w (get_local $g) @@ -1033,7 +1037,7 @@ (get_local $A) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.add @@ -1046,7 +1050,7 @@ (get_local $A) (get_local $g) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.load @@ -1193,7 +1197,7 @@ (get_local $G) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $G) @@ -1220,7 +1224,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -1235,7 +1239,7 @@ ) (get_local $A) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -1264,7 +1268,7 @@ ) (br $do-once$8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1334,7 +1338,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -1379,7 +1383,7 @@ (get_local $C) (get_local $o) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -1404,7 +1408,7 @@ (get_local $s) (get_local $o) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1442,7 +1446,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1620,7 +1624,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $H (get_local $f) @@ -2385,7 +2389,7 @@ (get_local $V) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $i (i32.add @@ -2398,7 +2402,7 @@ (get_local $V) (get_local $i) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.load @@ -2545,7 +2549,7 @@ (get_local $_) (get_local $q) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $_) @@ -2572,7 +2576,7 @@ (get_local $d) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -2587,7 +2591,7 @@ ) (get_local $V) ) - (call_import $qa) + (call $qa) ) (set_local $t (i32.add @@ -2616,7 +2620,7 @@ ) (br $do-once$21) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2686,7 +2690,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $s (i32.add @@ -2731,7 +2735,7 @@ (get_local $W) (get_local $s) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -2756,7 +2760,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2794,7 +2798,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2966,7 +2970,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $$ (get_local $d) @@ -3317,7 +3321,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $da) @@ -3415,7 +3419,7 @@ ) (br $do-once$29) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3895,7 +3899,7 @@ ) (block (set_local $$ - (call_import $ta + (call $ta (get_local $aa) ) ) @@ -3954,7 +3958,7 @@ ) (block (set_local $U - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -4052,7 +4056,7 @@ ) ) (set_local $$ - (call_import $ta + (call $ta (get_local $la) ) ) @@ -4151,14 +4155,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $e) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $$) ) ) @@ -4235,12 +4239,12 @@ ) (block (set_local $ma - (call_import $ta + (call $ta (get_local $c) ) ) (set_local $c - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -5028,7 +5032,7 @@ (get_local $da) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -5042,7 +5046,7 @@ ) (br $do-once$53) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5088,7 +5092,7 @@ (get_local $V) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -5110,7 +5114,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5272,7 +5276,7 @@ (get_local $Ca) (get_local $sa) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ca) @@ -5299,7 +5303,7 @@ (get_local $aa) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $ba (i32.add @@ -5314,7 +5318,7 @@ ) (get_local $ma) ) - (call_import $qa) + (call $qa) ) (set_local $U (i32.add @@ -5343,7 +5347,7 @@ ) (br $do-once$57) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5413,7 +5417,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $V (i32.add @@ -5459,7 +5463,7 @@ (get_local $ya) (get_local $e) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -5487,7 +5491,7 @@ (get_local $V) (get_local $e) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5529,7 +5533,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5695,7 +5699,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6043,7 +6047,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ja) @@ -6141,7 +6145,7 @@ ) (br $do-once$50) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6548,7 +6552,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $Ma (get_local $ga) @@ -6893,7 +6897,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ra) @@ -6991,7 +6995,7 @@ ) (br $do-once$42) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7149,7 +7153,7 @@ (get_local $b) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $d (i32.load @@ -7170,7 +7174,7 @@ (get_local $a) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.and @@ -7224,7 +7228,7 @@ (get_local $h) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7345,7 +7349,7 @@ (get_local $g) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7357,7 +7361,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7408,7 +7412,7 @@ (get_local $j) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7426,7 +7430,7 @@ (set_local $p (get_local $o) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7595,7 +7599,7 @@ (get_local $w) (get_local $c) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $w) @@ -7622,7 +7626,7 @@ (get_local $l) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $q (i32.add @@ -7637,7 +7641,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7666,7 +7670,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7751,7 +7755,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $j (i32.add @@ -7804,7 +7808,7 @@ (get_local $s) (get_local $j) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -7832,7 +7836,7 @@ (get_local $o) (get_local $j) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7880,7 +7884,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7924,7 +7928,7 @@ (get_local $m) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -7944,7 +7948,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -8115,7 +8119,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -8127,7 +8131,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8174,7 +8178,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8192,7 +8196,7 @@ (set_local $x (get_local $u) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8356,7 +8360,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $C) @@ -8385,7 +8389,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $p (i32.add @@ -8400,7 +8404,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8429,7 +8433,7 @@ ) (br $do-once$10) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8498,7 +8502,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $w (i32.add @@ -8543,7 +8547,7 @@ (get_local $y) (get_local $w) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -8571,7 +8575,7 @@ (get_local $h) (get_local $w) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8609,7 +8613,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8779,7 +8783,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $E (get_local $s) @@ -9127,7 +9131,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $J) @@ -9225,7 +9229,7 @@ ) (br $do-once$16) ) - (call_import $qa) + (call $qa) ) ) ) @@ -9433,7 +9437,7 @@ ) (set_local $o (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $e) ) @@ -9441,7 +9445,7 @@ ) ) (block - (call_import $ra + (call $ra (i32.const 1) (get_local $a) ) @@ -9467,13 +9471,13 @@ ) (set_local $l (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $f) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (set_local $o @@ -10246,7 +10250,7 @@ ) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (set_local $c @@ -10349,7 +10353,7 @@ ) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (set_local $h @@ -10749,7 +10753,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $a) (get_local $b) (get_local $c) @@ -11444,7 +11448,7 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $e) ) @@ -11532,7 +11536,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $e) ) @@ -11678,7 +11682,7 @@ ) (set_local $a (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $c) ) @@ -11852,7 +11856,7 @@ ) ) (func $ob (param $a i32) (param $b i32) (param $c i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (return @@ -11925,7 +11929,7 @@ ) ) (func $nb (param $a i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (return @@ -11951,7 +11955,7 @@ (return) ) (func $pb (param $a i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts index 0639416ea..124e87a18 100644 --- a/test/memorygrowth.fromasm.no-opts +++ b/test/memorygrowth.fromasm.no-opts @@ -1,17 +1,16 @@ (module - (memory 256 256) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$v (func)) (type $FUNCSIG$vii (func (param i32 i32))) - (import "env" "STACKTOP" (global $r i32)) - (import "env" "STACK_MAX" (global $s i32)) - (import "env" "tempDoublePtr" (global $t i32)) - (import "env" "ABORT" (global $u i32)) - (import "global" "NaN" (global $z f64)) - (import "global" "Infinity" (global $A f64)) + (import "env" "STACKTOP" (global $r$asm2wasm$import i32)) + (import "env" "STACK_MAX" (global $s$asm2wasm$import i32)) + (import "env" "tempDoublePtr" (global $t$asm2wasm$import i32)) + (import "env" "ABORT" (global $u$asm2wasm$import i32)) + (import "global" "NaN" (global $z$asm2wasm$import f64)) + (import "global" "Infinity" (global $A$asm2wasm$import f64)) (import "env" "abort" (func $ja (param i32))) (import "env" "_pthread_cleanup_pop" (func $oa (param i32))) (import "env" "___lock" (func $pa (param i32))) @@ -25,8 +24,8 @@ (import "env" "___unlock" (func $xa (param i32))) (import "env" "___syscall146" (func $ya (param i32 i32) (result i32))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 8 8 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_free" (func $fb)) @@ -49,31 +48,36 @@ (export "dynCall_iiii" (func $lb)) (export "dynCall_vi" (func $mb)) (export "__growWasmMemory" (func $__growWasmMemory)) - (global $v i32 (i32.const 0)) - (global $w i32 (i32.const 0)) - (global $x i32 (i32.const 0)) - (global $y i32 (i32.const 0)) - (global $B i32 (i32.const 0)) - (global $C i32 (i32.const 0)) - (global $D i32 (i32.const 0)) - (global $E i32 (i32.const 0)) - (global $F f64 (f64.const 0)) - (global $G i32 (i32.const 0)) - (global $H i32 (i32.const 0)) - (global $I i32 (i32.const 0)) - (global $J f64 (f64.const 0)) - (global $K i32 (i32.const 0)) - (global $L i32 (i32.const 0)) - (global $M i32 (i32.const 0)) - (global $N i32 (i32.const 0)) - (global $O i32 (i32.const 0)) - (global $P i32 (i32.const 0)) - (global $Q i32 (i32.const 0)) - (global $R i32 (i32.const 0)) - (global $S i32 (i32.const 0)) - (global $T i32 (i32.const 0)) - (global $za f64 (f64.const 0)) - (table 8 8 anyfunc) + (global $r (mut i32) (get_global $r$asm2wasm$import)) + (global $s (mut i32) (get_global $s$asm2wasm$import)) + (global $t (mut i32) (get_global $t$asm2wasm$import)) + (global $u (mut i32) (get_global $u$asm2wasm$import)) + (global $v (mut i32) (i32.const 0)) + (global $w (mut i32) (i32.const 0)) + (global $x (mut i32) (i32.const 0)) + (global $y (mut i32) (i32.const 0)) + (global $z (mut f64) (get_global $z$asm2wasm$import)) + (global $A (mut f64) (get_global $A$asm2wasm$import)) + (global $B (mut i32) (i32.const 0)) + (global $C (mut i32) (i32.const 0)) + (global $D (mut i32) (i32.const 0)) + (global $E (mut i32) (i32.const 0)) + (global $F (mut f64) (f64.const 0)) + (global $G (mut i32) (i32.const 0)) + (global $H (mut i32) (i32.const 0)) + (global $I (mut i32) (i32.const 0)) + (global $J (mut f64) (f64.const 0)) + (global $K (mut i32) (i32.const 0)) + (global $L (mut i32) (i32.const 0)) + (global $M (mut i32) (i32.const 0)) + (global $N (mut i32) (i32.const 0)) + (global $O (mut i32) (i32.const 0)) + (global $P (mut i32) (i32.const 0)) + (global $Q (mut i32) (i32.const 0)) + (global $R (mut i32) (i32.const 0)) + (global $S (mut i32) (i32.const 0)) + (global $T (mut i32) (i32.const 0)) + (global $za (mut f64) (f64.const 0)) (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa) (func $eb (param $a i32) (result i32) (local $b i32) @@ -300,7 +304,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -326,7 +330,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -579,7 +583,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $n (i32.add @@ -610,7 +614,7 @@ ) (br $do-once$4) ) - (call_import $qa) + (call $qa) ) ) ) @@ -738,7 +742,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $w (get_local $g) @@ -1034,7 +1038,7 @@ (get_local $A) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.add @@ -1047,7 +1051,7 @@ (get_local $A) (get_local $g) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.load @@ -1194,7 +1198,7 @@ (get_local $G) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $G) @@ -1221,7 +1225,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -1236,7 +1240,7 @@ ) (get_local $A) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -1265,7 +1269,7 @@ ) (br $do-once$8) ) - (call_import $qa) + (call $qa) ) ) ) @@ -1335,7 +1339,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -1380,7 +1384,7 @@ (get_local $C) (get_local $o) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -1405,7 +1409,7 @@ (get_local $s) (get_local $o) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1443,7 +1447,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -1621,7 +1625,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $H (get_local $f) @@ -2386,7 +2390,7 @@ (get_local $V) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $i (i32.add @@ -2399,7 +2403,7 @@ (get_local $V) (get_local $i) ) - (call_import $qa) + (call $qa) ) (set_local $g (i32.load @@ -2546,7 +2550,7 @@ (get_local $_) (get_local $q) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $_) @@ -2573,7 +2577,7 @@ (get_local $d) (get_local $q) ) - (call_import $qa) + (call $qa) ) (set_local $f (i32.add @@ -2588,7 +2592,7 @@ ) (get_local $V) ) - (call_import $qa) + (call $qa) ) (set_local $t (i32.add @@ -2617,7 +2621,7 @@ ) (br $do-once$21) ) - (call_import $qa) + (call $qa) ) ) ) @@ -2687,7 +2691,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $s (i32.add @@ -2732,7 +2736,7 @@ (get_local $W) (get_local $s) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -2757,7 +2761,7 @@ (get_local $q) (get_local $s) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2795,7 +2799,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -2967,7 +2971,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $$ (get_local $d) @@ -3318,7 +3322,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $da) @@ -3416,7 +3420,7 @@ ) (br $do-once$29) ) - (call_import $qa) + (call $qa) ) ) ) @@ -3896,7 +3900,7 @@ ) (block (set_local $$ - (call_import $ta + (call $ta (get_local $aa) ) ) @@ -3955,7 +3959,7 @@ ) (block (set_local $U - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -4053,7 +4057,7 @@ ) ) (set_local $$ - (call_import $ta + (call $ta (get_local $la) ) ) @@ -4152,14 +4156,14 @@ ) (if (i32.eq - (call_import $ta + (call $ta (get_local $e) ) (i32.const -1) ) (block (drop - (call_import $ta + (call $ta (get_local $$) ) ) @@ -4236,12 +4240,12 @@ ) (block (set_local $ma - (call_import $ta + (call $ta (get_local $c) ) ) (set_local $c - (call_import $ta + (call $ta (i32.const 0) ) ) @@ -5029,7 +5033,7 @@ (get_local $da) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -5043,7 +5047,7 @@ ) (br $do-once$53) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5089,7 +5093,7 @@ (get_local $V) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -5111,7 +5115,7 @@ (br $do-once$55) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5273,7 +5277,7 @@ (get_local $Ca) (get_local $sa) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ca) @@ -5300,7 +5304,7 @@ (get_local $aa) (get_local $sa) ) - (call_import $qa) + (call $qa) ) (set_local $ba (i32.add @@ -5315,7 +5319,7 @@ ) (get_local $ma) ) - (call_import $qa) + (call $qa) ) (set_local $U (i32.add @@ -5344,7 +5348,7 @@ ) (br $do-once$57) ) - (call_import $qa) + (call $qa) ) ) ) @@ -5414,7 +5418,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $V (i32.add @@ -5460,7 +5464,7 @@ (get_local $ya) (get_local $e) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -5488,7 +5492,7 @@ (get_local $V) (get_local $e) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5530,7 +5534,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -5696,7 +5700,7 @@ (br $do-once$65) ) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6044,7 +6048,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ja) @@ -6142,7 +6146,7 @@ ) (br $do-once$50) ) - (call_import $qa) + (call $qa) ) ) ) @@ -6549,7 +6553,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $Ma (get_local $ga) @@ -6894,7 +6898,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $Ra) @@ -6992,7 +6996,7 @@ ) (br $do-once$42) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7150,7 +7154,7 @@ (get_local $b) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $d (i32.load @@ -7171,7 +7175,7 @@ (get_local $a) (i32.const 1) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.and @@ -7225,7 +7229,7 @@ (get_local $h) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.eq @@ -7346,7 +7350,7 @@ (get_local $g) (get_local $c) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -7358,7 +7362,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7409,7 +7413,7 @@ (get_local $j) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7427,7 +7431,7 @@ (set_local $p (get_local $o) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7596,7 +7600,7 @@ (get_local $w) (get_local $c) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $w) @@ -7623,7 +7627,7 @@ (get_local $l) (get_local $c) ) - (call_import $qa) + (call $qa) ) (set_local $q (i32.add @@ -7638,7 +7642,7 @@ ) (get_local $h) ) - (call_import $qa) + (call $qa) ) (set_local $o (i32.add @@ -7667,7 +7671,7 @@ ) (br $do-once$2) ) - (call_import $qa) + (call $qa) ) ) ) @@ -7752,7 +7756,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $j (i32.add @@ -7805,7 +7809,7 @@ (get_local $s) (get_local $j) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -7833,7 +7837,7 @@ (get_local $o) (get_local $j) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7881,7 +7885,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -7925,7 +7929,7 @@ (get_local $m) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $e (i32.add @@ -7945,7 +7949,7 @@ (i32.const 1) ) ) - (call_import $qa) + (call $qa) ) (if (i32.eqz @@ -8116,7 +8120,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (if (i32.ne @@ -8128,7 +8132,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8175,7 +8179,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8193,7 +8197,7 @@ (set_local $x (get_local $u) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8357,7 +8361,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $C) @@ -8386,7 +8390,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $p (i32.add @@ -8401,7 +8405,7 @@ ) (get_local $f) ) - (call_import $qa) + (call $qa) ) (set_local $u (i32.add @@ -8430,7 +8434,7 @@ ) (br $do-once$10) ) - (call_import $qa) + (call $qa) ) ) ) @@ -8499,7 +8503,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) ) (set_local $w (i32.add @@ -8544,7 +8548,7 @@ (get_local $y) (get_local $w) ) - (call_import $qa) + (call $qa) ) (i32.store (i32.add @@ -8572,7 +8576,7 @@ (get_local $h) (get_local $w) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8610,7 +8614,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (i32.add @@ -8780,7 +8784,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (set_local $E (get_local $s) @@ -9128,7 +9132,7 @@ (i32.const 1224) ) ) - (call_import $qa) + (call $qa) (block (i32.store (get_local $J) @@ -9226,7 +9230,7 @@ ) (br $do-once$16) ) - (call_import $qa) + (call $qa) ) ) ) @@ -9434,7 +9438,7 @@ ) (set_local $o (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $e) ) @@ -9442,7 +9446,7 @@ ) ) (block - (call_import $ra + (call $ra (i32.const 1) (get_local $a) ) @@ -9468,13 +9472,13 @@ ) (set_local $l (call $Pa - (call_import $ya + (call $ya (i32.const 146) (get_local $f) ) ) ) - (call_import $oa + (call $oa (i32.const 0) ) (set_local $o @@ -10247,7 +10251,7 @@ ) ) ) - (call_import $pa + (call $pa (i32.const 1188) ) (set_local $c @@ -10350,7 +10354,7 @@ ) ) ) - (call_import $xa + (call $xa (i32.const 1188) ) (set_local $h @@ -10750,7 +10754,7 @@ (i32.const 4096) ) (return - (call_import $va + (call $va (get_local $a) (get_local $b) (get_local $c) @@ -11372,7 +11376,7 @@ (get_local $c) ) (set_local $i - (call_import $i32u-div + (call $i32u-div (get_local $h) (get_local $b) ) @@ -11445,7 +11449,7 @@ (if (i32.lt_s (call $Pa - (call_import $ua + (call $ua (i32.const 140) (get_local $e) ) @@ -11533,7 +11537,7 @@ ) ) (if - (call_import $wa + (call $wa (i32.const 54) (get_local $e) ) @@ -11679,7 +11683,7 @@ ) (set_local $a (call $Pa - (call_import $sa + (call $sa (i32.const 6) (get_local $c) ) @@ -11853,7 +11857,7 @@ ) ) (func $ob (param $a i32) (param $b i32) (param $c i32) (result i32) - (call_import $ja + (call $ja (i32.const 1) ) (return @@ -11926,7 +11930,7 @@ ) ) (func $nb (param $a i32) (result i32) - (call_import $ja + (call $ja (i32.const 0) ) (return @@ -11952,7 +11956,7 @@ (return) ) (func $pb (param $a i32) - (call_import $ja + (call $ja (i32.const 2) ) ) diff --git a/test/min.fromasm b/test/min.fromasm index a912c2dad..0c5a14670 100644 --- a/test/min.fromasm +++ b/test/min.fromasm @@ -1,14 +1,14 @@ (module - (memory 256 256) (data (get_global $memoryBase) "min.asm.js") - (import "env" "tempDoublePtr" (global $tDP i32)) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "floats" (func $floats)) (export "getTempRet0" (func $ub)) - (global $M i32 (i32.const 0)) + (global $tDP (mut i32) (get_global $tDP$asm2wasm$import)) + (global $M (mut i32) (i32.const 0)) (func $floats (param $0 f32) (result f32) (local $1 f32) (f32.add diff --git a/test/min.fromasm.imprecise b/test/min.fromasm.imprecise index a57298eef..485e2593c 100644 --- a/test/min.fromasm.imprecise +++ b/test/min.fromasm.imprecise @@ -1,13 +1,13 @@ (module - (memory 256 256) - (import "env" "tempDoublePtr" (global $tDP i32)) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "floats" (func $floats)) (export "getTempRet0" (func $ub)) - (global $M i32 (i32.const 0)) + (global $tDP (mut i32) (get_global $tDP$asm2wasm$import)) + (global $M (mut i32) (i32.const 0)) (func $floats (param $0 f32) (result f32) (local $1 f32) (f32.add diff --git a/test/min.fromasm.imprecise.no-opts b/test/min.fromasm.imprecise.no-opts index c0fcb1917..89326688f 100644 --- a/test/min.fromasm.imprecise.no-opts +++ b/test/min.fromasm.imprecise.no-opts @@ -1,13 +1,13 @@ (module - (memory 256 256) - (import "env" "tempDoublePtr" (global $tDP i32)) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "floats" (func $floats)) (export "getTempRet0" (func $ub)) - (global $M i32 (i32.const 0)) + (global $tDP (mut i32) (get_global $tDP$asm2wasm$import)) + (global $M (mut i32) (i32.const 0)) (func $floats (param $f f32) (result f32) (local $t f32) (return @@ -21,7 +21,7 @@ (local $n f32) (set_local $n (f32.neg - (block + (block f32 (i32.store (get_local $k) (get_local $p) diff --git a/test/min.fromasm.no-opts b/test/min.fromasm.no-opts index c0fcb1917..89326688f 100644 --- a/test/min.fromasm.no-opts +++ b/test/min.fromasm.no-opts @@ -1,13 +1,13 @@ (module - (memory 256 256) - (import "env" "tempDoublePtr" (global $tDP i32)) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "tempDoublePtr" (global $tDP$asm2wasm$import i32)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "floats" (func $floats)) (export "getTempRet0" (func $ub)) - (global $M i32 (i32.const 0)) + (global $tDP (mut i32) (get_global $tDP$asm2wasm$import)) + (global $M (mut i32) (i32.const 0)) (func $floats (param $f f32) (result f32) (local $t f32) (return @@ -21,7 +21,7 @@ (local $n f32) (set_local $n (f32.neg - (block + (block f32 (i32.store (get_local $k) (get_local $p) diff --git a/test/min.wast b/test/min.wast index e5472fb77..53587b679 100644 --- a/test/min.wast +++ b/test/min.wast @@ -16,7 +16,7 @@ (local $n f32) (tee_local $n (f32.neg - (block $block0 + (block $block0 f32 (i32.store (get_local $k) (get_local $p) @@ -29,7 +29,7 @@ ) ) (func $littleswitch (type $2) (param $x i32) (result i32) - (block $topmost + (block $topmost i32 (block $switch-case$2 (block $switch-case$1 (br_table $switch-case$1 $switch-case$2 $switch-case$1 @@ -50,7 +50,7 @@ ) ) (func $f1 (type $3) (param $i1 i32) (param $i2 i32) (param $i3 i32) (result i32) - (block $topmost + (block $topmost i32 (get_local $i3) ) ) diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary index 33515c61c..56b97fc0d 100644 --- a/test/min.wast.fromBinary +++ b/test/min.wast.fromBinary @@ -16,7 +16,7 @@ (local $var$2 f32) (tee_local $var$2 (f32.neg - (block $label$0 + (block $label$0 f32 (i32.store (get_local $var$0) (get_local $var$1) @@ -29,7 +29,7 @@ ) ) (func $littleswitch (type $2) (param $var$0 i32) (result i32) - (block $label$0 + (block $label$0 i32 (block $label$1 (block $label$2 (br_table $label$2 $label$1 $label$2 @@ -50,7 +50,7 @@ ) ) (func $f1 (type $3) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) - (block $label$0 + (block $label$0 i32 (get_local $var$2) ) ) diff --git a/test/passes/coalesce-locals-learning.txt b/test/passes/coalesce-locals-learning.txt index f5622d097..06b96b497 100644 --- a/test/passes/coalesce-locals-learning.txt +++ b/test/passes/coalesce-locals-learning.txt @@ -281,7 +281,7 @@ (get_local $1) ) ) - (func $if-through2 (type $2) + (func $if-through3 (type $2) (local $0 i32) (local $1 i32) (set_local $0 @@ -440,7 +440,7 @@ (get_local $4) ) ) - (func $interfere-in-dead (type $2) + (func $interfere-in-dead4 (type $2) (local $0 i32) (local $1 i32) (block $block diff --git a/test/passes/coalesce-locals-learning.wast b/test/passes/coalesce-locals-learning.wast index 469a034ba..23fc9cba8 100644 --- a/test/passes/coalesce-locals-learning.wast +++ b/test/passes/coalesce-locals-learning.wast @@ -289,7 +289,7 @@ (get_local $y) ) ) - (func $if-through2 (type $2) + (func $if-through3 (type $2) (local $x i32) (local $y i32) (set_local $x @@ -453,7 +453,7 @@ (get_local $w) ) ) - (func $interfere-in-dead (type $2) + (func $interfere-in-dead4 (type $2) (local $x i32) (local $y i32) (block $block diff --git a/test/passes/coalesce-locals.txt b/test/passes/coalesce-locals.txt index db7098ab6..a6af3d5d1 100644 --- a/test/passes/coalesce-locals.txt +++ b/test/passes/coalesce-locals.txt @@ -281,7 +281,7 @@ (get_local $1) ) ) - (func $if-through2 (type $2) + (func $if-through3 (type $2) (local $0 i32) (local $1 i32) (set_local $0 @@ -438,7 +438,7 @@ (get_local $4) ) ) - (func $interfere-in-dead (type $2) + (func $interfere-in-dead4 (type $2) (local $0 i32) (local $1 i32) (block $block diff --git a/test/passes/coalesce-locals.wast b/test/passes/coalesce-locals.wast index cd763af10..da71b7665 100644 --- a/test/passes/coalesce-locals.wast +++ b/test/passes/coalesce-locals.wast @@ -289,7 +289,7 @@ (get_local $y) ) ) - (func $if-through2 (type $2) + (func $if-through3 (type $2) (local $x i32) (local $y i32) (set_local $x @@ -451,7 +451,7 @@ (get_local $w) ) ) - (func $interfere-in-dead (type $2) + (func $interfere-in-dead4 (type $2) (local $x i32) (local $y i32) (block $block diff --git a/test/passes/dce.wast b/test/passes/dce.wast index 61b3138e5..9795bda80 100644 --- a/test/passes/dce.wast +++ b/test/passes/dce.wast @@ -2,7 +2,8 @@ (memory 10) (type $ii (func (param i32 i32))) (type $1 (func)) - (table $call-me) + (table 1 1 anyfunc) + (elem (i32.const 0) $call-me) (func $call-me (type $ii) (param $0 i32) (param $1 i32) (nop) ) diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt index c49f7fd6f..e9cabe2ad 100644 --- a/test/passes/duplicate-function-elimination.txt +++ b/test/passes/duplicate-function-elimination.txt @@ -293,7 +293,7 @@ (type $0 (func)) (func $keep2 (type $0) (drop - (block $foo + (block $foo i32 (br_table $foo $foo (i32.const 0) (i32.const 0) @@ -303,7 +303,7 @@ ) (func $other (type $0) (drop - (block $bar + (block $bar i32 (br_table $bar $bar (i32.const 0) (i32.const 1) @@ -368,9 +368,9 @@ (memory 0) (type $FUNCSIG$v (func)) (import "env" "i" (func $i)) - (import "env" "j" (func $i)) + (import "env" "j" (func $j)) (func $erase (type $FUNCSIG$v) - (call_import $i) + (call $i) ) ) (module @@ -379,10 +379,10 @@ (import "env" "i" (func $i)) (import "env" "j" (func $j)) (func $keep2 (type $FUNCSIG$v) - (call_import $i) + (call $i) ) (func $other (type $FUNCSIG$v) - (call_import $j) + (call $j) ) ) (module diff --git a/test/passes/duplicate-function-elimination.wast b/test/passes/duplicate-function-elimination.wast index f72ef542e..ba429ed30 100644 --- a/test/passes/duplicate-function-elimination.wast +++ b/test/passes/duplicate-function-elimination.wast @@ -54,7 +54,8 @@ (type $0 (func)) (export "keep2" $keep2) (export "other" $other) - (table $keep2 $other $caller) + (table 3 3 anyfunc) + (elem (i32.const 0) $keep2 $other $caller) (func $keep2 (type $0) (nop) ) @@ -437,12 +438,12 @@ (memory 0) (type $FUNCSIG$v (func)) (import $i "env" "i") - (import $i "env" "j") + (import $j "env" "j") (func $erase (type $FUNCSIG$v) - (call_import $i) + (call $i) ) (func $other (type $FUNCSIG$v) - (call_import $i) + (call $i) ) ) (module @@ -451,16 +452,17 @@ (import $i "env" "i") (import $j "env" "j") (func $keep2 (type $FUNCSIG$v) - (call_import $i) + (call $i) ) (func $other (type $FUNCSIG$v) - (call_import $j) + (call $j) ) ) (module (memory 0) (type $T (func)) - (table $erase $other) + (table 2 2 anyfunc) + (elem (i32.const 0) $erase $other) (func $erase (type $T) (call_indirect $T (i32.const 0) @@ -475,7 +477,8 @@ (module (memory 0) (type $T (func)) - (table $keep2 $other) + (table 2 2 anyfunc) + (elem (i32.const 0) $keep2 $other) (func $keep2 (type $T) (call_indirect $T (i32.const 0) @@ -491,7 +494,8 @@ (memory 0) (type $T (func)) (type $S (func)) - (table $keep2 $other) + (table 2 2 anyfunc) + (elem (i32.const 0) $keep2 $other) (func $keep2 (type $T) (call_indirect $T (i32.const 0) diff --git a/test/passes/remove-imports.wast b/test/passes/remove-imports.wast index babd60fdc..bae2e2fc6 100644 --- a/test/passes/remove-imports.wast +++ b/test/passes/remove-imports.wast @@ -7,12 +7,12 @@ (import $waka-ret "somewhere" "waka-ret" (result i32)) (import $waka-ret-d "somewhere" "waka-ret-d" (result f64)) (func $nada (type $FUNCSIG$v) - (call_import $waka) + (call $waka) (drop - (call_import $waka-ret) + (call $waka-ret) ) (drop - (call_import $waka-ret-d) + (call $waka-ret-d) ) ) ) diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt index 2cef4b5ac..33ec51ea5 100644 --- a/test/passes/remove-unused-brs.txt +++ b/test/passes/remove-unused-brs.txt @@ -145,16 +145,18 @@ ) ) (func $b13 (type $2) (result i32) - (block $topmost + (block $topmost i32 (if (i32.const 1) (block $block1 (drop (i32.const 12) ) - (br_if $topmost - (i32.const 1) - (i32.const 1) + (drop + (br_if $topmost + (i32.const 1) + (i32.const 1) + ) ) ) (block $block3 @@ -170,12 +172,12 @@ ) ) (func $b14 (type $2) (result i32) - (block $topmost + (block $topmost i32 (select - (block $block1 + (block $block1 i32 (i32.const 12) ) - (block $block3 + (block $block3 i32 (i32.const 27) ) (i32.const 1) @@ -189,7 +191,7 @@ ) ) ) - (func $b15 (type $1) + (func $b15b (type $1) (block $topmost (if (i32.const 18) @@ -283,8 +285,8 @@ ) ) (func $ret-value (type $2) (result i32) - (block $block0 - (block $block1 + (block $block0 i32 + (block $block1 i32 (i32.const 1) ) ) @@ -297,7 +299,7 @@ (i32.const 1) ) (block $block2 - (block $block3 + (block $block1 (drop (i32.const 2) ) @@ -311,7 +313,7 @@ (if (i32.const 0) (block $block4 - (block $block5 + (block $block3 (drop (i32.const 2) ) @@ -326,8 +328,8 @@ ) ) (if - (block $block6 - (block $block7 + (block $block6 i32 + (block $block5 (drop (i32.const 2) ) @@ -343,18 +345,18 @@ ) ) (if - (block $a + (block $a i32 (i32.const 0) ) (block $a - (block $block11 + (block $block7 (drop (i32.const 1) ) ) ) (block $a - (block $block13 + (block $block8 (drop (i32.const 2) ) @@ -407,7 +409,7 @@ (i32.const 1) ) ) - (block $do-once$0 + (block $do-once$0 i32 (if (tee_local $x (i32.const 1) @@ -533,7 +535,7 @@ (block $out (if (i32.const 0) - (block $block15 + (block $block13 (drop (i32.const 1) ) @@ -578,7 +580,7 @@ (block $out (if (i32.const 0) - (block $block22 + (block $block17 (drop (i32.const 1) ) @@ -620,7 +622,7 @@ (block (call $loops) (drop - (block $out2 + (block $out2 i32 (i32.const 1) ) ) @@ -693,7 +695,7 @@ ) ) (func $br_if_in_block (type $2) (result i32) - (block $outval + (block $outval i32 (block $in (br_if $in (i32.const 1) @@ -730,8 +732,8 @@ ) (func $threading (type $1) (drop - (block $value-out - (block $value-in + (block $value-out i32 + (block $value-in i32 (block $out (block $in (br_if $out @@ -765,11 +767,11 @@ (func $if-to-br_if-conflict (type $3) (param $x i32) (param $y i32) (result i32) (block $leave (set_local $y - (block $out + (block $out i32 (if (get_local $x) (br $out - (block $block1 + (block $block1 i32 (set_local $x (i32.const 0) ) @@ -792,14 +794,14 @@ (func $if-to-br_if-conflict2 (type $3) (param $x i32) (param $y i32) (result i32) (block $leave (set_local $y - (block $out + (block $out i32 (if (get_local $x) (br_if $leave (i32.const 1) ) (br $out - (block $block2 + (block $block1 i32 (set_local $x (i32.const 0) ) @@ -819,11 +821,11 @@ (func $if-to-br_if-value-sideeffect (type $3) (param $x i32) (param $y i32) (result i32) (block $leave (set_local $y - (block $out + (block $out i32 (if (get_local $x) (br $out - (block $block1 + (block $block1 i32 (drop (call $if-to-br_if-value-sideeffect (i32.const 0) diff --git a/test/passes/remove-unused-brs.wast b/test/passes/remove-unused-brs.wast index 995ab2d3a..24995b235 100644 --- a/test/passes/remove-unused-brs.wast +++ b/test/passes/remove-unused-brs.wast @@ -158,9 +158,11 @@ (drop (i32.const 12) ) - (br_if $topmost - (i32.const 1) - (i32.const 1) + (drop + (br_if $topmost + (i32.const 1) + (i32.const 1) + ) ) ) (block $block3 @@ -196,7 +198,7 @@ ) ) ) - (func $b15 (type $1) + (func $b15b (type $1) (block $topmost (if (i32.const 18) diff --git a/test/passes/remove-unused-functions.wast b/test/passes/remove-unused-functions.wast index 9449a25cb..19b72f2ac 100644 --- a/test/passes/remove-unused-functions.wast +++ b/test/passes/remove-unused-functions.wast @@ -3,7 +3,8 @@ (start $start) (type $0 (func)) (export "exported" $exported) - (table $called_indirect) + (table 1 1 anyfunc) + (elem (i32.const 0) $called_indirect) (func $start (type $0) (call $called0) ) diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt index 4557f3da4..ae60d4155 100644 --- a/test/passes/remove-unused-names_merge-blocks.txt +++ b/test/passes/remove-unused-names_merge-blocks.txt @@ -126,7 +126,7 @@ (local $x i32) (drop (i32.eqz - (block + (block i32 (i32.const 10) ) ) @@ -174,7 +174,7 @@ (func $binary (type $3) (drop (i32.add - (block + (block i32 (i32.const 10) ) (i32.const 20) @@ -204,7 +204,7 @@ (drop (i32.add (i32.const 10) - (block + (block i32 (i32.const 20) ) ) @@ -232,10 +232,10 @@ ) (drop (i32.add - (block + (block i32 (i32.const 10) ) - (block + (block i32 (i32.const 20) ) ) @@ -287,7 +287,7 @@ (drop (i32.add (unreachable) - (block + (block i32 (drop (i32.const 10) ) @@ -331,7 +331,7 @@ ) (drop (select - (block + (block i32 (i32.const 10) ) (i32.const 30) @@ -347,7 +347,7 @@ (drop (select (i32.const 20) - (block + (block i32 (i32.const 30) ) (i32.const 50) @@ -363,7 +363,7 @@ (select (i32.const 20) (i32.const 40) - (block + (block i32 (i32.const 50) ) ) @@ -373,10 +373,10 @@ ) (drop (select - (block + (block i32 (i32.const 10) ) - (block + (block i32 (i32.const 20) ) (i32.const 40) @@ -387,11 +387,11 @@ ) (drop (select - (block + (block i32 (i32.const 10) ) (i32.const 30) - (block + (block i32 (i32.const 40) ) ) @@ -402,10 +402,10 @@ (drop (select (i32.const 20) - (block + (block i32 (i32.const 30) ) - (block + (block i32 (i32.const 40) ) ) @@ -430,13 +430,13 @@ (drop (select (unreachable) - (block + (block i32 (drop (i32.const 30) ) (i32.const 40) ) - (block + (block i32 (drop (i32.const 50) ) @@ -468,7 +468,7 @@ (select (i32.const 20) (unreachable) - (block + (block i32 (drop (i32.const 50) ) @@ -541,7 +541,7 @@ (i32.const 20) ) (drop - (block $out2 + (block $out2 i32 (drop (i32.const 10) ) @@ -559,7 +559,7 @@ ) (func $calls (type $3) (call $call-i - (block + (block i32 (i32.const 10) ) ) @@ -601,7 +601,7 @@ ) (call $call-ii (unreachable) - (block + (block i32 (drop (i32.const 20) ) @@ -670,7 +670,7 @@ ) (call_indirect $ii (unreachable) - (block + (block i32 (drop (i32.const 30) ) @@ -683,7 +683,7 @@ (local $0 f64) (local $1 f64) (if - (block + (block i32 (nop) (f64.gt (get_local $0) diff --git a/test/passes/remove-unused-names_merge-blocks.wast b/test/passes/remove-unused-names_merge-blocks.wast index 562c5bbba..64bc8ab7f 100644 --- a/test/passes/remove-unused-names_merge-blocks.wast +++ b/test/passes/remove-unused-names_merge-blocks.wast @@ -4,7 +4,8 @@ (type $ii (func (param i32 i32))) (type $iii (func (param i32 i32 i32))) (type $3 (func)) - (table $call-i) + (table 1 1 anyfunc) + (elem (i32.const 0) $call-i) (func $call-i (type $i) (param $0 i32) (nop) ) diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt index 4b7cd2bb3..f2aa8d0d9 100644 --- a/test/passes/simplify-locals.txt +++ b/test/passes/simplify-locals.txt @@ -97,7 +97,7 @@ ) (nop) (nop) - (call_import $waka) + (call $waka) (drop (i32.const 9) ) @@ -145,19 +145,19 @@ (block $block3 (nop) (set_local $a - (call_import $waka_int) + (call $waka_int) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (drop (i32.load @@ -167,9 +167,9 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (i32.store (i32.const 1) @@ -178,14 +178,14 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (nop) (set_local $a (i32.load (i32.const 100) ) ) - (call_import $waka) + (call $waka) (nop) (drop (i32.load @@ -197,17 +197,17 @@ (i32.const 101) ) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 102) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 103) @@ -220,10 +220,10 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (nop) (set_local $a - (block $block0 + (block $block0 i32 (block $block1 (nop) (i32.store @@ -236,9 +236,9 @@ (get_local $5) ) ) - (call_import $waka) + (call $waka) (set_local $a - (block $block2 + (block $block2 i32 (block $block4 (nop) (i32.store @@ -251,13 +251,13 @@ (get_local $6) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (block $block5 + (block $block5 i32 (block $block6 (nop) (i32.store @@ -278,9 +278,9 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (block $block7 + (block $block7 i32 (block $block8 (nop) (i32.store @@ -300,13 +300,13 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) ) (block $out-of-block (nop) (nop) (drop - (block $b + (block $b i32 (block $c (br $b (i32.const 1337) @@ -415,8 +415,8 @@ (nop) (nop) (drop - (call_import $___udivmoddi4 - (call_import $_i64Subtract + (call $___udivmoddi4 + (call $_i64Subtract (i32.xor (tee_local $$1$0 (i32.or @@ -474,7 +474,7 @@ (i32.load (i32.const 168) ) - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (tee_local $$2$0 (i32.or @@ -536,7 +536,7 @@ ) ) (set_local $$10$0 - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (i32.load (get_local $$rem) @@ -563,7 +563,7 @@ (get_local $__stackBase__) ) (return - (block $block12 + (block $block12 i32 (i32.store (i32.const 168) (get_local $$10$1) @@ -575,11 +575,11 @@ (func $block-returns (type $FUNCSIG$v) (local $x i32) (set_local $x - (block $out + (block $out i32 (nop) (br_if $out (tee_local $x - (block $waka + (block $waka i32 (nop) (br_if $waka (tee_local $x @@ -600,11 +600,11 @@ (set_local $x (if (i32.const 1) - (block + (block i32 (nop) (i32.const 13) ) - (block + (block i32 (nop) (i32.const 24) ) @@ -616,11 +616,11 @@ (tee_local $x (if (i32.const 1) - (block $block3 + (block $block3 i32 (nop) (i32.const 14) ) - (block $block5 + (block $block5 i32 (nop) (i32.const 25) ) @@ -685,7 +685,7 @@ (func $no-out-of-label (type $8) (param $x i32) (param $y i32) (loop $moar (set_local $x - (block $block0 + (block $block0 i32 (br_if $moar (get_local $x) ) @@ -698,7 +698,7 @@ ) (block $moar (set_local $y - (block $block1 + (block $block1 i32 (br_if $moar (get_local $y) ) @@ -714,7 +714,7 @@ (local $e i32) (loop $while-in$1 (set_local $a - (block $while-out$0 + (block $while-out$0 i32 (set_local $e (get_local $a) ) diff --git a/test/passes/simplify-locals.wast b/test/passes/simplify-locals.wast index b703613d8..4fa345770 100644 --- a/test/passes/simplify-locals.wast +++ b/test/passes/simplify-locals.wast @@ -125,7 +125,7 @@ (set_local $b (i32.const 10) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) @@ -180,22 +180,22 @@ ) (block $block3 (set_local $a - (call_import $waka_int) + (call $waka_int) ) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (drop (i32.load @@ -205,9 +205,9 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a - (call_import $waka_int) + (call $waka_int) ) (i32.store (i32.const 1) @@ -216,7 +216,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 100) @@ -225,7 +225,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 101) @@ -239,17 +239,17 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 102) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (i32.load (i32.const 103) @@ -262,7 +262,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -280,7 +280,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -295,11 +295,11 @@ (get_local $6) ) ) - (call_import $waka) + (call $waka) (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -322,7 +322,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) (set_local $a (block (block @@ -344,7 +344,7 @@ (drop (get_local $a) ) - (call_import $waka) + (call $waka) ) (block $out-of-block (set_local $a @@ -550,7 +550,7 @@ ) ) (set_local $$4$0 - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (get_local $$1$0) (get_local $$a$0) @@ -569,10 +569,10 @@ ) ) (drop - (call_import $___udivmoddi4 + (call $___udivmoddi4 (get_local $$4$0) (get_local $$4$1) - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (get_local $$2$0) (get_local $$b$0) @@ -591,7 +591,7 @@ ) ) (set_local $$10$0 - (call_import $_i64Subtract + (call $_i64Subtract (i32.xor (i32.load (get_local $$rem) diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt index 04a04efc0..c2fb9fc29 100644 --- a/test/passes/vacuum.txt +++ b/test/passes/vacuum.txt @@ -22,12 +22,12 @@ (block $two-in-a-block ) (set_local $x - (block $result-used + (block $result-used i32 (get_local $x) ) ) (set_local $x - (block $two-and-result-used + (block $two-and-result-used i32 (get_local $y) ) ) @@ -123,7 +123,7 @@ (if (if (get_local $d) - (block $block1 + (block $block1 i32 (f64.ne (f64.promote/f32 (f32.load @@ -148,7 +148,7 @@ (if (i32.const 0) (drop - (call_import $int) + (call $int) ) (br $out) ) @@ -156,25 +156,25 @@ (i32.const 1) (br $out) (drop - (call_import $int) + (call $int) ) ) ) ) (func $drop-silly (type $0) (drop - (call_import $int) + (call $int) ) (drop - (call_import $int) + (call $int) ) (drop - (call_import $int) + (call $int) ) (drop (i32.add - (call_import $int) - (call_import $int) + (call $int) + (call $int) ) ) ) @@ -186,7 +186,7 @@ (local $$11 i32) (loop $while-in$1 (drop - (block $jumpthreading$outer$8 + (block $jumpthreading$outer$8 i32 (block $jumpthreading$inner$8 (br $jumpthreading$outer$8 (i32.const 0) diff --git a/test/passes/vacuum.wast b/test/passes/vacuum.wast index 84f3eeb6f..ecc176385 100644 --- a/test/passes/vacuum.wast +++ b/test/passes/vacuum.wast @@ -303,14 +303,14 @@ (block $out (drop (if (i32.const 0) - (call_import $int) + (call $int) (br $out) ) ) (drop (if (i32.const 1) (br $out) - (call_import $int) + (call $int) ) ) ) @@ -326,7 +326,7 @@ (drop (i32.eqz (i32.eqz - (call_import $int) + (call $int) ) ) ) @@ -339,19 +339,19 @@ (drop (i32.add (i32.const 4) - (call_import $int) + (call $int) ) ) (drop (i32.add - (call_import $int) + (call $int) (i32.const 5) ) ) (drop (i32.add - (call_import $int) - (call_import $int) + (call $int) + (call $int) ) ) ) diff --git a/test/spec b/test/spec -Subproject 377264edb37749a5c15f35c589bea62df560637 +Subproject 237f9ee630e951149e73d32633aa78616559519 diff --git a/test/two_sides.fromasm b/test/two_sides.fromasm index 6d8e2a14b..e6595d04b 100644 --- a/test/two_sides.fromasm +++ b/test/two_sides.fromasm @@ -1,10 +1,9 @@ (module - (memory 256 256) (data (get_global $memoryBase) "two_sides.asm.js") (type $FUNCSIG$id (func (param f64) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_test" (func $_test)) @@ -12,7 +11,7 @@ (local $5 f64) (if (get_local $4) - (call_import $f64-to-int + (call $f64-to-int (f64.mul (f64.add (f64.convert_s/i32 @@ -35,7 +34,7 @@ ) ) ) - (call_import $f64-to-int + (call $f64-to-int (f64.mul (f64.add (f64.convert_s/i32 diff --git a/test/two_sides.fromasm.imprecise b/test/two_sides.fromasm.imprecise index 1578c86da..428c56a97 100644 --- a/test/two_sides.fromasm.imprecise +++ b/test/two_sides.fromasm.imprecise @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_test" (func $_test)) diff --git a/test/two_sides.fromasm.imprecise.no-opts b/test/two_sides.fromasm.imprecise.no-opts index a8a338489..e695bc124 100644 --- a/test/two_sides.fromasm.imprecise.no-opts +++ b/test/two_sides.fromasm.imprecise.no-opts @@ -1,7 +1,6 @@ (module - (memory 256 256) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_test" (func $_test)) diff --git a/test/two_sides.fromasm.no-opts b/test/two_sides.fromasm.no-opts index 1011976b6..cb693267a 100644 --- a/test/two_sides.fromasm.no-opts +++ b/test/two_sides.fromasm.no-opts @@ -1,9 +1,8 @@ (module - (memory 256 256) (type $FUNCSIG$id (func (param f64) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 0 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "_test" (func $_test)) @@ -39,7 +38,7 @@ ) ) (set_local $i5 - (call_import $f64-to-int + (call $f64-to-int (get_local $d6) ) ) @@ -73,7 +72,7 @@ ) ) (set_local $i5 - (call_import $f64-to-int + (call $f64-to-int (get_local $d6) ) ) diff --git a/test/unit.fromasm b/test/unit.fromasm index 6dd442a36..fb9f239da 100644 --- a/test/unit.fromasm +++ b/test/unit.fromasm @@ -1,5 +1,4 @@ (module - (memory 256 256) (data (get_global $memoryBase) "unit.asm.js") (type $FUNCSIG$id (func (param f64) (result i32))) (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) @@ -9,11 +8,11 @@ (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$dd (func (param f64) (result f64))) (type $FUNCSIG$i (func (result i32))) - (import "global" "NaN" (global $t f64)) - (import "global" "Infinity" (global $u f64)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "gb" (global $n i32)) - (import "env" "STACKTOP" (global $STACKTOP i32)) + (import "global" "NaN" (global $t$asm2wasm$import f64)) + (import "global" "Infinity" (global $u$asm2wasm$import f64)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "gb" (global $n$asm2wasm$import i32)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) (import "env" "abort" (func $abort (param f64) (result f64))) (import "env" "print" (func $print (param i32))) @@ -22,15 +21,19 @@ (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 10 10 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "big_negative" (func $big_negative)) (export "pick" (func $big_negative)) - (global $Int i32 (i32.const 0)) - (global $Double f64 (f64.const 0)) - (table 10 10 anyfunc) + (global $t (mut f64) (get_global $t$asm2wasm$import)) + (global $u (mut f64) (get_global $u$asm2wasm$import)) + (global $Int (mut i32) (i32.const 0)) + (global $Double (mut f64) (f64.const 0)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $n (mut i32) (get_global $n$asm2wasm$import)) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) (elem (i32.const 0) $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) (func $big_negative (nop) @@ -108,12 +111,12 @@ (local $1 f32) (local $2 i32) (drop - (call_import $f64-to-int + (call $f64-to-int (get_local $0) ) ) (set_local $2 - (call_import $f64-to-int + (call $f64-to-int (f64.promote/f32 (get_local $1) ) @@ -197,7 +200,7 @@ (br $label$break$L1) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -206,14 +209,14 @@ (i32.const 0) ) (func $frem (result f64) - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) ) (func $big_uint_div_u (result i32) (i32.and - (call_import $i32u-div + (call $i32u-div (i32.const -1) (i32.const 2) ) @@ -297,7 +300,7 @@ (i32.const 200) ) (block - (call_import $h + (call $h (get_local $0) ) (set_local $0 @@ -316,29 +319,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -347,18 +350,18 @@ ) (func $continues (loop $while-in$1 - (call_import $print + (call $print (i32.const 1) ) (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (br_if $unlikely-continue$3 (i32.const 0) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -400,7 +403,7 @@ (i32.const 3) ) ) - (block + (block i32 (drop (call $lb (i32.const 4) @@ -421,7 +424,7 @@ ) ) ) - (block + (block i32 (drop (call $lb (i32.const 8) @@ -492,11 +495,13 @@ ) ) (func $phi (result i32) - (block $do-once$0 - (br_if $do-once$0 - (i32.const 0) - (call $lb - (i32.const 1) + (block $do-once$0 i32 + (drop + (br_if $do-once$0 + (i32.const 0) + (call $lb + (i32.const 1) + ) ) ) (i32.const 1) @@ -522,12 +527,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -593,7 +598,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -605,7 +610,7 @@ (drop (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -714,7 +719,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -790,7 +795,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 0) ) (br $jumpthreading$inner$0) @@ -798,11 +803,11 @@ ) (br $jumpthreading$outer$0) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (block $jumpthreading$inner$1 @@ -817,16 +822,16 @@ ) ) ) - (call_import $h + (call $h (i32.const 2) ) (br $jumpthreading$inner$1) ) ) - (call_import $h + (call $h (i32.const 3) ) - (call_import $h + (call $h (i32.const -2) ) (block $jumpthreading$outer$3 @@ -835,7 +840,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 4) ) (br_if $jumpthreading$inner$2 @@ -849,16 +854,16 @@ ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 5) ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 6) ) ) - (call_import $h + (call $h (i32.const -3) ) (block $jumpthreading$outer$5 @@ -867,7 +872,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 7) ) (br_if $jumpthreading$inner$4 @@ -881,7 +886,7 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 8) ) (br_if $jumpthreading$inner$5 @@ -892,11 +897,11 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (block $jumpthreading$outer$6 @@ -904,7 +909,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 10) ) (br $jumpthreading$inner$6) @@ -912,11 +917,11 @@ ) (br $jumpthreading$outer$6) ) - (call_import $h + (call $h (i32.const 11) ) ) - (call_import $h + (call $h (i32.const -5) ) (block $jumpthreading$outer$8 @@ -926,7 +931,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 12) ) (br_if $jumpthreading$inner$7 @@ -940,7 +945,7 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 13) ) (br_if $jumpthreading$inner$8 @@ -949,11 +954,11 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 14) ) ) - (call_import $h + (call $h (i32.const -6) ) (get_local $0) @@ -1012,7 +1017,7 @@ (func $jumpThreadDrop (result i32) (local $0 i32) (set_local $0 - (call_import $return_int) + (call $return_int) ) (block $jumpthreading$outer$2 ) diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise index d007a4d82..ad130ea82 100644 --- a/test/unit.fromasm.imprecise +++ b/test/unit.fromasm.imprecise @@ -1,31 +1,34 @@ (module - (memory 256 256) (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) (type $FUNCSIG$vf (func (param f32))) (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$dd (func (param f64) (result f64))) (type $FUNCSIG$i (func (result i32))) - (import "global" "NaN" (global $t f64)) - (import "global" "Infinity" (global $u f64)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "gb" (global $n i32)) - (import "env" "STACKTOP" (global $STACKTOP i32)) + (import "global" "NaN" (global $t$asm2wasm$import f64)) + (import "global" "Infinity" (global $u$asm2wasm$import f64)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "gb" (global $n$asm2wasm$import i32)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) (import "env" "abort" (func $abort (param f64) (result f64))) (import "env" "print" (func $print (param i32))) (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 10 10 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "big_negative" (func $big_negative)) (export "pick" (func $big_negative)) - (global $Int i32 (i32.const 0)) - (global $Double f64 (f64.const 0)) - (table 10 10 anyfunc) + (global $t (mut f64) (get_global $t$asm2wasm$import)) + (global $u (mut f64) (get_global $u$asm2wasm$import)) + (global $Int (mut i32) (i32.const 0)) + (global $Double (mut f64) (f64.const 0)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $n (mut i32) (get_global $n$asm2wasm$import)) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) (elem (i32.const 0) $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg) (func $big_negative (nop) @@ -184,7 +187,7 @@ (br $label$break$L1) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -193,7 +196,7 @@ (i32.const 0) ) (func $frem (result f64) - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) @@ -278,7 +281,7 @@ (i32.const 200) ) (block - (call_import $h + (call $h (get_local $0) ) (set_local $0 @@ -297,29 +300,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -328,18 +331,18 @@ ) (func $continues (loop $while-in$1 - (call_import $print + (call $print (i32.const 1) ) (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (br_if $unlikely-continue$3 (i32.const 0) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -381,7 +384,7 @@ (i32.const 3) ) ) - (block + (block i32 (drop (call $lb (i32.const 4) @@ -402,7 +405,7 @@ ) ) ) - (block + (block i32 (drop (call $lb (i32.const 8) @@ -473,11 +476,13 @@ ) ) (func $phi (result i32) - (block $do-once$0 - (br_if $do-once$0 - (i32.const 0) - (call $lb - (i32.const 1) + (block $do-once$0 i32 + (drop + (br_if $do-once$0 + (i32.const 0) + (call $lb + (i32.const 1) + ) ) ) (i32.const 1) @@ -503,12 +508,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -574,7 +579,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -586,7 +591,7 @@ (drop (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -695,7 +700,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -771,7 +776,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 0) ) (br $jumpthreading$inner$0) @@ -779,11 +784,11 @@ ) (br $jumpthreading$outer$0) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (block $jumpthreading$inner$1 @@ -798,16 +803,16 @@ ) ) ) - (call_import $h + (call $h (i32.const 2) ) (br $jumpthreading$inner$1) ) ) - (call_import $h + (call $h (i32.const 3) ) - (call_import $h + (call $h (i32.const -2) ) (block $jumpthreading$outer$3 @@ -816,7 +821,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 4) ) (br_if $jumpthreading$inner$2 @@ -830,16 +835,16 @@ ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 5) ) (br $jumpthreading$outer$3) ) - (call_import $h + (call $h (i32.const 6) ) ) - (call_import $h + (call $h (i32.const -3) ) (block $jumpthreading$outer$5 @@ -848,7 +853,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 7) ) (br_if $jumpthreading$inner$4 @@ -862,7 +867,7 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 8) ) (br_if $jumpthreading$inner$5 @@ -873,11 +878,11 @@ ) (br $jumpthreading$outer$5) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (block $jumpthreading$outer$6 @@ -885,7 +890,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 10) ) (br $jumpthreading$inner$6) @@ -893,11 +898,11 @@ ) (br $jumpthreading$outer$6) ) - (call_import $h + (call $h (i32.const 11) ) ) - (call_import $h + (call $h (i32.const -5) ) (block $jumpthreading$outer$8 @@ -907,7 +912,7 @@ (if (get_local $0) (block - (call_import $h + (call $h (i32.const 12) ) (br_if $jumpthreading$inner$7 @@ -921,7 +926,7 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 13) ) (br_if $jumpthreading$inner$8 @@ -930,11 +935,11 @@ ) (br $jumpthreading$outer$8) ) - (call_import $h + (call $h (i32.const 14) ) ) - (call_import $h + (call $h (i32.const -6) ) (get_local $0) @@ -993,7 +998,7 @@ (func $jumpThreadDrop (result i32) (local $0 i32) (set_local $0 - (call_import $return_int) + (call $return_int) ) (block $jumpthreading$outer$2 ) diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts index 1e8b46835..636238f17 100644 --- a/test/unit.fromasm.imprecise.no-opts +++ b/test/unit.fromasm.imprecise.no-opts @@ -1,31 +1,34 @@ (module - (memory 256 256) (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) (type $FUNCSIG$vf (func (param f32))) (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$dd (func (param f64) (result f64))) (type $FUNCSIG$i (func (result i32))) - (import "global" "NaN" (global $t f64)) - (import "global" "Infinity" (global $u f64)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "gb" (global $n i32)) - (import "env" "STACKTOP" (global $STACKTOP i32)) + (import "global" "NaN" (global $t$asm2wasm$import f64)) + (import "global" "Infinity" (global $u$asm2wasm$import f64)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "gb" (global $n$asm2wasm$import i32)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) (import "env" "abort" (func $abort (param f64) (result f64))) (import "env" "print" (func $print (param i32))) (import "env" "h" (func $h (param i32))) (import "env" "return_int" (func $return_int (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 10 10 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "big_negative" (func $big_negative)) (export "pick" (func $exportMe)) - (global $Int i32 (i32.const 0)) - (global $Double f64 (f64.const 0)) - (table 10 10 anyfunc) + (global $t (mut f64) (get_global $t$asm2wasm$import)) + (global $u (mut f64) (get_global $u$asm2wasm$import)) + (global $Int (mut i32) (i32.const 0)) + (global $Double (mut f64) (f64.const 0)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $n (mut i32) (get_global $n$asm2wasm$import)) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (local $temp f64) @@ -178,13 +181,13 @@ (local $J f64) (set_local $J (f64.sub - (block + (block f64 (drop (f64.const 0.1) ) (f64.const 5.1) ) - (block + (block f64 (drop (f64.const 3.2) ) @@ -313,7 +316,7 @@ (br $label$continue$L3) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -330,7 +333,7 @@ ) (func $frem (result f64) (return - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) @@ -386,7 +389,7 @@ (local $z f32) (local $asm2wasm_i32_temp i32) (set_local $x - (block + (block i32 (set_local $asm2wasm_i32_temp (i32.const 0) ) @@ -512,7 +515,7 @@ ) (br $for-out$0) ) - (call_import $h + (call $h (get_local $i) ) (set_local $i @@ -547,29 +550,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -579,12 +582,12 @@ (func $continues (loop $while-in$1 (block $while-out$0 - (call_import $print + (call $print (i32.const 1) ) (block $do-once$2 (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (if @@ -593,7 +596,7 @@ ) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -633,20 +636,20 @@ (i32.add (i32.add (i32.add - (block + (block i32 (drop (i32.const 1) ) (get_local $x) ) - (block + (block i32 (drop (i32.const 2) ) (i32.const 3) ) ) - (block + (block i32 (block (block (drop @@ -663,19 +666,19 @@ (i32.const 7) ) ) - (block + (block i32 (drop (i32.const 8) ) - (block + (block i32 (drop (i32.const 9) ) - (block + (block i32 (drop (i32.const 10) ) - (block + (block i32 (drop (i32.const 11) ) @@ -691,7 +694,7 @@ (i32.add (i32.add (i32.add - (block + (block i32 (drop (call $lb (i32.const 1) @@ -699,7 +702,7 @@ ) (get_local $x) ) - (block + (block i32 (drop (call $lb (i32.const 2) @@ -710,7 +713,7 @@ ) ) ) - (block + (block i32 (block (block (drop @@ -735,25 +738,25 @@ ) ) ) - (block + (block i32 (drop (call $lb (i32.const 8) ) ) - (block + (block i32 (drop (call $lb (i32.const 9) ) ) - (block + (block i32 (drop (call $lb (i32.const 10) ) ) - (block + (block i32 (drop (call $lb (i32.const 11) @@ -873,12 +876,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -891,7 +894,7 @@ (func $useSetGlobal (result i32) (local $x i32) (set_local $x - (block + (block i32 (set_global $Int (i32.const 10) ) @@ -902,7 +905,7 @@ (i32.const 20) ) (return - (block + (block i32 (set_global $Int (i32.const 30) ) @@ -912,7 +915,7 @@ ) (func $usesSetGlobal2 (result i32) (return - (block + (block i32 (block (set_global $Int (i32.const 40) @@ -985,7 +988,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -997,7 +1000,7 @@ (set_local $y (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -1149,7 +1152,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -1255,7 +1258,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 0) ) (set_local $label @@ -1268,11 +1271,11 @@ (get_local $label) (i32.const 1) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (loop $while-in$1 @@ -1286,7 +1289,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 2) ) (set_local $label @@ -1303,17 +1306,17 @@ (get_local $label) (i32.const 2) ) - (call_import $h + (call $h (i32.const 3) ) ) - (call_import $h + (call $h (i32.const -2) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 4) ) (if @@ -1335,7 +1338,7 @@ (get_local $label) (i32.const 3) ) - (call_import $h + (call $h (i32.const 5) ) (if @@ -1343,18 +1346,18 @@ (get_local $label) (i32.const 4) ) - (call_import $h + (call $h (i32.const 6) ) ) ) - (call_import $h + (call $h (i32.const -3) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 7) ) (if @@ -1377,7 +1380,7 @@ (i32.const 5) ) (block - (call_import $h + (call $h (i32.const 8) ) (if @@ -1396,17 +1399,17 @@ (get_local $label) (i32.const 6) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 10) ) (set_local $label @@ -1421,20 +1424,20 @@ (i32.const 7) ) (block - (call_import $h + (call $h (i32.const 11) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -5) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 12) ) (if @@ -1457,7 +1460,7 @@ (i32.const 8) ) (block - (call_import $h + (call $h (i32.const 13) ) (if @@ -1475,14 +1478,14 @@ (i32.const 9) ) (block - (call_import $h + (call $h (i32.const 14) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -6) ) (return @@ -1583,7 +1586,7 @@ (local $label i32) (local $temp i32) (set_local $temp - (call_import $return_int) + (call $return_int) ) (loop $while-in$1 (block $while-out$0 @@ -1606,7 +1609,7 @@ (i32.const 12) ) (drop - (call_import $return_int) + (call $return_int) ) (if (i32.eq diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts index 846ef21a0..0684c1464 100644 --- a/test/unit.fromasm.no-opts +++ b/test/unit.fromasm.no-opts @@ -1,5 +1,4 @@ (module - (memory 256 256) (type $FUNCSIG$id (func (param f64) (result i32))) (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) @@ -8,11 +7,11 @@ (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$dd (func (param f64) (result f64))) (type $FUNCSIG$i (func (result i32))) - (import "global" "NaN" (global $t f64)) - (import "global" "Infinity" (global $u f64)) - (import "env" "tempDoublePtr" (global $tempDoublePtr i32)) - (import "env" "gb" (global $n i32)) - (import "env" "STACKTOP" (global $STACKTOP i32)) + (import "global" "NaN" (global $t$asm2wasm$import f64)) + (import "global" "Infinity" (global $u$asm2wasm$import f64)) + (import "env" "tempDoublePtr" (global $tempDoublePtr$asm2wasm$import i32)) + (import "env" "gb" (global $n$asm2wasm$import i32)) + (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32))) (import "env" "abort" (func $abort (param f64) (result f64))) (import "env" "print" (func $print (param i32))) @@ -21,15 +20,19 @@ (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64))) (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32))) - (import "env" "memory" (memory $memory)) - (import "env" "table" (table $table)) + (import "env" "memory" (memory 256 256)) + (import "env" "table" (table 10 10 anyfunc)) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) (export "big_negative" (func $big_negative)) (export "pick" (func $exportMe)) - (global $Int i32 (i32.const 0)) - (global $Double f64 (f64.const 0)) - (table 10 10 anyfunc) + (global $t (mut f64) (get_global $t$asm2wasm$import)) + (global $u (mut f64) (get_global $u$asm2wasm$import)) + (global $Int (mut i32) (i32.const 0)) + (global $Double (mut f64) (f64.const 0)) + (global $tempDoublePtr (mut i32) (get_global $tempDoublePtr$asm2wasm$import)) + (global $n (mut i32) (get_global $n$asm2wasm$import)) + (global $STACKTOP (mut i32) (get_global $STACKTOP$asm2wasm$import)) (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg) (func $big_negative (local $temp f64) @@ -158,12 +161,12 @@ (local $d f64) (local $f f32) (set_local $i - (call_import $f64-to-int + (call $f64-to-int (get_local $d) ) ) (set_local $i - (call_import $f64-to-int + (call $f64-to-int (f64.promote/f32 (get_local $f) ) @@ -184,13 +187,13 @@ (local $J f64) (set_local $J (f64.sub - (block + (block f64 (drop (f64.const 0.1) ) (f64.const 5.1) ) - (block + (block f64 (drop (f64.const 3.2) ) @@ -319,7 +322,7 @@ (br $label$continue$L3) ) ) - (call_import $h + (call $h (i32.const 120) ) (br $label$continue$L1) @@ -336,7 +339,7 @@ ) (func $frem (result f64) (return - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) @@ -346,7 +349,7 @@ (local $x i32) (set_local $x (i32.and - (call_import $i32u-div + (call $i32u-div (i32.const -1) (i32.const 2) ) @@ -392,7 +395,7 @@ (local $z f32) (local $asm2wasm_i32_temp i32) (set_local $x - (block + (block i32 (set_local $asm2wasm_i32_temp (i32.const 0) ) @@ -518,7 +521,7 @@ ) (br $for-out$0) ) - (call_import $h + (call $h (get_local $i) ) (set_local $i @@ -553,29 +556,29 @@ ) (func $aborts (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 55) ) ) ) (drop - (call_import $abort + (call $abort (f64.const 0) ) ) (drop - (call_import $abort + (call $abort (f64.const 12.34) ) ) (drop - (call_import $abort + (call $abort (f64.promote/f32 (f32.const 56.779998779296875) ) @@ -585,12 +588,12 @@ (func $continues (loop $while-in$1 (block $while-out$0 - (call_import $print + (call $print (i32.const 1) ) (block $do-once$2 (loop $unlikely-continue$3 - (call_import $print + (call $print (i32.const 5) ) (if @@ -599,7 +602,7 @@ ) ) ) - (call_import $print + (call $print (i32.const 2) ) (br $while-in$1) @@ -639,20 +642,20 @@ (i32.add (i32.add (i32.add - (block + (block i32 (drop (i32.const 1) ) (get_local $x) ) - (block + (block i32 (drop (i32.const 2) ) (i32.const 3) ) ) - (block + (block i32 (block (block (drop @@ -669,19 +672,19 @@ (i32.const 7) ) ) - (block + (block i32 (drop (i32.const 8) ) - (block + (block i32 (drop (i32.const 9) ) - (block + (block i32 (drop (i32.const 10) ) - (block + (block i32 (drop (i32.const 11) ) @@ -697,7 +700,7 @@ (i32.add (i32.add (i32.add - (block + (block i32 (drop (call $lb (i32.const 1) @@ -705,7 +708,7 @@ ) (get_local $x) ) - (block + (block i32 (drop (call $lb (i32.const 2) @@ -716,7 +719,7 @@ ) ) ) - (block + (block i32 (block (block (drop @@ -741,25 +744,25 @@ ) ) ) - (block + (block i32 (drop (call $lb (i32.const 8) ) ) - (block + (block i32 (drop (call $lb (i32.const 9) ) ) - (block + (block i32 (drop (call $lb (i32.const 10) ) ) - (block + (block i32 (drop (call $lb (i32.const 11) @@ -879,12 +882,12 @@ (call $phi) ) (drop - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) (call $zeroInit - (call_import $setTempRet0 + (call $setTempRet0 (i32.const 10) ) ) @@ -897,7 +900,7 @@ (func $useSetGlobal (result i32) (local $x i32) (set_local $x - (block + (block i32 (set_global $Int (i32.const 10) ) @@ -908,7 +911,7 @@ (i32.const 20) ) (return - (block + (block i32 (set_global $Int (i32.const 30) ) @@ -918,7 +921,7 @@ ) (func $usesSetGlobal2 (result i32) (return - (block + (block i32 (block (set_global $Int (i32.const 40) @@ -991,7 +994,7 @@ (if (i32.const 1) (i32.trunc_s/f64 - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 5) ) @@ -1003,7 +1006,7 @@ (set_local $y (if (i32.const 3) - (call_import $abort + (call $abort (f64.convert_s/i32 (i32.const 7) ) @@ -1155,7 +1158,7 @@ (if (i32.const 1) (drop - (call_import $return_int) + (call $return_int) ) ) ) @@ -1261,7 +1264,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 0) ) (set_local $label @@ -1274,11 +1277,11 @@ (get_local $label) (i32.const 1) ) - (call_import $h + (call $h (i32.const 1) ) ) - (call_import $h + (call $h (i32.const -1) ) (loop $while-in$1 @@ -1292,7 +1295,7 @@ (if (get_local $x) (block - (call_import $h + (call $h (i32.const 2) ) (set_local $label @@ -1309,17 +1312,17 @@ (get_local $label) (i32.const 2) ) - (call_import $h + (call $h (i32.const 3) ) ) - (call_import $h + (call $h (i32.const -2) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 4) ) (if @@ -1341,7 +1344,7 @@ (get_local $label) (i32.const 3) ) - (call_import $h + (call $h (i32.const 5) ) (if @@ -1349,18 +1352,18 @@ (get_local $label) (i32.const 4) ) - (call_import $h + (call $h (i32.const 6) ) ) ) - (call_import $h + (call $h (i32.const -3) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 7) ) (if @@ -1383,7 +1386,7 @@ (i32.const 5) ) (block - (call_import $h + (call $h (i32.const 8) ) (if @@ -1402,17 +1405,17 @@ (get_local $label) (i32.const 6) ) - (call_import $h + (call $h (i32.const 9) ) ) - (call_import $h + (call $h (i32.const -4) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 10) ) (set_local $label @@ -1427,20 +1430,20 @@ (i32.const 7) ) (block - (call_import $h + (call $h (i32.const 11) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -5) ) (if (get_local $x) (block - (call_import $h + (call $h (i32.const 12) ) (if @@ -1463,7 +1466,7 @@ (i32.const 8) ) (block - (call_import $h + (call $h (i32.const 13) ) (if @@ -1481,14 +1484,14 @@ (i32.const 9) ) (block - (call_import $h + (call $h (i32.const 14) ) (br $label$break$L1) ) ) ) - (call_import $h + (call $h (i32.const -6) ) (return @@ -1589,7 +1592,7 @@ (local $label i32) (local $temp i32) (set_local $temp - (call_import $return_int) + (call $return_int) ) (loop $while-in$1 (block $while-out$0 @@ -1612,7 +1615,7 @@ (i32.const 12) ) (drop - (call_import $return_int) + (call $return_int) ) (if (i32.eq diff --git a/test/unit.wast b/test/unit.wast index 2df02df44..fab6705d2 100644 --- a/test/unit.wast +++ b/test/unit.wast @@ -37,7 +37,7 @@ ) (func $importedDoubles (type $4) (result f64) (local $temp f64) - (block $topmost + (block $topmost f64 (set_local $temp (f64.add (f64.add @@ -91,7 +91,7 @@ (local $t f64) (local $Int f64) (local $Double i32) - (block $topmost + (block $topmost f64 (if (f64.gt (get_local $x) @@ -154,7 +154,7 @@ (local $d f64) (block $block0 (set_local $i - (call_import $f64-to-int + (call $f64-to-int (get_local $d) ) ) @@ -177,13 +177,13 @@ (local $J f64) (set_local $J (f64.sub - (block $block0 + (block $block0 f64 (drop (f64.const 0.1) ) (f64.const 5.1) ) - (block $block1 + (block $block1 f64 (drop (f64.const 3.2) ) @@ -193,7 +193,7 @@ ) ) (func $switcher (type $6) (param $x i32) (result i32) - (block $topmost + (block $topmost i32 (block $switch$0 (block $switch-default$3 (block $switch-case$2 @@ -284,14 +284,14 @@ ) ) (func $frem (type $4) (result f64) - (call_import $f64-rem + (call $f64-rem (f64.const 5.5) (f64.const 1.2) ) ) (func $big_uint_div_u (type $5) (result i32) (local $x i32) - (block $topmost + (block $topmost i32 (set_local $x (i32.and (i32.div_u @@ -340,7 +340,7 @@ (local $asm2wasm_i32_temp i32) (block $block0 (set_local $x - (block $block1 + (block $block1 i32 (set_local $asm2wasm_i32_temp (i32.const 0) ) diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary index 4a311f41a..1080d5d20 100644 --- a/test/unit.wast.fromBinary +++ b/test/unit.wast.fromBinary @@ -37,7 +37,7 @@ ) (func $importedDoubles (type $4) (result f64) (local $var$0 f64) - (block $label$0 + (block $label$0 f64 (set_local $var$0 (f64.add (f64.add @@ -95,7 +95,7 @@ (local $var$2 i32) (local $var$3 f64) (local $var$4 f64) - (block $label$0 + (block $label$0 f64 (if (f64.gt (get_local $var$0) @@ -166,7 +166,7 @@ (local $var$1 f64) (block $label$0 (set_local $var$0 - (call_import $import$1 + (call $import$1 (get_local $var$1) ) ) @@ -189,13 +189,13 @@ (local $var$0 f64) (set_local $var$0 (f64.sub - (block $label$0 + (block $label$0 f64 (drop (f64.const 0.1) ) (f64.const 5.1) ) - (block $label$1 + (block $label$1 f64 (drop (f64.const 3.2) ) @@ -205,7 +205,7 @@ ) ) (func $switcher (type $6) (param $var$0 i32) (result i32) - (block $label$0 + (block $label$0 i32 (block $label$1 (block $label$2 (block $label$3 @@ -292,14 +292,14 @@ ) ) (func $frem (type $4) (result f64) - (call_import $import$2 + (call $import$2 (f64.const 5.5) (f64.const 1.2) ) ) (func $big_uint_div_u (type $5) (result i32) (local $var$0 i32) - (block $label$0 + (block $label$0 i32 (set_local $var$0 (i32.and (i32.div_u @@ -348,7 +348,7 @@ (local $var$3 f64) (block $label$0 (set_local $var$0 - (block $label$1 + (block $label$1 i32 (set_local $var$1 (i32.const 0) ) @@ -428,7 +428,7 @@ (nop) ) (func $block_and_after (type $5) (result i32) - (block $label$0 + (block $label$0 i32 (block $label$1 (drop (i32.const 1) |