Accept expect tests (order of types changed)

tests/expect/tests/add.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/call-ret.wast

@@ -4,21 +4,24 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
-  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t12)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
+  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t15)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
-  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t6)))
-  (import "e" "jit_find_cache_entry_in_page" (func $e.jit_find_cache_entry_in_page (type $t13)))
+  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t7)))
+  (import "e" "jit_find_cache_entry_in_page" (func $e.jit_find_cache_entry_in_page (type $t16)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))
   (func $f (export "f") (type $t1) (param $p0 i32)

tests/expect/tests/do-while.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/if.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))
@@ -168,7 +171,8 @@
                                         (get_local $l12)
                                         (get_local $l11))
                                       (i32.shr_u
-                                        (get_local $l10)
+                                        (i32.load
+                                          (i32.const 116))
                                         (i32.const 31)))
                                     (get_local $l12)))
                                 (i32.load

tests/expect/tests/inc.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/indirect-call.wast

@@ -4,21 +4,24 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "assert_seg_non_null" (func $e.assert_seg_non_null (type $t1)))
-  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t6)))
-  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t12)))
-  (import "e" "jit_find_cache_entry_in_page" (func $e.jit_find_cache_entry_in_page (type $t13)))
+  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t7)))
+  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t15)))
+  (import "e" "jit_find_cache_entry_in_page" (func $e.jit_find_cache_entry_in_page (type $t16)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/loop.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/mem32r.wast

@@ -4,19 +4,22 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "assert_seg_non_null" (func $e.assert_seg_non_null (type $t1)))
-  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t6)))
+  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t7)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/mem32rmw.wast

@@ -4,20 +4,23 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "assert_seg_non_null" (func $e.assert_seg_non_null (type $t1)))
-  (import "e" "safe_read_write32s_slow_jit" (func $e.safe_read_write32s_slow_jit (type $t6)))
-  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t12)))
+  (import "e" "safe_read_write32s_slow_jit" (func $e.safe_read_write32s_slow_jit (type $t7)))
+  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t15)))
   (import "e" "bug_gen_safe_read_write_page_fault" (func $e.bug_gen_safe_read_write_page_fault (type $t2)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))

tests/expect/tests/mem32w.wast

@@ -4,19 +4,22 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "assert_seg_non_null" (func $e.assert_seg_non_null (type $t1)))
-  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t12)))
+  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t15)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/mov-immoffs.wast

@@ -4,19 +4,22 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "assert_seg_non_null" (func $e.assert_seg_non_null (type $t1)))
-  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t6)))
+  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t7)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/pop.wast

@@ -4,18 +4,21 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
-  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t6)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
+  (import "e" "safe_read32s_slow_jit" (func $e.safe_read32s_slow_jit (type $t7)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/push.wast

@@ -4,18 +4,21 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
-  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t12)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
+  (import "e" "safe_write32_slow_jit" (func $e.safe_write32_slow_jit (type $t15)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))

tests/expect/tests/sti.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "instr_FB_without_fault" (func $e.instr_FB_without_fault (type $t4)))
   (import "e" "trigger_gp" (func $e.trigger_gp (type $t1)))
   (import "e" "handle_irqs" (func $e.handle_irqs (type $t0)))

tests/expect/tests/task_switch_test.wast

@@ -4,20 +4,23 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "task_switch_test_jit" (func $e.task_switch_test_jit (type $t0)))
-  (import "e" "fpu_get_sti" (func $e.fpu_get_sti (type $t7)))
-  (import "e" "fpu_fadd" (func $e.fpu_fadd (type $t8)))
+  (import "e" "fpu_get_sti" (func $e.fpu_get_sti (type $t8)))
+  (import "e" "fpu_fadd" (func $e.fpu_fadd (type $t10)))
   (import "e" "fpu_pop" (func $e.fpu_pop (type $t0)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))

tests/expect/tests/task_switch_test_sse.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "task_switch_test_mmx_jit" (func $e.task_switch_test_mmx_jit (type $t0)))
   (import "e" "instr_660F54_reg" (func $e.instr_660F54_reg (type $t2)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))

tests/expect/tests/while-do.wast

@@ -4,17 +4,20 @@
   (type $t2 (func (param i32 i32)))
   (type $t3 (func (param i32 i32 i32)))
   (type $t4 (func (result i32)))
-  (type $t5 (func (param i32) (result i32)))
-  (type $t6 (func (param i32 i32) (result i32)))
-  (type $t7 (func (param i32) (result f64)))
-  (type $t8 (func (param i32 f64)))
-  (type $t9 (func (param f64)))
-  (type $t10 (func (param f64) (result i32)))
-  (type $t11 (func (param f64) (result i64)))
-  (type $t12 (func (param i32 i32 i32) (result i32)))
-  (type $t13 (func (param i32 i32 i32 i32) (result i32)))
-  (type $t14 (func (param i32 i64 i32) (result i32)))
-  (type $t15 (func (param i32 i64 i64 i32) (result i32)))
+  (type $t5 (func (result i64)))
+  (type $t6 (func (param i32) (result i32)))
+  (type $t7 (func (param i32 i32) (result i32)))
+  (type $t8 (func (param i32) (result f64)))
+  (type $t9 (func (param i32) (result i64)))
+  (type $t10 (func (param i32 f64)))
+  (type $t11 (func (param i64 i32)))
+  (type $t12 (func (param f64)))
+  (type $t13 (func (param f64) (result i32)))
+  (type $t14 (func (param f64) (result i64)))
+  (type $t15 (func (param i32 i32 i32) (result i32)))
+  (type $t16 (func (param i32 i32 i32 i32) (result i32)))
+  (type $t17 (func (param i32 i64 i32) (result i32)))
+  (type $t18 (func (param i32 i64 i64 i32) (result i32)))
   (import "e" "instr_F4" (func $e.instr_F4 (type $t0)))
   (import "e" "trigger_pagefault_end_jit" (func $e.trigger_pagefault_end_jit (type $t0)))
   (import "e" "m" (memory $e.m 256))