Move GC state non-pointer variables into GC_arrays

(code refactoring)

This commit is intended to simplify GC reinitialization.

* alloc.c (GC_n_heap_sects, GC_fo_entries): Remove variable definition.
* alloc.c [USE_PROC_FOR_LIBRARIES] (GC_n_memory): Likewise.
* finalize.c [!GC_NO_FINALIZATION] (GC_log_fo_table_size): Likewise.
* finalize.c [!GC_NO_FINALIZATION && !GC_TOGGLE_REFS_NOT_NEEDED]
(GC_toggleref_array_size, GC_toggleref_array_capacity): Likewise.
* fnlz_mlc.c [ENABLE_DISCLAIM] (GC_finalized_kind): Likewise.
* mark.c (GC_mark_stack_size, GC_mark_state, GC_mark_stack_too_small,
GC_objects_are_marked): Likewise.
* mark.c [PARALLEL_MARK] (GC_first_nonempty): Likewise.
* mark.c [TRACE_BUF] (GC_trace_buf_ptr): Likewise.
* mark_rts.c (n_root_sets, GC_roots_were_cleared,
GC_excl_table_entries): Likewise.
* os_dep.c [MSWIN32 || MSWINCE || CYGWIN32] (GC_n_heap_bases):
Likewise.
* typd_mlc.c (GC_ed_size, GC_avail_descr,
GC_explicit_typing_initialized): Likewise.
* extra/MacOS.c (GC_fo_entries): Remove variable declaration.
* include/private/gc_pmark.h (GC_mark_stack_size,
GC_mark_stack_too_small, GC_mark_state): Likewise.
* include/private/gc_priv.h (GC_n_heap_sects, GC_fo_entries): Likewise.
* include/private/gc_priv.h [USE_PROC_FOR_LIBRARIES] (GC_n_memory):
Likewise.
* include/private/gc_pmark.h (mark_state_t): Move typedef to gc_priv.h.
* include/private/gc_priv.h (_GC_arrays._scratch_end_ptr,
_GC_arrays._scratch_last_end_ptr): Document.
* include/private/gc_priv.h [PARALLEL_MARK] (_GC_arrays): Add
_first_nonempty field.
* include/private/gc_priv.h (_GC_arrays): Add _mark_stack_size,
_mark_state, _mark_stack_too_small, _objects_are_marked, _n_heap_sects,
_n_memory, _fo_entries, _n_root_sets, _excl_table_entries,
_roots_were_cleared, _explicit_typing_initialized, _ed_size,
_avail_descr fields.
* include/private/gc_priv.h [USE_PROC_FOR_LIBRARIES] (_GC_arrays): Add
_n_memory field.
* include/private/gc_priv.h [MSWIN32 || MSWINCE || CYGWIN32]
(_GC_arrays): Add _n_heap_bases field.
* include/private/gc_priv.h [!GC_NO_FINALIZATION] (_GC_arrays): Add
_log_fo_table_size field.
* include/private/gc_priv.h [!GC_NO_FINALIZATION
&& !GC_TOGGLE_REFS_NOT_NEEDED] (_GC_arrays): Add _toggleref_array_size,
_toggleref_array_capacity fields.
* include/private/gc_priv.h [TRACE_BUF] (_GC_arrays): Add
_trace_buf_ptr field.
* include/private/gc_priv.h [ENABLE_DISCLAIM] (_GC_arrays): Add
_finalized_kind field.
* include/private/gc_priv.h (GC_first_nonempty, GC_mark_stack_size,
GC_mark_state, GC_mark_stack_too_small, GC_objects_are_marked,
GC_n_heap_sects, GC_n_memory, GC_n_heap_bases, GC_fo_entries,
GC_log_fo_table_size, GC_toggleref_array_size,
GC_toggleref_array_capacity, GC_trace_buf_ptr, GC_finalized_kind,
n_root_sets, GC_excl_table_entries, GC_roots_were_cleared,
GC_explicit_typing_initialized, GC_ed_size, GC_avail_descr): Define
macro.

1 files changed, 0 insertions, 7 deletions

diff --git a/mark_rts.c b/mark_rts.c
index 8b190014..e88f8a72 100644
--- a/mark_rts.c
+++ b/mark_rts.c
@@ -36,9 +36,6 @@ struct roots GC_static_roots[MAX_ROOT_SETS];
 
 int GC_no_dls = 0;      /* Register dynamic library data segments.      */
 
-static int n_root_sets = 0;
-        /* GC_static_roots[0..n_root_sets) contains the valid root sets. */
-
 #if !defined(NO_DEBUGGING) || defined(GC_ASSERTIONS)
   /* Should return the same value as GC_root_size.      */
   GC_INNER word GC_compute_root_size(void)
@@ -271,8 +268,6 @@ void GC_add_roots_inner(ptr_t b, ptr_t e, GC_bool tmp)
     n_root_sets++;
 }
 
-STATIC GC_bool GC_roots_were_cleared = FALSE;
-
 GC_API void GC_CALL GC_clear_roots(void)
 {
     DCL_LOCK_STATE;
@@ -532,8 +527,6 @@ struct exclusion GC_excl_table[MAX_EXCLUSIONS];
                                         -- address order.
 */
 
-STATIC size_t GC_excl_table_entries = 0;/* Number of entries in use.      */
-
 GC_API void GC_CALL GC_clear_exclusion_table(void)
 {
     GC_excl_table_entries = 0;