Avoid trampolines where optional arguments are constant literals, see #102; Fix temporary local flags not being cleared; Fix inlined temporary locals not being free'd; Fix inlined flows not breaking after returns; Allow changetype of u32s, i.e. function pointers

This commit is contained in:
dcodeIO
2018-05-11 16:31:56 +02:00
parent ef9b43740d
commit e415377cda
35 changed files with 3424 additions and 4059 deletions

View File

@@ -18,8 +18,8 @@
(global $std/string/str (mut i32) (i32.const 4))
(global $std/string/nullStr (mut i32) (i32.const 0))
(global $~lib/internal/string/HEADER_SIZE i32 (i32.const 4))
(global $~argc (mut i32) (i32.const 0))
(global $~lib/internal/string/MAX_LENGTH i32 (i32.const 536870910))
(global $~argc (mut i32) (i32.const 0))
(global $NaN f64 (f64.const nan:0x8000000000000))
(global $~lib/internal/string/CharCode.PLUS i32 (i32.const 43))
(global $~lib/internal/string/CharCode.MINUS i32 (i32.const 45))
@@ -302,30 +302,7 @@
)
)
)
(func $~lib/string/String#startsWith|trampoline (; 4 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(block $1of1
(block $0of1
(block $oob
(br_table $0of1 $1of1 $oob
(i32.sub
(get_global $~argc)
(i32.const 1)
)
)
)
(unreachable)
)
(set_local $2
(i32.const 0)
)
)
(call $~lib/string/String#startsWith
(get_local $0)
(get_local $1)
(get_local $2)
)
)
(func $~lib/string/String#endsWith (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(func $~lib/string/String#endsWith (; 4 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@@ -429,7 +406,7 @@
)
)
)
(func $~lib/string/String#endsWith|trampoline (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(func $~lib/string/String#endsWith|trampoline (; 5 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(block $1of1
(block $0of1
(block $oob
@@ -452,7 +429,7 @@
(get_local $2)
)
)
(func $~lib/string/String#indexOf (; 7 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(func $~lib/string/String#indexOf (; 6 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@@ -579,7 +556,7 @@
(i32.const -1)
)
)
(func $~lib/string/String#includes (; 8 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(func $~lib/string/String#includes (; 7 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(return
(i32.ne
(call $~lib/string/String#indexOf
@@ -591,58 +568,12 @@
)
)
)
(func $~lib/string/String#includes|trampoline (; 9 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(block $1of1
(block $0of1
(block $oob
(br_table $0of1 $1of1 $oob
(i32.sub
(get_global $~argc)
(i32.const 1)
)
)
)
(unreachable)
)
(set_local $2
(i32.const 0)
)
)
(call $~lib/string/String#includes
(get_local $0)
(get_local $1)
(get_local $2)
)
)
(func $~lib/string/String#indexOf|trampoline (; 10 ;) (type $iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
(block $1of1
(block $0of1
(block $oob
(br_table $0of1 $1of1 $oob
(i32.sub
(get_global $~argc)
(i32.const 1)
)
)
)
(unreachable)
)
(set_local $2
(i32.const 0)
)
)
(call $~lib/string/String#indexOf
(get_local $0)
(get_local $1)
(get_local $2)
)
)
(func $std/string/getString (; 11 ;) (type $i) (result i32)
(func $std/string/getString (; 8 ;) (type $i) (result i32)
(return
(get_global $std/string/str)
)
)
(func $~lib/internal/string/parse<f64> (; 12 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
(func $~lib/internal/string/parse<f64> (; 9 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@@ -1034,7 +965,7 @@
)
)
)
(func $~lib/string/parseInt (; 13 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
(func $~lib/string/parseInt (; 10 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
(return
(call $~lib/internal/string/parse<f64>
(get_local $0)
@@ -1042,29 +973,7 @@
)
)
)
(func $~lib/string/parseInt|trampoline (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
(block $1of1
(block $0of1
(block $oob
(br_table $0of1 $1of1 $oob
(i32.sub
(get_global $~argc)
(i32.const 1)
)
)
)
(unreachable)
)
(set_local $1
(i32.const 0)
)
)
(call $~lib/string/parseInt
(get_local $0)
(get_local $1)
)
)
(func $~lib/string/parseFloat (; 15 ;) (type $iF) (param $0 i32) (result f64)
(func $~lib/string/parseFloat (; 11 ;) (type $iF) (param $0 i32) (result f64)
(local $1 i32)
(local $2 i32)
(local $3 i32)
@@ -1343,7 +1252,7 @@
)
)
)
(func $~lib/allocator/arena/allocate_memory (; 16 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/allocator/arena/allocate_memory (; 12 ;) (type $ii) (param $0 i32) (result i32)
(local $1 i32)
(local $2 i32)
(local $3 i32)
@@ -1453,7 +1362,7 @@
(i32.const 0)
)
)
(func $~lib/internal/string/allocate (; 17 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/internal/string/allocate (; 13 ;) (type $ii) (param $0 i32) (result i32)
(local $1 i32)
(local $2 i32)
(if
@@ -1501,7 +1410,7 @@
(get_local $2)
)
)
(func $~lib/memory/copy_memory (; 18 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/memory/copy_memory (; 14 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@@ -3303,7 +3212,7 @@
)
)
)
(func $~lib/memory/move_memory (; 19 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/memory/move_memory (; 15 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(if
(i32.eq
@@ -3621,7 +3530,7 @@
)
)
)
(func $~lib/string/String#concat (; 20 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String#concat (; 16 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@@ -3720,7 +3629,7 @@
(get_local $5)
)
)
(func $~lib/string/String.__concat (; 21 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__concat (; 17 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(if
(i32.eqz
(get_local $0)
@@ -3736,7 +3645,7 @@
)
)
)
(func $~lib/string/String.__eq (; 22 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__eq (; 18 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(if
@@ -3801,7 +3710,7 @@
)
)
)
(func $~lib/string/String.__ne (; 23 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__ne (; 19 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(return
(i32.eqz
(call $~lib/string/String.__eq
@@ -3811,7 +3720,7 @@
)
)
)
(func $~lib/string/String.__gt (; 24 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__gt (; 20 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@@ -3904,7 +3813,7 @@
)
)
)
(func $~lib/string/String.__gte (; 25 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__gte (; 21 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@@ -3999,7 +3908,7 @@
)
)
)
(func $~lib/string/String.__lt (; 26 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__lt (; 22 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@@ -4092,7 +4001,7 @@
)
)
)
(func $~lib/string/String.__lte (; 27 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String.__lte (; 23 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@@ -4187,7 +4096,7 @@
)
)
)
(func $~lib/string/String#repeat (; 28 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/string/String#repeat (; 24 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@@ -4333,26 +4242,7 @@
(get_local $4)
)
)
(func $~lib/string/String#repeat|trampoline (; 29 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(block $1of1
(block $0of1
(block $oob
(br_table $0of1 $1of1 $oob
(get_global $~argc)
)
)
(unreachable)
)
(set_local $1
(i32.const 0)
)
)
(call $~lib/string/String#repeat
(get_local $0)
(get_local $1)
)
)
(func $start (; 30 ;) (type $v)
(func $start (; 25 ;) (type $v)
(set_global $~lib/allocator/arena/startOffset
(i32.and
(i32.add
@@ -4426,15 +4316,10 @@
)
(if
(i32.eqz
(block (result i32)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/String#startsWith|trampoline
(get_global $std/string/str)
(i32.const 104)
(i32.const 0)
)
(call $~lib/string/String#startsWith
(get_global $std/string/str)
(i32.const 104)
(i32.const 0)
)
)
(block
@@ -4472,15 +4357,10 @@
)
(if
(i32.eqz
(block (result i32)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/String#includes|trampoline
(get_global $std/string/str)
(i32.const 140)
(i32.const 0)
)
(call $~lib/string/String#includes
(get_global $std/string/str)
(i32.const 140)
(i32.const 0)
)
)
(block
@@ -4496,15 +4376,10 @@
(if
(i32.eqz
(i32.eq
(block (result i32)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/String#indexOf|trampoline
(get_global $std/string/str)
(i32.const 152)
(i32.const 0)
)
(call $~lib/string/String#indexOf
(get_global $std/string/str)
(i32.const 152)
(i32.const 0)
)
(i32.const 2)
)
@@ -4522,15 +4397,10 @@
(if
(i32.eqz
(i32.eq
(block (result i32)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/String#indexOf|trampoline
(get_global $std/string/str)
(i32.const 160)
(i32.const 0)
)
(call $~lib/string/String#indexOf
(get_global $std/string/str)
(i32.const 160)
(i32.const 0)
)
(i32.const -1)
)
@@ -4548,14 +4418,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 168)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 168)
(i32.const 0)
)
(f64.const 0)
)
@@ -4573,14 +4438,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 176)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 176)
(i32.const 0)
)
(f64.const 1)
)
@@ -4598,14 +4458,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 184)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 184)
(i32.const 0)
)
(f64.const 5)
)
@@ -4623,14 +4478,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 200)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 200)
(i32.const 0)
)
(f64.const 455)
)
@@ -4648,14 +4498,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 216)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 216)
(i32.const 0)
)
(f64.const 3855)
)
@@ -4673,14 +4518,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 232)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 232)
(i32.const 0)
)
(f64.const 3855)
)
@@ -4698,14 +4538,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 248)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 248)
(i32.const 0)
)
(f64.const 11)
)
@@ -4723,14 +4558,9 @@
(if
(i32.eqz
(f64.eq
(block (result f64)
(set_global $~argc
(i32.const 1)
)
(call $~lib/string/parseInt|trampoline
(i32.const 260)
(i32.const 0)
)
(call $~lib/string/parseInt
(i32.const 260)
(i32.const 0)
)
(f64.const 1)
)
@@ -5259,14 +5089,9 @@
(if
(i32.eqz
(call $~lib/string/String.__eq
(block (result i32)
(set_global $~argc
(i32.const 0)
)
(call $~lib/string/String#repeat|trampoline
(i32.const 316)
(i32.const 0)
)
(call $~lib/string/String#repeat
(i32.const 316)
(i32.const 0)
)
(i32.const 332)
)