#ifndef GCH
#define GCH
-/* Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
- *
+/* Copyright (C) 1995, 96, 98, 99, 2000 Free Software Foundation, Inc.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
#include "libguile/__scm.h"
\f
-#define SCM_FREEP(x) (SCM_CAR(x)==scm_tc_free_cell)
+#define SCM_FREEP(x) (SCM_NIMP(x) && SCM_UNPACK_CAR (x)==scm_tc_free_cell)
#define SCM_NFREEP(x) (!SCM_FREEP(x))
-extern struct scm_heap_seg_data *scm_heap_table;
+/* 1. This shouldn't be used on immediates.
+ 2. It thinks that subrs are always unmarked (harmless). */
+#define SCM_MARKEDP(x) ((SCM_UNPACK_CAR (x) & 5) == 5 \
+ ? SCM_GC8MARKP(x) \
+ : SCM_GCMARKP(x))
+#define SCM_NMARKEDP(x) (!SCM_MARKEDP(x))
+
+extern struct scm_heap_seg_data_t *scm_heap_table;
extern int scm_n_heap_segs;
extern int scm_take_stdin;
extern int scm_block_gc;
extern int scm_gc_heap_lock;
\f
-
-extern unsigned long scm_heap_size;
+extern scm_sizet scm_max_segment_size;
extern SCM_CELLPTR scm_heap_org;
+#ifdef GUILE_NEW_GC_SCHEME
extern SCM scm_freelist;
+extern struct scm_freelist_t scm_master_freelist;
+extern SCM scm_freelist2;
+extern struct scm_freelist_t scm_master_freelist2;
+#else
+extern struct scm_freelist_t scm_freelist;
+extern struct scm_freelist_t scm_freelist2;
+#endif
extern unsigned long scm_gc_cells_collected;
extern unsigned long scm_gc_malloc_collected;
extern unsigned long scm_gc_ports_collected;
extern unsigned long scm_cells_allocated;
-extern unsigned long scm_mallocated;
+extern long scm_mallocated;
extern unsigned long scm_mtrigger;
-#ifdef DEBUG_FREELIST
-extern void scm_debug_newcell SCM_P ((SCM *into));
+#if defined (GUILE_DEBUG) || defined (GUILE_DEBUG_FREELIST)
+extern SCM scm_map_free_list (void);
+extern SCM scm_free_list_length (void);
+#endif
+#ifdef GUILE_DEBUG_FREELIST
+extern SCM scm_debug_newcell (void);
+extern SCM scm_debug_newcell2 (void);
+extern SCM scm_gc_set_debug_check_freelist_x (SCM flag);
#endif
\f
-extern SCM scm_object_addr SCM_P ((SCM obj));
-extern SCM scm_unhash_name SCM_P ((SCM name));
-extern SCM scm_gc_stats SCM_P ((void));
-extern void scm_gc_start SCM_P ((char *what));
-extern void scm_gc_end SCM_P ((void));
-extern SCM scm_gc SCM_P ((void));
-extern void scm_gc_for_alloc SCM_P ((int ncells, SCM * freelistp));
-extern SCM scm_gc_for_newcell SCM_P ((void));
-extern void scm_igc SCM_P ((char *what));
-extern void scm_gc_mark SCM_P ((SCM p));
-extern void scm_mark_locations SCM_P ((SCM_STACKITEM x[], scm_sizet n));
-extern int scm_cellp SCM_P ((SCM value));
-extern void scm_gc_sweep SCM_P ((void));
-extern char * scm_must_malloc SCM_P ((scm_sizet len, char *what));
-extern char * scm_must_realloc SCM_P ((char *where,
- scm_sizet olen, scm_sizet len,
- char *what));
-extern void scm_done_malloc SCM_P ((long size));
-extern void scm_must_free SCM_P ((char *obj));
-extern void scm_remember SCM_P ((SCM * ptr));
-extern SCM scm_return_first SCM_P ((SCM elt, ...));
-extern SCM scm_permanent_object SCM_P ((SCM obj));
-extern SCM scm_protect_object SCM_P ((SCM obj));
-extern SCM scm_unprotect_object SCM_P ((SCM obj));
-extern int scm_init_storage SCM_P ((scm_sizet init_heap_size));
-extern void scm_init_gc SCM_P ((void));
+extern SCM scm_object_address (SCM obj);
+extern SCM scm_unhash_name (SCM name);
+extern SCM scm_gc_stats (void);
+extern void scm_gc_start (const char *what);
+extern void scm_gc_end (void);
+extern SCM scm_gc (void);
+extern void scm_gc_for_alloc (struct scm_freelist_t *freelist);
+#ifdef GUILE_NEW_GC_SCHEME
+extern SCM scm_gc_for_newcell (struct scm_freelist_t *master, SCM *freelist);
+#if 0
+extern void scm_alloc_cluster (struct scm_freelist_t *master);
+#endif
+#else
+extern SCM scm_gc_for_newcell (struct scm_freelist_t *freelist);
+#endif
+extern void scm_igc (const char *what);
+extern void scm_gc_mark (SCM p);
+extern void scm_mark_locations (SCM_STACKITEM x[], scm_sizet n);
+extern int scm_cellp (SCM value);
+extern void scm_gc_sweep (void);
+extern void * scm_must_malloc (scm_sizet len, const char *what);
+extern void * scm_must_realloc (void *where,
+ scm_sizet olen, scm_sizet len,
+ const char *what);
+extern void scm_done_malloc (long size);
+extern void scm_must_free (void *obj);
+extern void scm_remember (SCM * ptr);
+extern SCM scm_return_first (SCM elt, ...);
+extern int scm_return_first_int (int x, ...);
+extern SCM scm_permanent_object (SCM obj);
+extern SCM scm_protect_object (SCM obj);
+extern SCM scm_unprotect_object (SCM obj);
+#ifdef GUILE_NEW_GC_SCHEME
+extern int scm_init_storage (scm_sizet init_heap_size, int trig,
+ scm_sizet init_heap2_size, int trig2,
+ scm_sizet max_segment_size);
+#else
+extern int scm_init_storage (scm_sizet init_heap_size,
+ scm_sizet init_heap2_size);
+#endif
+extern void scm_init_gc (void);
#endif /* GCH */
HCoop / bpt / guile.git / blobdiff