Expand the use of high memory allocation in halfword emulator

Also add 'low' field in system_info(allocator)
SHORT_LIVED is still in low memory

1 files changed, 45 insertions, 12 deletions

diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index ca71798917..c6cc0e1fac 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -75,6 +75,11 @@ allocator	EHEAP		true		eheap_alloc
 allocator	ETS		true		ets_alloc
 allocator	FIXED_SIZE	true		fix_alloc
 
++if halfword
+allocator	LONG_LIVED_LOW	true		ll_alloc_low
+allocator	STANDARD_LOW	true		std_alloc_low
++endif
+
 +else # Non smp build
 
 allocator	TEMPORARY	false		temp_alloc
@@ -85,12 +90,18 @@ allocator	EHEAP		false		eheap_alloc
 allocator	ETS		false		ets_alloc
 allocator	FIXED_SIZE	false		fix_alloc
 
++if halfword
+allocator	LONG_LIVED_LOW	false		ll_alloc_low
+allocator	STANDARD_LOW	false		std_alloc_low
++endif
+
 +endif
 
 allocator	BINARY		true		binary_alloc
 allocator	DRIVER		true		driver_alloc
 
 
+
 # --- Class declarations -----------------------------------------------------
 #
 # Syntax: class <CLASS> <DESCRIPTION>
@@ -125,14 +136,9 @@ class	SYSTEM		system_data
 
 type	PROC		FIXED_SIZE	PROCESSES	proc
 type	ATOM		FIXED_SIZE	ATOM		atom_entry
-type	EXPORT		FIXED_SIZE	CODE		export_entry
 type	MODULE		FIXED_SIZE	CODE		module_entry
 type	REG_PROC	FIXED_SIZE	PROCESSES	reg_proc
 type	LINK_LH		STANDARD	PROCESSES	link_lh
-type	MONITOR_SH	FIXED_SIZE	PROCESSES	monitor_sh
-type	MONITOR_LH	STANDARD	PROCESSES	monitor_lh
-type	NLINK_SH	FIXED_SIZE	PROCESSES	nlink_sh
-type	NLINK_LH	STANDARD	PROCESSES	nlink_lh
 type	SUSPEND_MON	STANDARD	PROCESSES	suspend_monitor
 type	PEND_SUSPEND	SHORT_LIVED	PROCESSES	pending_suspend
 type	PROC_LIST	SHORT_LIVED	PROCESSES	proc_list
@@ -175,7 +181,6 @@ type	DRIVER		STANDARD	SYSTEM		driver
 type	NIF		DRIVER		SYSTEM		nif_internal
 type	BINARY		BINARY		BINARIES	binary
 type	NBIF_TABLE	SYSTEM		SYSTEM		nbif_tab
-type	CODE		LONG_LIVED	CODE		code
 type	ARG_REG		STANDARD	PROCESSES	arg_reg
 type	PROC_DICT	STANDARD	PROCESSES	proc_dict
 type	CALLS_BUF	STANDARD	PROCESSES	calls_buf
@@ -193,10 +198,8 @@ type	DB_FIXATION	SHORT_LIVED	ETS		db_fixation
 type	DB_FIX_DEL	SHORT_LIVED	ETS		fixed_del
 type	DB_TABLES	LONG_LIVED	ETS		db_tabs
 type    DB_NTAB_ENT	STANDARD	ETS		db_named_table_entry
-type	DB_HEIR_DATA	STANDARD	ETS		db_heir_data
 type	DB_TMP		TEMPORARY	ETS		db_tmp
 type	DB_MC_STK	TEMPORARY	ETS		db_mc_stack
-type	DB_MS_PSDO_PROC	LONG_LIVED	ETS		db_match_pseudo_proc
 type	DB_MS_RUN_HEAP	SHORT_LIVED	ETS		db_match_spec_run_heap
 type	DB_MS_CMPL_HEAP	TEMPORARY	ETS		db_match_spec_cmpl_heap
 type	DB_SEG		ETS		ETS		db_segment
