diff options
| author | Sverker Eriksson <[email protected]> | 2016-04-20 16:10:37 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-04-20 16:10:37 +0200 |
| commit | 42a1166b47721cd444dbe8c70a04125d842a27c9 (patch) | |
| tree | 274cad0504b7b03750fea93ea9b03bf60eed0a63 /erts/emulator/beam/erl_alloc.types | |
| parent | aee7c8eec5219cd1b29db34748d2b2a60701a0c3 (diff) | |
| parent | b3c7a581070180750a368ddf3bd55db1bafc11ea (diff) | |
| download | otp-42a1166b47721cd444dbe8c70a04125d842a27c9.tar.gz otp-42a1166b47721cd444dbe8c70a04125d842a27c9.tar.bz2 otp-42a1166b47721cd444dbe8c70a04125d842a27c9.zip | |
Merge branch 'sverker/hipe-code-alloc'
Diffstat (limited to 'erts/emulator/beam/erl_alloc.types')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.types | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types index d2fe440d47..ad62a87326 100644 --- a/erts/emulator/beam/erl_alloc.types +++ b/erts/emulator/beam/erl_alloc.types @@ -87,6 +87,9 @@ allocator EHEAP true eheap_alloc allocator ETS true ets_alloc allocator FIXED_SIZE true fix_alloc allocator LITERAL true literal_alloc ++if exec_alloc +allocator EXEC true exec_alloc ++endif +else # Non smp build @@ -98,6 +101,9 @@ allocator EHEAP false eheap_alloc allocator ETS false ets_alloc allocator FIXED_SIZE false fix_alloc allocator LITERAL false literal_alloc ++if exec_alloc +allocator EXEC false exec_alloc ++endif +endif @@ -338,8 +344,14 @@ type SL_MPATHS SHORT_LIVED SYSTEM sl_migration_paths # Currently most hipe code use this type. type HIPE SYSTEM SYSTEM hipe_data ++if exec_alloc +type HIPE_EXEC EXEC CODE hipe_code ++endif + +endif + + +if heap_frag_elim_test type SSB SHORT_LIVED PROCESSES ssb |