aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc.types
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-03-28 11:56:43 +0200
committerSverker Eriksson <[email protected]>2017-03-28 11:56:43 +0200
commitdeaa890b3da0be617c9f62c968ba829c146fb2d6 (patch)
tree1e982126c0f42b246caa35a9d211c55d47a30f9f /erts/emulator/beam/erl_alloc.types
parent8e44a7ef60248eec658cfc81ad1110bc72a937c7 (diff)
parent29bf1c9b7f33d64871c0f973be4a732850d98572 (diff)
downloadotp-deaa890b3da0be617c9f62c968ba829c146fb2d6.tar.gz
otp-deaa890b3da0be617c9f62c968ba829c146fb2d6.tar.bz2
otp-deaa890b3da0be617c9f62c968ba829c146fb2d6.zip
Merge branch 'sverker/hipe-long-lived'
* sverker/hipe-long-lived: Make hipe_bifs:alloc_data/3 pad addr to alignment erts: Change HIPE allocations from sys_alloc
Diffstat (limited to 'erts/emulator/beam/erl_alloc.types')
-rw-r--r--erts/emulator/beam/erl_alloc.types5
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 32f84c8593..43f43f9034 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -351,8 +351,9 @@ type SL_MPATHS SHORT_LIVED SYSTEM sl_migration_paths
+if hipe
-# Currently most hipe code use this type.
-type HIPE SYSTEM SYSTEM hipe_data
+type HIPE_LL LONG_LIVED SYSTEM hipe_long_lived
+type HIPE_SL SHORT_LIVED SYSTEM hipe_short_lived
+type HIPE_STK STANDARD SYSTEM hipe_nstack
+if exec_alloc
type HIPE_EXEC EXEC CODE hipe_code