6 files changed, 123 insertions, 123 deletions
diff --git a/test/emcc_O2_hello_world.wast.fromBinary b/test/emcc_O2_hello_world.wast.fromBinary
index 0039fa2d1..6bf36ba80 100644
--- a/test/emcc_O2_hello_world.wast.fromBinary
+++ b/test/emcc_O2_hello_world.wast.fromBinary
@@ -42,7 +42,7 @@
   (export "_main" $_main)
   (export "stackSave" $stackSave)
   (table $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 $var$0 i32) (result i32)
+  (func $_malloc (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -7526,7 +7526,7 @@
       (get_local $var$12)
     )
   )
-  (func $_free (param $var$0 i32)
+  (func $_free (type $2) (param $var$0 i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -9878,7 +9878,7 @@
       (br $label$0)
     )
   )
-  (func $___stdio_write (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___stdio_write (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -10356,7 +10356,7 @@
       (get_local $var$23)
     )
   )
-  (func $___fwritex (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___fwritex (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -10638,7 +10638,7 @@
       (get_local $var$7)
     )
   )
-  (func $_fflush (param $var$0 i32) (result i32)
+  (func $_fflush (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -10840,7 +10840,7 @@
       (get_local $var$1)
     )
   )
-  (func $_strlen (param $var$0 i32) (result i32)
+  (func $_strlen (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -11045,7 +11045,7 @@
       )
     )
   )
-  (func $___overflow (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $___overflow (type $4) (param $var$0 i32) (param $var$1 i32) (result i32)
     (local $var$2 i32)
     (local $var$3 i32)
     (local $var$4 i32)
@@ -11236,7 +11236,7 @@
       (get_local $var$9)
     )
   )
-  (func $___fflush_unlocked (param $var$0 i32) (result i32)
+  (func $___fflush_unlocked (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -11389,7 +11389,7 @@
       (get_local $var$3)
     )
   )
-  (func $_memcpy (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_memcpy (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (block $label$0
       (if
@@ -11551,10 +11551,10 @@
       (get_local $var$3)
     )
   )
-  (func $runPostSets
+  (func $runPostSets (type $5)
     (nop)
   )
-  (func $_memset (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_memset (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -11711,7 +11711,7 @@
       )
     )
   )
-  (func $_puts (param $var$0 i32) (result i32)
+  (func $_puts (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -11843,7 +11843,7 @@
       )
     )
   )
-  (func $___stdio_seek (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___stdio_seek (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -11941,7 +11941,7 @@
       (get_local $var$6)
     )
   )
-  (func $___towrite (param $var$0 i32) (result i32)
+  (func $___towrite (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -12052,7 +12052,7 @@
       (get_local $var$3)
     )
   )
-  (func $_fwrite (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $_fwrite (type $7) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (local $var$5 i32)
     (local $var$6 i32)
@@ -12138,7 +12138,7 @@
       (get_local $var$8)
     )
   )
-  (func $___stdout_write (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___stdout_write (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (block $label$0
@@ -12240,7 +12240,7 @@
       (get_local $var$4)
     )
   )
-  (func $copyTempDouble (param $var$0 i32)
+  (func $copyTempDouble (type $2) (param $var$0 i32)
     (block $label$0
       (i32.store8 align=1
         (i32.load align=4
@@ -12350,7 +12350,7 @@
       )
     )
   )
-  (func $___stdio_close (param $var$0 i32) (result i32)
+  (func $___stdio_close (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (block $label$0
@@ -12395,7 +12395,7 @@
       (get_local $var$0)
     )
   )
-  (func $copyTempFloat (param $var$0 i32)
+  (func $copyTempFloat (type $2) (param $var$0 i32)
     (block $label$0
       (i32.store8 align=1
         (i32.load align=4
@@ -12449,7 +12449,7 @@
       )
     )
   )
-  (func $___syscall_ret (param $var$0 i32) (result i32)
+  (func $___syscall_ret (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (block $label$0
       (if_else
@@ -12479,7 +12479,7 @@
       (get_local $var$1)
     )
   )
-  (func $dynCall_iiii (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $dynCall_iiii (type $7) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (call_indirect $0
       (i32.add
         (i32.and
@@ -12493,7 +12493,7 @@
       (get_local $var$3)
     )
   )
-  (func $stackAlloc (param $var$0 i32) (result i32)
+  (func $stackAlloc (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (block $label$0
       (set_local $var$1
@@ -12525,7 +12525,7 @@
       (get_local $var$1)
     )
   )
-  (func $___errno_location (result i32)
+  (func $___errno_location (type $3) (result i32)
     (local $var$0 i32)
     (block $label$0
       (if_else
@@ -12550,7 +12550,7 @@
       (get_local $var$0)
     )
   )
-  (func $setThrew (param $var$0 i32) (param $var$1 i32)
+  (func $setThrew (type $6) (param $var$0 i32) (param $var$1 i32)
     (if
       (i32.eq
         (i32.load align=4
@@ -12570,7 +12570,7 @@
       )
     )
   )
-  (func $_fputs (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $_fputs (type $4) (param $var$0 i32) (param $var$1 i32) (result i32)
     (i32.add
       (call $_fwrite
         (get_local $var$0)
@@ -12583,7 +12583,7 @@
       (i32.const 255)
     )
   )
-  (func $dynCall_ii (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $dynCall_ii (type $4) (param $var$0 i32) (param $var$1 i32) (result i32)
     (call_indirect $1
       (i32.add
         (i32.and
@@ -12595,7 +12595,7 @@
       (get_local $var$1)
     )
   )
-  (func $_cleanup_418 (param $var$0 i32)
+  (func $_cleanup_418 (type $2) (param $var$0 i32)
     (block $label$0
       (if
         (i32.eq
@@ -12614,7 +12614,7 @@
       (br $label$0)
     )
   )
-  (func $establishStackSpace (param $var$0 i32) (param $var$1 i32)
+  (func $establishStackSpace (type $6) (param $var$0 i32) (param $var$1 i32)
     (block $label$0
       (i32.store align=4
         (i32.const 8)
@@ -12626,7 +12626,7 @@
       )
     )
   )
-  (func $dynCall_vi (param $var$0 i32) (param $var$1 i32)
+  (func $dynCall_vi (type $6) (param $var$0 i32) (param $var$1 i32)
     (call_indirect $2
       (i32.add
         (i32.and
@@ -12638,7 +12638,7 @@
       (get_local $var$1)
     )
   )
-  (func $b1 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $b1 (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (block $label$0
       (call_import $abort
         (i32.const 1)
@@ -12646,19 +12646,19 @@
       (i32.const 0)
     )
   )
-  (func $stackRestore (param $var$0 i32)
+  (func $stackRestore (type $2) (param $var$0 i32)
     (i32.store align=4
       (i32.const 8)
       (get_local $var$0)
     )
   )
-  (func $setTempRet0 (param $var$0 i32)
+  (func $setTempRet0 (type $2) (param $var$0 i32)
     (i32.store align=4
       (i32.const 160)
       (get_local $var$0)
     )
   )
-  (func $b0 (param $var$0 i32) (result i32)
+  (func $b0 (type $1) (param $var$0 i32) (result i32)
     (block $label$0
       (call_import $abort
         (i32.const 0)
@@ -12666,20 +12666,20 @@
       (i32.const 0)
     )
   )
-  (func $___unlockfile (param $var$0 i32)
+  (func $___unlockfile (type $2) (param $var$0 i32)
     (block $label$0
       (br $label$0)
     )
   )
-  (func $___lockfile (param $var$0 i32) (result i32)
+  (func $___lockfile (type $1) (param $var$0 i32) (result i32)
     (i32.const 0)
   )
-  (func $getTempRet0 (result i32)
+  (func $getTempRet0 (type $3) (result i32)
     (i32.load align=4
       (i32.const 160)
     )
   )
-  (func $_main (result i32)
+  (func $_main (type $3) (result i32)
     (block $label$0
       (call $_puts
         (i32.const 672)
@@ -12687,12 +12687,12 @@
       (i32.const 0)
     )
   )
-  (func $stackSave (result i32)
+  (func $stackSave (type $3) (result i32)
     (i32.load align=4
       (i32.const 8)
     )
   )
-  (func $b2 (param $var$0 i32)
+  (func $b2 (type $2) (param $var$0 i32)
     (call_import $abort
       (i32.const 2)
     )
diff --git a/test/emcc_hello_world.wast.fromBinary b/test/emcc_hello_world.wast.fromBinary
index cb9dcf6bc..2046930b1 100644
--- a/test/emcc_hello_world.wast.fromBinary
+++ b/test/emcc_hello_world.wast.fromBinary
@@ -55,7 +55,7 @@
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
   (table $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 $var$0 i32) (result i32)
+  (func $stackAlloc (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (block $label$0
       (set_local $var$1
@@ -98,18 +98,18 @@
       (get_local $var$1)
     )
   )
-  (func $stackSave (result i32)
+  (func $stackSave (type $4) (result i32)
     (i32.load align=4
       (i32.const 8)
     )
   )
-  (func $stackRestore (param $var$0 i32)
+  (func $stackRestore (type $2) (param $var$0 i32)
     (i32.store align=4
       (i32.const 8)
       (get_local $var$0)
     )
   )
-  (func $establishStackSpace (param $var$0 i32) (param $var$1 i32)
+  (func $establishStackSpace (type $6) (param $var$0 i32) (param $var$1 i32)
     (block $label$0
       (i32.store align=4
         (i32.const 8)
@@ -121,7 +121,7 @@
       )
     )
   )
-  (func $setThrew (param $var$0 i32) (param $var$1 i32)
+  (func $setThrew (type $6) (param $var$0 i32) (param $var$1 i32)
     (if
       (i32.eq
         (i32.load align=4
@@ -141,7 +141,7 @@
       )
     )
   )
-  (func $copyTempFloat (param $var$0 i32)
+  (func $copyTempFloat (type $2) (param $var$0 i32)
     (block $label$0
       (i32.store8 align=1
         (i32.load align=4
@@ -195,7 +195,7 @@
       )
     )
   )
-  (func $copyTempDouble (param $var$0 i32)
+  (func $copyTempDouble (type $2) (param $var$0 i32)
     (block $label$0
       (i32.store8 align=1
         (i32.load align=4
@@ -305,18 +305,18 @@
       )
     )
   )
-  (func $setTempRet0 (param $var$0 i32)
+  (func $setTempRet0 (type $2) (param $var$0 i32)
     (i32.store align=4
       (i32.const 168)
       (get_local $var$0)
     )
   )
-  (func $getTempRet0 (result i32)
+  (func $getTempRet0 (type $4) (result i32)
     (i32.load align=4
       (i32.const 168)
     )
   )
-  (func $_main (result i32)
+  (func $_main (type $4) (result i32)
     (local $var$0 i32)
     (local $var$1 i32)
     (local $var$2 i32)
@@ -364,7 +364,7 @@
       (i32.const 0)
     )
   )
-  (func $_frexp (param $var$0 f64) (param $var$1 i32) (result f64)
+  (func $_frexp (type $8) (param $var$0 f64) (param $var$1 i32) (result f64)
     (local $var$2 i32)
     (local $var$3 i32)
     (local $var$4 i32)
@@ -560,7 +560,7 @@
       (get_local $var$19)
     )
   )
-  (func $_frexpl (param $var$0 f64) (param $var$1 i32) (result f64)
+  (func $_frexpl (type $8) (param $var$0 f64) (param $var$1 i32) (result f64)
     (local $var$2 i32)
     (local $var$3 i32)
     (local $var$4 f64)
@@ -579,7 +579,7 @@
       (get_local $var$4)
     )
   )
-  (func $_strerror (param $var$0 i32) (result i32)
+  (func $_strerror (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -803,7 +803,7 @@
       (get_local $var$13)
     )
   )
-  (func $___errno_location (result i32)
+  (func $___errno_location (type $4) (result i32)
     (local $var$0 i32)
     (local $var$1 i32)
     (local $var$2 i32)
@@ -857,7 +857,7 @@
       (get_local $var$4)
     )
   )
-  (func $___stdio_close (param $var$0 i32) (result i32)
+  (func $___stdio_close (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -927,7 +927,7 @@
       (get_local $var$3)
     )
   )
-  (func $___stdout_write (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___stdout_write (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -1090,7 +1090,7 @@
       (get_local $var$7)
     )
   )
-  (func $___stdio_seek (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___stdio_seek (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -1242,7 +1242,7 @@
       (get_local $var$5)
     )
   )
-  (func $_fflush (param $var$0 i32) (result i32)
+  (func $_fflush (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -1578,7 +1578,7 @@
       (get_local $var$29)
     )
   )
-  (func $_printf (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $_printf (type $5) (param $var$0 i32) (param $var$1 i32) (result i32)
     (local $var$2 i32)
     (local $var$3 i32)
     (local $var$4 i32)
@@ -1636,7 +1636,7 @@
       (get_local $var$4)
     )
   )
-  (func $___lockfile (param $var$0 i32) (result i32)
+  (func $___lockfile (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (block $label$0
@@ -1648,7 +1648,7 @@
       (i32.const 0)
     )
   )
-  (func $___unlockfile (param $var$0 i32)
+  (func $___unlockfile (type $2) (param $var$0 i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (block $label$0
@@ -1660,7 +1660,7 @@
       (br $label$0)
     )
   )
-  (func $___stdio_write (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___stdio_write (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -2332,7 +2332,7 @@
       (get_local $var$55)
     )
   )
-  (func $_vfprintf (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_vfprintf (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -2808,7 +2808,7 @@
       (get_local $var$35)
     )
   )
-  (func $___fwritex (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $___fwritex (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -3221,7 +3221,7 @@
       (get_local $var$32)
     )
   )
-  (func $___towrite (param $var$0 i32) (result i32)
+  (func $___towrite (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -3418,7 +3418,7 @@
       (get_local $var$16)
     )
   )
-  (func $_wcrtomb (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_wcrtomb (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -3865,7 +3865,7 @@
       (get_local $var$42)
     )
   )
-  (func $_wctomb (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $_wctomb (type $5) (param $var$0 i32) (param $var$1 i32) (result i32)
     (local $var$2 i32)
     (local $var$3 i32)
     (local $var$4 i32)
@@ -3904,7 +3904,7 @@
       (get_local $var$3)
     )
   )
-  (func $_memchr (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_memchr (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -4501,7 +4501,7 @@
       (get_local $var$20)
     )
   )
-  (func $___syscall_ret (param $var$0 i32) (result i32)
+  (func $___syscall_ret (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -4550,7 +4550,7 @@
       (get_local $var$3)
     )
   )
-  (func $___fflush_unlocked (param $var$0 i32) (result i32)
+  (func $___fflush_unlocked (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -4779,7 +4779,7 @@
       (get_local $var$11)
     )
   )
-  (func $_cleanup (param $var$0 i32)
+  (func $_cleanup (type $2) (param $var$0 i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -4817,7 +4817,7 @@
       (br $label$0)
     )
   )
-  (func $_printf_core (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
+  (func $_printf_core (type $9) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
     (local $var$5 i32)
     (local $var$6 i32)
     (local $var$7 i32)
@@ -14897,7 +14897,7 @@
       (get_local $var$821)
     )
   )
-  (func $_pop_arg_336 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32)
+  (func $_pop_arg_336 (type $10) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -16202,7 +16202,7 @@
       (br $label$0)
     )
   )
-  (func $_fmt_u (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_fmt_u (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -16525,7 +16525,7 @@
       (get_local $var$33)
     )
   )
-  (func $_pad (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32)
+  (func $_pad (type $11) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32)
     (local $var$5 i32)
     (local $var$6 i32)
     (local $var$7 i32)
@@ -16785,7 +16785,7 @@
       (br $label$0)
     )
   )
-  (func $_malloc (param $var$0 i32) (result i32)
+  (func $_malloc (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -27922,7 +27922,7 @@
       (get_local $var$949)
     )
   )
-  (func $_free (param $var$0 i32)
+  (func $_free (type $2) (param $var$0 i32)
     (local $var$1 i32)
     (local $var$2 i32)
     (local $var$3 i32)
@@ -31408,10 +31408,10 @@
       (br $label$0)
     )
   )
-  (func $runPostSets
+  (func $runPostSets (type $3)
     (nop)
   )
-  (func $_i64Subtract (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $_i64Subtract (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (local $var$5 i32)
     (block $label$0
@@ -31463,7 +31463,7 @@
       )
     )
   )
-  (func $_i64Add (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $_i64Add (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (local $var$5 i32)
     (block $label$0
@@ -31506,7 +31506,7 @@
       )
     )
   )
-  (func $_memset (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_memset (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (local $var$4 i32)
     (local $var$5 i32)
@@ -31663,7 +31663,7 @@
       )
     )
   )
-  (func $_bitshift64Lshr (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_bitshift64Lshr (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (block $label$0
       (if
@@ -31721,7 +31721,7 @@
       )
     )
   )
-  (func $_bitshift64Shl (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_bitshift64Shl (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (block $label$0
       (if
@@ -31785,7 +31785,7 @@
       (i32.const 0)
     )
   )
-  (func $_memcpy (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_memcpy (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (block $label$0
       (if
@@ -31947,7 +31947,7 @@
       (get_local $var$3)
     )
   )
-  (func $_bitshift64Ashr (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $_bitshift64Ashr (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (local $var$3 i32)
     (block $label$0
       (if
@@ -32012,7 +32012,7 @@
       )
     )
   )
-  (func $_llvm_cttz_i32 (param $var$0 i32) (result i32)
+  (func $_llvm_cttz_i32 (type $1) (param $var$0 i32) (result i32)
     (local $var$1 i32)
     (block $label$0
       (set_local $var$1
@@ -32109,7 +32109,7 @@
       )
     )
   )
-  (func $___muldsi3 (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $___muldsi3 (type $5) (param $var$0 i32) (param $var$1 i32) (result i32)
     (local $var$2 i32)
     (local $var$3 i32)
     (local $var$4 i32)
@@ -32211,7 +32211,7 @@
       )
     )
   )
-  (func $___divdi3 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $___divdi3 (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (local $var$5 i32)
     (local $var$6 i32)
@@ -32389,7 +32389,7 @@
       (get_local $var$14)
     )
   )
-  (func $___remdi3 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $___remdi3 (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (local $var$5 i32)
     (local $var$6 i32)
@@ -32590,7 +32590,7 @@
       )
     )
   )
-  (func $___muldi3 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $___muldi3 (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (local $var$5 i32)
     (local $var$6 i32)
@@ -32650,7 +32650,7 @@
       )
     )
   )
-  (func $___udivdi3 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $___udivdi3 (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (block $label$0
       (set_local $var$4
@@ -32665,7 +32665,7 @@
       (get_local $var$4)
     )
   )
-  (func $___uremdi3 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $___uremdi3 (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (local $var$4 i32)
     (local $var$5 i32)
     (block $label$0
@@ -32713,7 +32713,7 @@
       )
     )
   )
-  (func $___udivmoddi4 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
+  (func $___udivmoddi4 (type $9) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
     (local $var$5 i32)
     (local $var$6 i32)
     (local $var$7 i32)
@@ -34050,7 +34050,7 @@
       )
     )
   )
-  (func $dynCall_ii (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $dynCall_ii (type $5) (param $var$0 i32) (param $var$1 i32) (result i32)
     (call_indirect $1
       (i32.add
         (i32.and
@@ -34062,7 +34062,7 @@
       (get_local $var$1)
     )
   )
-  (func $dynCall_iiii (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
+  (func $dynCall_iiii (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (result i32)
     (call_indirect $0
       (i32.add
         (i32.and
@@ -34076,7 +34076,7 @@
       (get_local $var$3)
     )
   )
-  (func $dynCall_vi (param $var$0 i32) (param $var$1 i32)
+  (func $dynCall_vi (type $6) (param $var$0 i32) (param $var$1 i32)
     (call_indirect $2
       (i32.add
         (i32.and
@@ -34088,7 +34088,7 @@
       (get_local $var$1)
     )
   )
-  (func $b0 (param $var$0 i32) (result i32)
+  (func $b0 (type $1) (param $var$0 i32) (result i32)
     (block $label$0
       (call_import $nullFunc_ii
         (i32.const 0)
@@ -34096,7 +34096,7 @@
       (i32.const 0)
     )
   )
-  (func $b1 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $b1 (type $0) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (block $label$0
       (call_import $nullFunc_iiii
         (i32.const 1)
@@ -34104,7 +34104,7 @@
       (i32.const 0)
     )
   )
-  (func $b2 (param $var$0 i32)
+  (func $b2 (type $2) (param $var$0 i32)
     (call_import $nullFunc_vi
       (i32.const 2)
     )
diff --git a/test/hello_world.wast.fromBinary b/test/hello_world.wast.fromBinary
index 7f2e65239..74331f60c 100644
--- a/test/hello_world.wast.fromBinary
+++ b/test/hello_world.wast.fromBinary
@@ -2,7 +2,7 @@
   (memory 16777216 16777216)
   (type $0 (func (param i32 i32) (result i32)))
   (export "add" $add)
-  (func $add (param $var$0 i32) (param $var$1 i32) (result i32)
+  (func $add (type $0) (param $var$0 i32) (param $var$1 i32) (result i32)
     (i32.add
       (get_local $var$0)
       (get_local $var$1)
diff --git a/test/kitchen_sink.wast.fromBinary b/test/kitchen_sink.wast.fromBinary
index a4a28fcef..473161af7 100644
--- a/test/kitchen_sink.wast.fromBinary
+++ b/test/kitchen_sink.wast.fromBinary
@@ -3,7 +3,7 @@
     (segment 1026 "\14\00")
   )
   (type $0 (func (result i32)))
-  (func $kitchensink (result i32)
+  (func $kitchensink (type $0) (result i32)
     (block $label$0
       (i32.add
         (i32.const 10)
diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary
index 65e4d234e..22aba76b3 100644
--- a/test/min.wast.fromBinary
+++ b/test/min.wast.fromBinary
@@ -5,14 +5,14 @@
   (type $2 (func (param i32) (result i32)))
   (type $3 (func (param i32 i32 i32) (result i32)))
   (export "floats" $floats)
-  (func $floats (param $var$0 f32) (result f32)
+  (func $floats (type $0) (param $var$0 f32) (result f32)
     (local $var$1 f32)
     (f32.add
       (get_local $var$1)
       (get_local $var$0)
     )
   )
-  (func $neg (param $var$0 i32) (param $var$1 i32)
+  (func $neg (type $1) (param $var$0 i32) (param $var$1 i32)
     (local $var$2 f32)
     (set_local $var$2
       (f32.neg
@@ -28,7 +28,7 @@
       )
     )
   )
-  (func $littleswitch (param $var$0 i32) (result i32)
+  (func $littleswitch (type $2) (param $var$0 i32) (result i32)
     (block $label$0
       (tableswitch $label$3
         (i32.sub
@@ -50,7 +50,7 @@
       (i32.const 0)
     )
   )
-  (func $f1 (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
+  (func $f1 (type $3) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
     (block $label$0
       (get_local $var$2)
     )
diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary
index 472c2800a..4b9674874 100644
--- a/test/unit.wast.fromBinary
+++ b/test/unit.wast.fromBinary
@@ -14,7 +14,7 @@
   (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
   (export "big_negative" $big_negative)
   (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
-  (func $big_negative
+  (func $big_negative (type $1)
     (local $var$0 f64)
     (block $label$0
       (set_local $var$0
@@ -34,7 +34,7 @@
       )
     )
   )
-  (func $importedDoubles (result f64)
+  (func $importedDoubles (type $4) (result f64)
     (local $var$0 f64)
     (block $label$0
       (set_local $var$0
@@ -86,7 +86,7 @@
       (f64.const 1.2)
     )
   )
-  (func $doubleCompares (param $var$0 f64) (param $var$1 f64) (result f64)
+  (func $doubleCompares (type $3) (param $var$0 f64) (param $var$1 f64) (result f64)
     (local $var$2 i32)
     (local $var$3 f64)
     (local $var$4 f64)
@@ -130,14 +130,14 @@
       (get_local $var$1)
     )
   )
-  (func $intOps (result i32)
+  (func $intOps (type $5) (result i32)
     (local $var$0 i32)
     (i32.eq
       (get_local $var$0)
       (i32.const 0)
     )
   )
-  (func $conversions
+  (func $conversions (type $1)
     (local $var$0 i32)
     (local $var$1 f64)
     (block $label$0
@@ -161,7 +161,7 @@
       )
     )
   )
-  (func $seq
+  (func $seq (type $1)
     (local $var$0 f64)
     (set_local $var$0
       (f64.sub
@@ -176,7 +176,7 @@
       )
     )
   )
-  (func $switcher (param $var$0 i32) (result i32)
+  (func $switcher (type $6) (param $var$0 i32) (result i32)
     (block $label$0
       (tableswitch $label$4
         (i32.sub
@@ -259,18 +259,18 @@
       (i32.const 0)
     )
   )
-  (func $blocker
+  (func $blocker (type $1)
     (block $label$0
       (br $label$0)
     )
   )
-  (func $frem (result f64)
+  (func $frem (type $4) (result f64)
     (call_import $f64-rem
       (f64.const 5.5)
       (f64.const 1.2)
     )
   )
-  (func $big_uint_div_u (result i32)
+  (func $big_uint_div_u (type $5) (result i32)
     (local $var$0 i32)
     (block $label$0
       (set_local $var$0
@@ -285,7 +285,7 @@
       (get_local $var$0)
     )
   )
-  (func $fr (param $var$0 f32)
+  (func $fr (type $0) (param $var$0 f32)
     (local $var$1 f32)
     (local $var$2 f64)
     (block $label$0
@@ -299,10 +299,10 @@
       (f32.const 0)
     )
   )
-  (func $negZero (result f64)
+  (func $negZero (type $4) (result f64)
     (f64.const -0)
   )
-  (func $abs
+  (func $abs (type $1)
     (local $var$0 i32)
     (local $var$1 i32)
     (local $var$2 f32)
@@ -338,7 +338,7 @@
       )
     )
   )
-  (func $neg
+  (func $neg (type $1)
     (local $var$0 f32)
     (block $label$0
       (set_local $var$0
@@ -358,7 +358,7 @@
       )
     )
   )
-  (func $cneg (param $var$0 f32)
+  (func $cneg (type $0) (param $var$0 f32)
     (call_indirect $0
       (i32.add
         (i32.and
@@ -370,7 +370,7 @@
       (get_local $var$0)
     )
   )
-  (func $___syscall_ret
+  (func $___syscall_ret (type $1)
     (local $var$0 i32)
     (i32.gt_u
       (i32.shr_u
@@ -380,13 +380,13 @@
       (i32.const -4096)
     )
   )
-  (func $z
+  (func $z (type $1)
     (nop)
   )
-  (func $w
+  (func $w (type $1)
     (nop)
   )
-  (func $block_and_after (result i32)
+  (func $block_and_after (type $5) (result i32)
     (block $label$0
       (block $label$1
         (i32.const 1)