@@ -213,10 +216,8 @@ type	LOGGER_DSBUF	TEMPORARY	SYSTEM		logger_dsbuf
 type	TMP_DSBUF	TEMPORARY	SYSTEM		tmp_dsbuf
 type	INFO_DSBUF	SYSTEM		SYSTEM		info_dsbuf
 # INFO_DSBUF have to use the SYSTEM allocator; otherwise, a deadlock might occur
-type	SCHDLR_DATA	LONG_LIVED	SYSTEM		scheduler_data
 type	SCHDLR_SLP_INFO	LONG_LIVED	SYSTEM		scheduler_sleep_info
 type	RUNQS		LONG_LIVED	SYSTEM		run_queues
-type	DDLL_PROCESS	STANDARD	SYSTEM		ddll_processes
 type	DDLL_HANDLE	STANDARD	SYSTEM		ddll_handle
 type	DDLL_ERRCODES	LONG_LIVED	SYSTEM		ddll_errcodes
 type	DDLL_TMP_BUF	TEMPORARY	SYSTEM		ddll_tmp_buf
@@ -327,13 +328,45 @@ type	SSB		SHORT_LIVED	PROCESSES	ssb
 +endif
 
 
++if halfword
+
+type	DDLL_PROCESS	STANDARD_LOW	SYSTEM		ddll_processes
+type	MONITOR_LH	STANDARD_LOW	PROCESSES	monitor_lh
+type	NLINK_LH	STANDARD_LOW	PROCESSES	nlink_lh
+type	CODE		LONG_LIVED_LOW	CODE		code
+type	DB_HEIR_DATA	STANDARD_LOW	ETS		db_heir_data
+type	DB_MS_PSDO_PROC	LONG_LIVED_LOW	ETS		db_match_pseudo_proc
+type	SCHDLR_DATA	LONG_LIVED_LOW	SYSTEM		scheduler_data
+type  	LL_TEMP_TERM 	LONG_LIVED_LOW	SYSTEM		ll_temp_term
+
+# no FIXED_SIZE for low memory
+type	EXPORT		STANDARD_LOW	CODE		export_entry
+type	MONITOR_SH	STANDARD_LOW	PROCESSES	monitor_sh
+type	NLINK_SH	STANDARD_LOW	PROCESSES	nlink_sh
+
++else # "fullword"
+
+type	DDLL_PROCESS	STANDARD	SYSTEM		ddll_processes
+type	MONITOR_LH	STANDARD	PROCESSES	monitor_lh
+type	NLINK_LH	STANDARD	PROCESSES	nlink_lh
+type	CODE		LONG_LIVED	CODE		code
+type	DB_HEIR_DATA	STANDARD	ETS		db_heir_data
+type	DB_MS_PSDO_PROC	LONG_LIVED	ETS		db_match_pseudo_proc
+type	SCHDLR_DATA	LONG_LIVED	SYSTEM		scheduler_data
+type  	LL_TEMP_TERM 	LONG_LIVED	SYSTEM		ll_temp_term
+
+type	EXPORT		FIXED_SIZE	CODE		export_entry
+type	MONITOR_SH	FIXED_SIZE	PROCESSES	monitor_sh
+type	NLINK_SH	FIXED_SIZE	PROCESSES	nlink_sh
+
++endif
+
+
 #
 # Types used by system specific code
 #
 
 type  	TEMP_TERM 	TEMPORARY	SYSTEM		temp_term
-type  	LL_TEMP_TERM 	LONG_LIVED	SYSTEM		ll_temp_term
-
 type	DRV_TAB		LONG_LIVED	SYSTEM		drv_tab
 type	DRV_EV_STATE	LONG_LIVED	SYSTEM		driver_event_state
 type	DRV_EV_D_STATE	FIXED_SIZE	SYSTEM		driver_event_data_state