fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-06-18 17:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Improve reallocateUnsafe and properly free unmanaged objects (#368)

Browse Source
This commit is contained in:
Max Graey
2018-12-09 00:54:45 +02:00
committed by Daniel Wirtz
parent 3ed83ef3ae
commit 8e61e0ead8
9 changed files with 1278 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

610
tests/compiler/std/static-array.untouched.wat
View File

@ -3,6 +3,7 @@
(type $iii (func (param i32 i32) (result i32)))
(type $iiiv (func (param i32 i32 i32)))
(type $ii (func (param i32) (result i32)))
(type $iv (func (param i32)))
(type $iiI (func (param i32 i32) (result i64)))
(type $iiIv (func (param i32 i32 i64)))
(type $iif (func (param i32 i32) (result f32)))
@ -80,261 +81,7 @@
i32.sub
i32.shl
)
(func $~lib/internal/memory/memset (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i64)
get_local $2
i32.eqz
if
return
end
get_local $0
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 1
i32.sub
get_local $1
i32.store8
get_local $2
i32.const 2
i32.le_u
if
return
end
get_local $0
i32.const 1
i32.add
get_local $1
i32.store8
get_local $0
i32.const 2
i32.add
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 2
i32.sub
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 3
i32.sub
get_local $1
i32.store8
get_local $2
i32.const 6
i32.le_u
if
return
end
get_local $0
i32.const 3
i32.add
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 4
i32.sub
get_local $1
i32.store8
get_local $2
i32.const 8
i32.le_u
if
return
end
i32.const 0
get_local $0
i32.sub
i32.const 3
i32.and
set_local $3
get_local $0
get_local $3
i32.add
set_local $0
get_local $2
get_local $3
i32.sub
set_local $2
get_local $2
i32.const -4
i32.and
set_local $2
i32.const -1
i32.const 255
i32.div_u
get_local $1
i32.const 255
i32.and
i32.mul
set_local $4
get_local $0
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 4
i32.sub
get_local $4
i32.store
get_local $2
i32.const 8
i32.le_u
if
return
end
get_local $0
i32.const 4
i32.add
get_local $4
i32.store
get_local $0
i32.const 8
i32.add
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 12
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 8
i32.sub
get_local $4
i32.store
get_local $2
i32.const 24
i32.le_u
if
return
end
get_local $0
i32.const 12
i32.add
get_local $4
i32.store
get_local $0
i32.const 16
i32.add
get_local $4
i32.store
get_local $0
i32.const 20
i32.add
get_local $4
i32.store
get_local $0
i32.const 24
i32.add
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 28
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 24
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 20
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 16
i32.sub
get_local $4
i32.store
i32.const 24
get_local $0
i32.const 4
i32.and
i32.add
set_local $3
get_local $0
get_local $3
i32.add
set_local $0
get_local $2
get_local $3
i32.sub
set_local $2
get_local $4
i64.extend_u/i32
get_local $4
i64.extend_u/i32
i64.const 32
i64.shl
i64.or
set_local $5
block $break|0
loop $continue|0
get_local $2
i32.const 32
i32.ge_u
if
block
get_local $0
get_local $5
i64.store
get_local $0
i32.const 8
i32.add
get_local $5
i64.store
get_local $0
i32.const 16
i32.add
get_local $5
i64.store
get_local $0
i32.const 24
i32.add
get_local $5
i64.store
get_local $2
i32.const 32
i32.sub
set_local $2
get_local $0
i32.const 32
i32.add
set_local $0
end
br $continue|0
end
end
end
)
(func $~lib/allocator/arena/__memory_allocate (; 4 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/allocator/arena/__memory_allocate (; 3 ;) (type $ii) (param $0 i32) (result i32)
(local $1 i32)
(local $2 i32)
(local $3 i32)
@ -413,7 +160,7 @@
set_global $~lib/allocator/arena/offset
get_local $1
)
(func $~lib/internal/arraybuffer/allocateUnsafe (; 5 ;) (type $ii) (param $0 i32) (result i32)
(func $~lib/internal/arraybuffer/allocateUnsafe (; 4 ;) (type $ii) (param $0 i32) (result i32)
(local $1 i32)
(local $2 i32)
get_local $0
@ -442,7 +189,7 @@
i32.store
get_local $1
)
(func $~lib/internal/memory/memcpy (; 6 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/internal/memory/memcpy (; 5 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -1643,7 +1390,7 @@
i32.store8
end
)
(func $~lib/internal/memory/memmove (; 7 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/internal/memory/memmove (; 6 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
get_local $0
get_local $1
@ -1870,12 +1617,268 @@
end
end
)
(func $~lib/internal/arraybuffer/reallocateUnsafe (; 8 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $~lib/allocator/arena/__memory_free (; 7 ;) (type $iv) (param $0 i32)
nop
)
(func $~lib/internal/memory/memset (; 8 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i64)
get_local $2
i32.eqz
if
return
end
get_local $0
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 1
i32.sub
get_local $1
i32.store8
get_local $2
i32.const 2
i32.le_u
if
return
end
get_local $0
i32.const 1
i32.add
get_local $1
i32.store8
get_local $0
i32.const 2
i32.add
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 2
i32.sub
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 3
i32.sub
get_local $1
i32.store8
get_local $2
i32.const 6
i32.le_u
if
return
end
get_local $0
i32.const 3
i32.add
get_local $1
i32.store8
get_local $0
get_local $2
i32.add
i32.const 4
i32.sub
get_local $1
i32.store8
get_local $2
i32.const 8
i32.le_u
if
return
end
i32.const 0
get_local $0
i32.sub
i32.const 3
i32.and
set_local $3
get_local $0
get_local $3
i32.add
set_local $0
get_local $2
get_local $3
i32.sub
set_local $2
get_local $2
i32.const -4
i32.and
set_local $2
i32.const -1
i32.const 255
i32.div_u
get_local $1
i32.const 255
i32.and
i32.mul
set_local $4
get_local $0
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 4
i32.sub
get_local $4
i32.store
get_local $2
i32.const 8
i32.le_u
if
return
end
get_local $0
i32.const 4
i32.add
get_local $4
i32.store
get_local $0
i32.const 8
i32.add
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 12
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 8
i32.sub
get_local $4
i32.store
get_local $2
i32.const 24
i32.le_u
if
return
end
get_local $0
i32.const 12
i32.add
get_local $4
i32.store
get_local $0
i32.const 16
i32.add
get_local $4
i32.store
get_local $0
i32.const 20
i32.add
get_local $4
i32.store
get_local $0
i32.const 24
i32.add
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 28
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 24
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 20
i32.sub
get_local $4
i32.store
get_local $0
get_local $2
i32.add
i32.const 16
i32.sub
get_local $4
i32.store
i32.const 24
get_local $0
i32.const 4
i32.and
i32.add
set_local $3
get_local $0
get_local $3
i32.add
set_local $0
get_local $2
get_local $3
i32.sub
set_local $2
get_local $4
i64.extend_u/i32
get_local $4
i64.extend_u/i32
i64.const 32
i64.shl
i64.or
set_local $5
block $break|0
loop $continue|0
get_local $2
i32.const 32
i32.ge_u
if
block
get_local $0
get_local $5
i64.store
get_local $0
i32.const 8
i32.add
get_local $5
i64.store
get_local $0
i32.const 16
i32.add
get_local $5
i64.store
get_local $0
i32.const 24
i32.add
get_local $5
i64.store
get_local $2
i32.const 32
i32.sub
set_local $2
get_local $0
i32.const 32
i32.add
set_local $0
end
br $continue|0
end
end
end
)
(func $~lib/internal/arraybuffer/reallocateUnsafe (; 9 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
(local $6 i32)
get_local $0
i32.load
set_local $2
@ -1905,57 +1908,50 @@
get_local $0
get_local $1
i32.store
get_local $0
get_global $~lib/internal/arraybuffer/HEADER_SIZE
i32.add
get_local $2
i32.add
set_local $3
i32.const 0
set_local $4
get_local $1
get_local $2
i32.sub
set_local $5
get_local $3
get_local $4
get_local $5
call $~lib/internal/memory/memset
else
get_local $1
call $~lib/internal/arraybuffer/allocateUnsafe
set_local $5
get_local $5
set_local $3
get_local $3
get_global $~lib/internal/arraybuffer/HEADER_SIZE
i32.add
set_local $4
get_local $0
get_global $~lib/internal/arraybuffer/HEADER_SIZE
i32.add
set_local $3
set_local $5
get_local $4
get_local $3
get_local $5
get_local $2
call $~lib/internal/memory/memmove
get_local $5
get_global $~lib/internal/arraybuffer/HEADER_SIZE
i32.add
get_local $2
i32.add
set_local $3
i32.const 0
set_local $4
get_local $1
get_local $2
i32.sub
set_local $6
block $~lib/memory/memory.free|inlined.0
block
get_local $0
call $~lib/allocator/arena/__memory_free
br $~lib/memory/memory.free|inlined.0
unreachable
end
unreachable
end
get_local $3
get_local $4
get_local $6
call $~lib/internal/memory/memset
get_local $5
return
set_local $0
end
get_local $0
get_global $~lib/internal/arraybuffer/HEADER_SIZE
i32.add
get_local $2
i32.add
set_local $3
i32.const 0
set_local $5
get_local $1
get_local $2
i32.sub
set_local $4
get_local $3
get_local $5
get_local $4
call $~lib/internal/memory/memset
else
get_local $1
get_local $2
@ -1968,7 +1964,7 @@
if
i32.const 0
i32.const 216
i32.const 64
i32.const 62
i32.const 4
call $~lib/env/abort
unreachable
@ -1980,7 +1976,7 @@
end
get_local $0
)
(func $~lib/array/Array<i32>#__set (; 9 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(func $~lib/array/Array<i32>#__set (; 10 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -2036,7 +2032,7 @@
get_local $2
i32.store offset=8
)
(func $~lib/array/Array<i64>#__get (; 10 ;) (type $iiI) (param $0 i32) (param $1 i32) (result i64)
(func $~lib/array/Array<i64>#__get (; 11 ;) (type $iiI) (param $0 i32) (param $1 i32) (result i64)
(local $2 i32)
(local $3 i32)
get_local $0
@ -2063,7 +2059,7 @@
unreachable
end
)
(func $~lib/array/Array<i64>#__set (; 11 ;) (type $iiIv) (param $0 i32) (param $1 i32) (param $2 i64)
(func $~lib/array/Array<i64>#__set (; 12 ;) (type $iiIv) (param $0 i32) (param $1 i32) (param $2 i64)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -2119,7 +2115,7 @@
get_local $2
i64.store offset=8
)
(func $~lib/array/Array<f32>#__get (; 12 ;) (type $iif) (param $0 i32) (param $1 i32) (result f32)
(func $~lib/array/Array<f32>#__get (; 13 ;) (type $iif) (param $0 i32) (param $1 i32) (result f32)
(local $2 i32)
(local $3 i32)
get_local $0
@ -2146,7 +2142,7 @@
unreachable
end
)
(func $~lib/array/Array<f32>#__set (; 13 ;) (type $iifv) (param $0 i32) (param $1 i32) (param $2 f32)
(func $~lib/array/Array<f32>#__set (; 14 ;) (type $iifv) (param $0 i32) (param $1 i32) (param $2 f32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -2202,7 +2198,7 @@
get_local $2
f32.store offset=8
)
(func $~lib/array/Array<f64>#__get (; 14 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
(func $~lib/array/Array<f64>#__get (; 15 ;) (type $iiF) (param $0 i32) (param $1 i32) (result f64)
(local $2 i32)
(local $3 i32)
get_local $0
@ -2229,7 +2225,7 @@
unreachable
end
)
(func $~lib/array/Array<f64>#__set (; 15 ;) (type $iiFv) (param $0 i32) (param $1 i32) (param $2 f64)
(func $~lib/array/Array<f64>#__set (; 16 ;) (type $iiFv) (param $0 i32) (param $1 i32) (param $2 f64)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -2285,7 +2281,7 @@
get_local $2
f64.store offset=8
)
(func $start (; 16 ;) (type $v)
(func $start (; 17 ;) (type $v)
(local $0 i32)
get_global $HEAP_BASE
get_global $~lib/internal/allocator/AL_MASK
@ -2550,6 +2546,6 @@
unreachable
end
)
(func $null (; 17 ;) (type $v)
(func $null (; 18 ;) (type $v)
)
)