Rename heap to memory; Allocator strategies

This commit is contained in:
dcodeIO
2018-01-28 15:30:49 +01:00
parent 1b0ed61072
commit 219ee81bc9
15 changed files with 2694 additions and 1235 deletions

View File

@ -1,20 +1,375 @@
(module
(type $i (func (result i32)))
(type $ii (func (param 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 i32)))
(type $v (func))
(global $std:heap/HEAP_OFFSET (mut i32) (i32.const 0))
(global $std:heap/ALIGN_LOG2 i32 (i32.const 3))
(global $std:heap/ALIGN_SIZE i32 (i32.const 8))
(global $std:heap/ALIGN_MASK i32 (i32.const 7))
(global $std:memory/arena/HEAP_OFFSET (mut i32) (i32.const 0))
(global $std:memory/arena/ALIGN_LOG2 i32 (i32.const 3))
(global $std:memory/arena/ALIGN_SIZE i32 (i32.const 8))
(global $std:memory/arena/ALIGN_MASK i32 (i32.const 7))
(global $std/set/set (mut i32) (i32.const 0))
(global $HEAP_BASE i32 (i32.const 4))
(memory $0 1)
(export "memory" (memory $0))
(start $start)
(func $std:heap/allocate_memory (; 0 ;) (type $ii) (param $0 i32) (result i32)
(func $std:memory/set_memory (; 0 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i64)
(if
(i32.eqz
(get_local $2)
)
(return)
)
(i32.store8
(get_local $0)
(get_local $1)
)
(i32.store8
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 1)
)
(get_local $1)
)
(if
(i32.le_u
(get_local $2)
(i32.const 2)
)
(return)
)
(i32.store8
(i32.add
(get_local $0)
(i32.const 1)
)
(get_local $1)
)
(i32.store8
(i32.add
(get_local $0)
(i32.const 2)
)
(get_local $1)
)
(i32.store8
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 2)
)
(get_local $1)
)
(i32.store8
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 3)
)
(get_local $1)
)
(if
(i32.le_u
(get_local $2)
(i32.const 6)
)
(return)
)
(i32.store8
(i32.add
(get_local $0)
(i32.const 3)
)
(get_local $1)
)
(i32.store8
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 4)
)
(get_local $1)
)
(if
(i32.le_u
(get_local $2)
(i32.const 8)
)
(return)
)
(set_local $3
(i32.and
(i32.sub
(i32.const 0)
(get_local $0)
)
(i32.const 3)
)
)
(set_local $0
(i32.add
(get_local $0)
(get_local $3)
)
)
(set_local $2
(i32.sub
(get_local $2)
(get_local $3)
)
)
(set_local $2
(i32.and
(get_local $2)
(i32.sub
(i32.const 0)
(i32.const 4)
)
)
)
(set_local $4
(i32.mul
(i32.div_u
(i32.sub
(i32.const 0)
(i32.const 1)
)
(i32.const 255)
)
(get_local $1)
)
)
(i32.store
(get_local $0)
(get_local $4)
)
(i32.store
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 4)
)
(get_local $4)
)
(if
(i32.le_u
(get_local $2)
(i32.const 8)
)
(return)
)
(i32.store
(i32.add
(get_local $0)
(i32.const 4)
)
(get_local $4)
)
(i32.store
(i32.add
(get_local $0)
(i32.const 8)
)
(get_local $4)
)
(i32.store
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 12)
)
(get_local $4)
)
(i32.store
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 8)
)
(get_local $4)
)
(if
(i32.le_u
(get_local $2)
(i32.const 24)
)
(return)
)
(i32.store
(i32.add
(get_local $0)
(i32.const 12)
)
(get_local $4)
)
(i32.store
(i32.add
(get_local $0)
(i32.const 16)
)
(get_local $4)
)
(i32.store
(i32.add
(get_local $0)
(i32.const 20)
)
(get_local $4)
)
(i32.store
(i32.add
(get_local $0)
(i32.const 24)
)
(get_local $4)
)
(i32.store
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 28)
)
(get_local $4)
)
(i32.store
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 24)
)
(get_local $4)
)
(i32.store
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 20)
)
(get_local $4)
)
(i32.store
(i32.sub
(i32.add
(get_local $0)
(get_local $2)
)
(i32.const 16)
)
(get_local $4)
)
(set_local $3
(i32.add
(i32.const 24)
(i32.and
(get_local $0)
(i32.const 4)
)
)
)
(set_local $0
(i32.add
(get_local $0)
(get_local $3)
)
)
(set_local $2
(i32.sub
(get_local $2)
(get_local $3)
)
)
(set_local $5
(i64.or
(i64.extend_u/i32
(get_local $4)
)
(i64.shl
(i64.extend_u/i32
(get_local $4)
)
(i64.const 32)
)
)
)
(block $break|0
(loop $continue|0
(if
(i32.ge_u
(get_local $2)
(i32.const 32)
)
(block
(block
(i64.store
(get_local $0)
(get_local $5)
)
(i64.store
(i32.add
(get_local $0)
(i32.const 8)
)
(get_local $5)
)
(i64.store
(i32.add
(get_local $0)
(i32.const 16)
)
(get_local $5)
)
(i64.store
(i32.add
(get_local $0)
(i32.const 24)
)
(get_local $5)
)
(set_local $2
(i32.sub
(get_local $2)
(i32.const 32)
)
)
(set_local $0
(i32.add
(get_local $0)
(i32.const 32)
)
)
)
(br $continue|0)
)
)
)
)
)
(func $std:memory/arena/allocate_memory (; 1 ;) (type $ii) (param $0 i32) (result i32)
(local $1 i32)
(local $2 i32)
(local $3 i32)
@ -33,7 +388,7 @@
(if
(i32.gt_u
(i32.add
(get_global $std:heap/HEAP_OFFSET)
(get_global $std:memory/arena/HEAP_OFFSET)
(get_local $0)
)
(i32.shl
@ -78,43 +433,48 @@
)
)
(set_local $4
(get_global $std:heap/HEAP_OFFSET)
(get_global $std:memory/arena/HEAP_OFFSET)
)
(if
(i32.and
(block (result i32)
(set_global $std:heap/HEAP_OFFSET
(set_global $std:memory/arena/HEAP_OFFSET
(i32.add
(get_global $std:heap/HEAP_OFFSET)
(get_global $std:memory/arena/HEAP_OFFSET)
(get_local $0)
)
)
(get_global $std:heap/HEAP_OFFSET)
(get_global $std:memory/arena/HEAP_OFFSET)
)
(i32.const 7)
)
(set_global $std:heap/HEAP_OFFSET
(set_global $std:memory/arena/HEAP_OFFSET
(i32.add
(i32.or
(get_global $std:heap/HEAP_OFFSET)
(get_global $std:memory/arena/HEAP_OFFSET)
(i32.const 7)
)
(i32.const 1)
)
)
)
(call $std:memory/set_memory
(get_local $4)
(i32.const 0)
(get_local $0)
)
(return
(get_local $4)
)
)
(func $std:set/Set#get:size (; 1 ;) (type $ii) (param $0 i32) (result i32)
(func $std:set/Set#get:size (; 2 ;) (type $ii) (param $0 i32) (result i32)
(return
(i32.load offset=8
(get_local $0)
)
)
)
(func $std:heap/copy_memory (; 2 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(func $std:memory/copy_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(local $4 i32)
(local $5 i32)
@ -1914,7 +2274,7 @@
)
)
)
(func $std:heap/move_memory (; 3 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(func $std:memory/move_memory (; 4 ;) (type $iiiv) (param $0 i32) (param $1 i32) (param $2 i32)
(local $3 i32)
(if
(i32.eq
@ -1950,7 +2310,7 @@
(i32.const 1)
)
(block
(call $std:heap/copy_memory
(call $std:memory/copy_memory
(get_local $0)
(get_local $1)
(get_local $2)
@ -2240,9 +2600,9 @@
)
)
)
(func $std:heap/free_memory (; 4 ;) (type $iv) (param $0 i32)
(func $std:memory/arena/free_memory (; 5 ;) (type $iv) (param $0 i32)
)
(func $std:set/Set#add (; 5 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $std:set/Set#add (; 6 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(local $4 i32)
@ -2286,7 +2646,7 @@
)
)
(set_local $5
(call $std:heap/allocate_memory
(call $std:memory/arena/allocate_memory
(i32.mul
(get_local $4)
(i32.const 4)
@ -2298,7 +2658,7 @@
(get_local $0)
)
(block
(call $std:heap/move_memory
(call $std:memory/move_memory
(get_local $5)
(i32.load
(get_local $0)
@ -2310,7 +2670,7 @@
(i32.const 4)
)
)
(call $std:heap/free_memory
(call $std:memory/arena/free_memory
(i32.load
(get_local $0)
)
@ -2354,7 +2714,7 @@
(get_local $0)
)
)
(func $std:set/Set#has (; 6 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $std:set/Set#has (; 7 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(if
@ -2418,7 +2778,7 @@
(i32.const 0)
)
)
(func $std:set/Set#delete (; 7 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(func $std:set/Set#delete (; 8 ;) (type $iii) (param $0 i32) (param $1 i32) (result i32)
(local $2 i32)
(local $3 i32)
(if
@ -2474,7 +2834,7 @@
(get_local $0)
)
)
(call $std:heap/move_memory
(call $std:memory/move_memory
(i32.add
(i32.load
(get_local $0)
@ -2536,7 +2896,7 @@
(i32.const 0)
)
)
(func $std:set/Set#clear (; 8 ;) (type $iv) (param $0 i32)
(func $std:set/Set#clear (; 9 ;) (type $iv) (param $0 i32)
(if
(i32.eqz
(i32.ne
@ -2551,12 +2911,12 @@
(i32.const 0)
)
)
(func $start (; 9 ;) (type $v)
(set_global $std:heap/HEAP_OFFSET
(func $start (; 10 ;) (type $v)
(set_global $std:memory/arena/HEAP_OFFSET
(get_global $HEAP_BASE)
)
(set_global $std/set/set
(call $std:heap/allocate_memory
(call $std:memory/arena/allocate_memory
(i32.add
(i32.const 4)
(i32.mul
@ -2770,23 +3130,15 @@
CLASS_PROTOTYPE: Error
CLASS_PROTOTYPE: std:error/RangeError
CLASS_PROTOTYPE: RangeError
GLOBAL: std:heap/ALIGN_LOG2
GLOBAL: std:heap/ALIGN_SIZE
GLOBAL: std:heap/ALIGN_MASK
GLOBAL: std:heap/HEAP_OFFSET
FUNCTION_PROTOTYPE: std:heap/allocate_memory
FUNCTION_PROTOTYPE: allocate_memory
FUNCTION_PROTOTYPE: std:heap/free_memory
FUNCTION_PROTOTYPE: free_memory
FUNCTION_PROTOTYPE: std:heap/copy_memory
FUNCTION_PROTOTYPE: std:heap/move_memory
FUNCTION_PROTOTYPE: move_memory
FUNCTION_PROTOTYPE: std:heap/set_memory
FUNCTION_PROTOTYPE: set_memory
FUNCTION_PROTOTYPE: std:heap/compare_memory
FUNCTION_PROTOTYPE: compare_memory
CLASS_PROTOTYPE: std:map/Map
CLASS_PROTOTYPE: Map
FUNCTION_PROTOTYPE: std:memory/copy_memory
FUNCTION_PROTOTYPE: std:memory/move_memory
FUNCTION_PROTOTYPE: move_memory
FUNCTION_PROTOTYPE: std:memory/set_memory
FUNCTION_PROTOTYPE: set_memory
FUNCTION_PROTOTYPE: std:memory/compare_memory
FUNCTION_PROTOTYPE: compare_memory
CLASS_PROTOTYPE: std:regexp/RegExp
CLASS_PROTOTYPE: RegExp
CLASS_PROTOTYPE: std:set/Set
@ -2805,6 +3157,16 @@
FUNCTION_PROTOTYPE: std:string/parseFloat
FUNCTION_PROTOTYPE: parseFloat
GLOBAL: std/set/set
GLOBAL: std:memory/arena/ALIGN_LOG2
GLOBAL: std:memory/arena/ALIGN_SIZE
GLOBAL: std:memory/arena/ALIGN_MASK
GLOBAL: std:memory/arena/HEAP_OFFSET
FUNCTION_PROTOTYPE: std:memory/arena/allocate_memory
FUNCTION_PROTOTYPE: allocate_memory
FUNCTION_PROTOTYPE: std:memory/arena/free_memory
FUNCTION_PROTOTYPE: free_memory
FUNCTION_PROTOTYPE: std:memory/arena/clear_memory
FUNCTION_PROTOTYPE: clear_memory
[program.exports]
CLASS_PROTOTYPE: std:array/Array
CLASS_PROTOTYPE: Array
@ -2814,18 +3176,14 @@
CLASS_PROTOTYPE: Error
CLASS_PROTOTYPE: std:error/RangeError
CLASS_PROTOTYPE: RangeError
FUNCTION_PROTOTYPE: allocate_memory
FUNCTION_PROTOTYPE: std:heap/allocate_memory
FUNCTION_PROTOTYPE: free_memory
FUNCTION_PROTOTYPE: std:heap/free_memory
FUNCTION_PROTOTYPE: move_memory
FUNCTION_PROTOTYPE: std:heap/move_memory
FUNCTION_PROTOTYPE: set_memory
FUNCTION_PROTOTYPE: std:heap/set_memory
FUNCTION_PROTOTYPE: compare_memory
FUNCTION_PROTOTYPE: std:heap/compare_memory
CLASS_PROTOTYPE: std:map/Map
CLASS_PROTOTYPE: Map
FUNCTION_PROTOTYPE: move_memory
FUNCTION_PROTOTYPE: std:memory/move_memory
FUNCTION_PROTOTYPE: set_memory
FUNCTION_PROTOTYPE: std:memory/set_memory
FUNCTION_PROTOTYPE: compare_memory
FUNCTION_PROTOTYPE: std:memory/compare_memory
CLASS_PROTOTYPE: std:regexp/RegExp
CLASS_PROTOTYPE: RegExp
CLASS_PROTOTYPE: std:set/Set
@ -2836,4 +3194,10 @@
FUNCTION_PROTOTYPE: std:string/parseInt
FUNCTION_PROTOTYPE: parseFloat
FUNCTION_PROTOTYPE: std:string/parseFloat
FUNCTION_PROTOTYPE: allocate_memory
FUNCTION_PROTOTYPE: std:memory/arena/allocate_memory
FUNCTION_PROTOTYPE: free_memory
FUNCTION_PROTOTYPE: std:memory/arena/free_memory
FUNCTION_PROTOTYPE: clear_memory
FUNCTION_PROTOTYPE: std:memory/arena/clear_memory
;)