2003-10-26 Daniel Berlin <dberlin@dberlin.org>

	* ggc-zone.c:  New file, zone allocating collector.
	* configure: Accept zone option for --with-gc
	* configure.in: Ditto.
	* ggc.h (ggc_pch_count_object): Pass bool indicating
	stringiness. Update all callers.
	(ggc_pch_alloc_object): Ditto.
	(ggc_pch_write_object): Ditto.
	(ggc_alloc_rtx): Use typed allocation, since all RTX's are of a single
	type.
	(ggc_alloc_rtvec): Ditto.
	(ggc_alloc_tree): Use zone allocation, since some things using this macro
	aren't a single typecode.
	* ggc-none.c (ggc_alloc_typed): New function.
	(ggc_alloc_zone): Ditto.
	* ggc-page.c: Ditto on both functions.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@72971 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 1795 insertions, 21 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d25e3309eb..e62f2451f43 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,21 @@
+2003-10-26  Daniel Berlin  <dberlin@dberlin.org>
+
+	* ggc-zone.c:  New file, zone allocating collector.
+	* configure: Accept zone option for --with-gc
+	* configure.in: Ditto.
+	* ggc.h (ggc_pch_count_object): Pass bool indicating
+	stringiness. Update all callers.
+	(ggc_pch_alloc_object): Ditto.
+	(ggc_pch_write_object): Ditto.
+	(ggc_alloc_rtx): Use typed allocation, since all RTX's are of a single
+	type.
+	(ggc_alloc_rtvec): Ditto.
+	(ggc_alloc_tree): Use zone allocation, since some things using this macro
+	aren't a single typecode.
+	* ggc-none.c (ggc_alloc_typed): New function.
+	(ggc_alloc_zone): Ditto.
+	* ggc-page.c: Ditto on both functions.
+
 2003-10-26  Gunther Nikl  <gni@gecko.de>
 
 	* config/m68k/m68k.c (m68k_compute_frame_layout): Ensure FPU related
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6097e1feb0a..81f819c256f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -850,7 +850,7 @@ OBJS-common = \
  insn-extract.o insn-opinit.o insn-output.o insn-peep.o insn-recog.o	   \
  integrate.o intl.o jump.o  langhooks.o lcm.o lists.o local-alloc.o  	   \
  loop.o optabs.o options.o opts.o params.o postreload.o predict.o	   \
- print-rtl.o print-tree.o value-prof.o					   \
+ print-rtl.o print-tree.o value-prof.o 								   \
  profile.o ra.o ra-build.o ra-colorize.o ra-debug.o ra-rewrite.o	   \
  real.o recog.o reg-stack.o regclass.o regmove.o regrename.o		   \
  reload.o reload1.o reorg.o resource.o rtl.o rtlanal.o rtl-error.o	   \
@@ -1462,6 +1462,9 @@ ggc-simple.o: ggc-simple.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H)
 ggc-page.o: ggc-page.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
 	flags.h toplev.h $(GGC_H) $(TIMEVAR_H) $(TM_P_H) $(PARAMS_H)
 
+ggc-zone.o: ggc-zone.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
+	flags.h toplev.h $(GGC_H) $(TIMEVAR_H) $(TM_P_H) $(PARAMS_H)
+
 stringpool.o: stringpool.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 	$(TREE_H) $(GGC_H) gt-stringpool.h
 
diff --git a/gcc/configure b/gcc/configure
index 34ad39b1ea1..e539c125d94 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -83,7 +83,7 @@ ac_help="$ac_help
                           use KEY instead of GCC version as the last portion
                           of the registry key"
 ac_help="$ac_help
-  --with-gc={simple,page} choose the garbage collection mechanism to use
+  --with-gc={simple,page,zone} choose the garbage collection mechanism to use
                           with the compiler"
 ac_help="$ac_help
   --with-system-zlib      use installed libz"
@@ -7609,7 +7609,7 @@ fi
 if test "${with_gc+set}" = set; then
   withval="$with_gc"
   case "$withval" in
-  simple | page)
+  simple | page | zone)
     GGC=ggc-$withval
     ;;
   *)
diff --git a/gcc/configure.in b/gcc/configure.in
index 13516837cbf..f424f03b6fc 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -2695,10 +2695,10 @@ AC_SUBST(gthread_flags)
 
 # Find out what GC implementation we want, or may, use.
 AC_ARG_WITH(gc,
-[  --with-gc={simple,page} choose the garbage collection mechanism to use
+[  --with-gc={simple,page,zone} choose the garbage collection mechanism to use
                           with the compiler],
 [case "$withval" in
-  simple | page)
+  simple | page | zone)
     GGC=ggc-$withval
     ;;
   *)
diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
index 5f0d11dd9ba..eab766e0378 100644
--- a/gcc/ggc-common.c
+++ b/gcc/ggc-common.c
@@ -328,7 +328,7 @@ call_count (void **slot, void *state_p)
   struct ptr_data *d = (struct ptr_data *)*slot;
   struct traversal_state *state = (struct traversal_state *)state_p;
 
-  ggc_pch_count_object (state->d, d->obj, d->size);
+  ggc_pch_count_object (state->d, d->obj, d->size, d->note_ptr_fn == gt_pch_p_S);
   state->count++;
   return 1;
 }
@@ -339,7 +339,7 @@ call_alloc (void **slot, void *state_p)
   struct ptr_data *d = (struct ptr_data *)*slot;
   struct traversal_state *state = (struct traversal_state *)state_p;
 
-  d->new_addr = ggc_pch_alloc_object (state->d, d->obj, d->size);
+  d->new_addr = ggc_pch_alloc_object (state->d, d->obj, d->size, d->note_ptr_fn == gt_pch_p_S);
   state->ptrs[state->ptrs_i++] = d;
   return 1;
 }
@@ -524,7 +524,7 @@ gt_pch_save (FILE *f)
 				  state.ptrs[i]->note_ptr_cookie,
 				  relocate_ptrs, &state);
       ggc_pch_write_object (state.d, state.f, state.ptrs[i]->obj,
-			    state.ptrs[i]->new_addr, state.ptrs[i]->size);
+			    state.ptrs[i]->new_addr, state.ptrs[i]->size, state.ptrs[i]->note_ptr_fn == gt_pch_p_S);
       if (state.ptrs[i]->note_ptr_fn != gt_pch_p_S)
 	memcpy (state.ptrs[i]->obj, this_object, state.ptrs[i]->size);
     }
diff --git a/gcc/ggc-none.c b/gcc/ggc-none.c
index ee53e761a85..659bf931d09 100644
--- a/gcc/ggc-none.c
+++ b/gcc/ggc-none.c
@@ -28,6 +28,14 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "ggc.h"
+struct alloc_zone *rtl_zone = NULL;
+struct alloc_zone *garbage_zone = NULL;
+
+void *
+ggc_alloc_typed (enum gt_types_enum gte ATTRIBUTE_UNUSED, size_t size)
+{
+  return xmalloc (size);
+}
 
 void *
 ggc_alloc (size_t size)
@@ -36,6 +44,12 @@ ggc_alloc (size_t size)
 }
 
 void *
+ggc_alloc_zone (size_t size, struct alloc_zone *zone ATTRIBUTE_UNUSED)
+{
+  return xmalloc (size);
+}
+
+void *
 ggc_alloc_cleared (size_t size)
 {
   return xcalloc (size, 1);
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 71268ca34da..198b73364bf 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -469,7 +469,10 @@ static void poison_pages (void);
 void debug_print_page_list (int);
 static void push_depth (unsigned int);
 static void push_by_depth (page_entry *, unsigned long *);
-
+struct alloc_zone *rtl_zone = NULL;
+struct alloc_zone *tree_zone = NULL;
+struct alloc_zone *garbage_zone = NULL;
+
 /* Push an entry onto G.depth.  */
 
 inline static void
@@ -1021,6 +1024,22 @@ static unsigned char size_lookup[257] =
   8
 };
 
+/* Typed allocation function.  Does nothing special in this collector.  */
+
+void *
+ggc_alloc_typed (enum gt_types_enum type ATTRIBUTE_UNUSED, size_t size)
+{
+  return ggc_alloc (size);
+}
+
+/* Zone allocation function.  Does nothing special in this collector.  */
+
+void *
+ggc_alloc_zone (size_t size, struct alloc_zone *zone ATTRIBUTE_UNUSED)
+{
+  return ggc_alloc (size);
+}
+
 /* Allocate a chunk of memory of SIZE bytes.  Its contents are undefined.  */
 
 void *
@@ -1894,7 +1913,7 @@ init_ggc_pch (void)
 
 void
 ggc_pch_count_object (struct ggc_pch_data *d, void *x ATTRIBUTE_UNUSED,
-		      size_t size)
+		      size_t size, bool is_string ATTRIBUTE_UNUSED)
 {
   unsigned order;
 
@@ -1937,7 +1956,7 @@ ggc_pch_this_base (struct ggc_pch_data *d, void *base)
 
 char *
 ggc_pch_alloc_object (struct ggc_pch_data *d, void *x ATTRIBUTE_UNUSED,
-		      size_t size)
+		      size_t size, bool is_string ATTRIBUTE_UNUSED)
 {
   unsigned order;
   char *result;
@@ -1966,7 +1985,7 @@ ggc_pch_prepare_write (struct ggc_pch_data *d ATTRIBUTE_UNUSED,
 void
 ggc_pch_write_object (struct ggc_pch_data *d ATTRIBUTE_UNUSED,
 		      FILE *f, void *x, void *newx ATTRIBUTE_UNUSED,
-		      size_t size)
+		      size_t size, bool is_string ATTRIBUTE_UNUSED)
 {
   unsigned order;
   static const char emptyBytes[256];
diff --git a/gcc/ggc-zone.c b/gcc/ggc-zone.c
new file mode 100644
index 00000000000..897389e0286
--- /dev/null
+++ b/gcc/ggc-zone.c
@@ -0,0 +1,1701 @@
+/* "Bag-of-pages" zone garbage collector for the GNU compiler.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Contributed by Richard Henderson (rth@redhat.com) and Daniel Berlin (dberlin@dberlin.org)
+
+
+This file is part of GCC.
+
+GCC 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.
+
+GCC 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 GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "tree.h"
+#include "rtl.h"
+#include "tm_p.h"
+#include "toplev.h"
+#include "varray.h"
+#include "flags.h"
+#include "ggc.h"
+#include "timevar.h"
+#include "params.h"
+#include "bitmap.h"
+
+#ifdef ENABLE_VALGRIND_CHECKING
+#include <valgrind/memcheck.h>
+#else
+/* Avoid #ifdef:s when we can help it.  */
+#define VALGRIND_DISCARD(x)
+#define VALGRIND_MALLOCLIKE_BLOCK(w,x,y,z)
+#define VALGRIND_FREELIKE_BLOCK(x,y)
+#endif
+/* Prefer MAP_ANON(YMOUS) to /dev/zero, since we don't need to keep a
+   file open.  Prefer either to valloc.  */
+#ifdef HAVE_MMAP_ANON
+# undef HAVE_MMAP_DEV_ZERO
+
+# include <sys/mman.h>
+# ifndef MAP_FAILED
+#  define MAP_FAILED -1
+# endif
+# if !defined (MAP_ANONYMOUS) && defined (MAP_ANON)
+#  define MAP_ANONYMOUS MAP_ANON
+# endif
+# define USING_MMAP
+
+#endif
+
+#ifdef HAVE_MMAP_DEV_ZERO
+
+# include <sys/mman.h>
+# ifndef MAP_FAILED
+#  define MAP_FAILED -1
+# endif
+# define USING_MMAP
+
+#endif
+
+#ifndef USING_MMAP
+#define USING_MALLOC_PAGE_GROUPS
+#endif
+
+#if (GCC_VERSION < 3001)
+#define prefetch(X) ((void) X)
+#else
+#define prefetch(X) __builtin_prefetch (X)
+#endif
+
+/* NOTES:
+   If we track inter-zone pointers, we can mark single zones at a
+   time.
+   If we have a zone where we guarantee no inter-zone pointers, we
+   could mark that zone seperately.
+   The garbage zone should not be marked, and we should return 1 in
+   ggc_set_mark for any object in the garbage zone, which cuts off
+   marking quickly.  */
+/* Stategy:
+
+   This garbage-collecting allocator segregates objects into zones.
+   It also segregates objects into "large" and "small" bins.  Large
+   objects are greater or equal to page size.
+
+   Pages for small objects are broken up into chunks, each of which
+   are described by a struct alloc_chunk.  One can walk over all
+   chunks on the page by adding the chunk size to the chunk's data
+   address.  The free space for a page exists in the free chunk bins.
+
+   Each page-entry also has a context depth, which is used to track
+   pushing and popping of allocation contexts.  Only objects allocated
+   in the current (highest-numbered) context may be collected.
+
+   Empty pages (of all sizes) are kept on a single page cache list,
+   and are considered first when new pages are required; they are
+   deallocated at the start of the next collection if they haven't
+   been recycled by then.  */
+
+/* Define GGC_DEBUG_LEVEL to print debugging information.
+     0: No debugging output.
+     1: GC statistics only.
+     2: Page-entry allocations/deallocations as well.
+     3: Object allocations as well.
+     4: Object marks as well.  */
+#define GGC_DEBUG_LEVEL (0)
+
+#ifndef HOST_BITS_PER_PTR
+#define HOST_BITS_PER_PTR  HOST_BITS_PER_LONG
+#endif
+#ifdef COOKIE_CHECKING
+#define CHUNK_MAGIC 0x95321123
+#define DEADCHUNK_MAGIC 0x12817317
+#endif
+
+/* This structure manages small chunks.  When the chunk is free, it's
+   linked with other chunks via free_next.  When the chunk is allocated,
+   the data starts at u.  Large chunks are allocated one at a time to
+   their own page, and so don't come in here.
+
+   The "type" field is a placeholder for a future change to do
+   generational collection.  At present it is 0 when free and
+   and 1 when allocated.  */
+
+struct alloc_chunk {
+#ifdef COOKIE_CHECKING
+  unsigned int magic;
+#endif
+  unsigned int type:1;
+  unsigned int typecode:15;
+  unsigned int size:15;
+  unsigned int mark:1;
+  union {
+    struct alloc_chunk *next_free;
+    char data[1];
+
+    /* Make sure the data is sufficiently aligned.  */
+    HOST_WIDEST_INT align_i;
+#ifdef HAVE_LONG_DOUBLE
+    long double align_d;
+#else
+    double align_d;
+#endif
+  } u;
+} __attribute__ ((packed));
+
+#define CHUNK_OVERHEAD	(offsetof (struct alloc_chunk, u))
+
+/* We maintain several bins of free lists for chunks for very small
+   objects.  We never exhaustively search other bins -- if we don't
+   find one of the proper size, we allocate from the "larger" bin.  */
+
+/* Decreasing the number of free bins increases the time it takes to allocate.
+   Similar with increasing max_free_bin_size without increasing num_free_bins.
+
+   After much histogramming of allocation sizes and time spent on gc,
+   on a powerpc G4 7450 - 667 mhz, and an pentium 4 - 2.8ghz,
+   these were determined to be the optimal values.  */
+#define NUM_FREE_BINS		64
+#define MAX_FREE_BIN_SIZE	256
+#define FREE_BIN_DELTA		(MAX_FREE_BIN_SIZE / NUM_FREE_BINS)
+#define SIZE_BIN_UP(SIZE)	(((SIZE) + FREE_BIN_DELTA - 1) / FREE_BIN_DELTA)
+#define SIZE_BIN_DOWN(SIZE)	((SIZE) / FREE_BIN_DELTA)
+
+/* Marker used as chunk->size for a large object.  Should correspond
+   to the size of the bitfield above.  */
+#define LARGE_OBJECT_SIZE	0x7fff
+
+/* We use this structure to determine the alignment required for
+   allocations.  For power-of-two sized allocations, that's not a
+   problem, but it does matter for odd-sized allocations.  */
+
+struct max_alignment {
+  char c;
+  union {
+    HOST_WIDEST_INT i;
+#ifdef HAVE_LONG_DOUBLE
+    long double d;
+#else
+    double d;
+#endif
+  } u;
+};
+
+/* The biggest alignment required.  */
+
+#define MAX_ALIGNMENT (offsetof (struct max_alignment, u))
+
+/* Compute the smallest nonnegative number which when added to X gives
+   a multiple of F.  */
+
+#define ROUND_UP_VALUE(x, f) ((f) - 1 - ((f) - 1 + (x)) % (f))
+
+/* Compute the smallest multiple of F that is >= X.  */
+
+#define ROUND_UP(x, f) (CEIL (x, f) * (f))
+
+/* A two-level tree is used to look up the page-entry for a given
+   pointer.  Two chunks of the pointer's bits are extracted to index
+   the first and second levels of the tree, as follows:
+
+				   HOST_PAGE_SIZE_BITS
+			   32		|      |
+       msb +----------------+----+------+------+ lsb
+			    |    |      |
+			 PAGE_L1_BITS   |
+				 |      |
+			       PAGE_L2_BITS
+
+   The bottommost HOST_PAGE_SIZE_BITS are ignored, since page-entry
+   pages are aligned on system page boundaries.  The next most
+   significant PAGE_L2_BITS and PAGE_L1_BITS are the second and first
+   index values in the lookup table, respectively.
+
+   For 32-bit architectures and the settings below, there are no
+   leftover bits.  For architectures with wider pointers, the lookup
+   tree points to a list of pages, which must be scanned to find the
+   correct one.  */
+
+#define PAGE_L1_BITS	(8)
+#define PAGE_L2_BITS	(32 - PAGE_L1_BITS - G.lg_pagesize)
+#define PAGE_L1_SIZE	((size_t) 1 << PAGE_L1_BITS)
+#define PAGE_L2_SIZE	((size_t) 1 << PAGE_L2_BITS)
+
+#define LOOKUP_L1(p) \
+  (((size_t) (p) >> (32 - PAGE_L1_BITS)) & ((1 << PAGE_L1_BITS) - 1))
+
+#define LOOKUP_L2(p) \
+  (((size_t) (p) >> G.lg_pagesize) & ((1 << PAGE_L2_BITS) - 1))
+
+struct alloc_zone;
+/* A page_entry records the status of an allocation page.  */
+typedef struct page_entry
+{
+  /* The next page-entry with objects of the same size, or NULL if
+     this is the last page-entry.  */
+  struct page_entry *next;
+
+  /* The number of bytes allocated.  (This will always be a multiple
+     of the host system page size.)  */
+  size_t bytes;
+
+  /* How many collections we've survived.  */
+  size_t survived;
+
+  /* The address at which the memory is allocated.  */
+  char *page;
+
+#ifdef USING_MALLOC_PAGE_GROUPS
+  /* Back pointer to the page group this page came from.  */
+  struct page_group *group;
+#endif
+
+  /* Number of bytes on the page unallocated.  Only used during
+     collection, and even then large pages merely set this non-zero.  */
+  size_t bytes_free;
+
+  /* Context depth of this page.  */
+  unsigned short context_depth;
+
+  /* Does this page contain small objects, or one large object?  */
+  bool large_p;
+
+  struct alloc_zone *zone;
+} page_entry;
+
+#ifdef USING_MALLOC_PAGE_GROUPS
+/* A page_group describes a large allocation from malloc, from which
+   we parcel out aligned pages.  */
+typedef struct page_group
+{
+  /* A linked list of all extant page groups.  */
+  struct page_group *next;
+
+  /* The address we received from malloc.  */
+  char *allocation;
+
+  /* The size of the block.  */
+  size_t alloc_size;
+
+  /* A bitmask of pages in use.  */
+  unsigned int in_use;
+} page_group;
+#endif
+
+#if HOST_BITS_PER_PTR <= 32
+
+/* On 32-bit hosts, we use a two level page table, as pictured above.  */
+typedef page_entry **page_table[PAGE_L1_SIZE];
+
+#else
+
+/* On 64-bit hosts, we use the same two level page tables plus a linked
+   list that disambiguates the top 32-bits.  There will almost always be
+   exactly one entry in the list.  */
+typedef struct page_table_chain
+{
+  struct page_table_chain *next;
+  size_t high_bits;
+  page_entry **table[PAGE_L1_SIZE];
+} *page_table;
+
+#endif
+
+/* The global variables.  */
+static struct globals
+{
+  /* The page lookup table.  A single page can only belong to one
+     zone.  This means free pages are zone-specific ATM.  */
+  page_table lookup;
+  /* The linked list of zones.  */
+  struct alloc_zone *zones;
+
+  /* The system's page size.  */
+  size_t pagesize;
+  size_t lg_pagesize;
+
+  /* A file descriptor open to /dev/zero for reading.  */
+#if defined (HAVE_MMAP_DEV_ZERO)
+  int dev_zero_fd;
+#endif
+
+  /* The file descriptor for debugging output.  */
+  FILE *debug_file;
+} G;
+
+/*  The zone allocation structure.  */
+struct alloc_zone
+{
+  /* Name of the zone.  */
+  const char *name;
+
+  /* Linked list of pages in a zone.  */
+  page_entry *pages;
+
+  /* Linked lists of free storage.  Slots 1 ... NUM_FREE_BINS have chunks of size
+     FREE_BIN_DELTA.  All other chunks are in slot 0.  */
+  struct alloc_chunk *free_chunks[NUM_FREE_BINS + 1];
+
+  /* Bytes currently allocated.  */
+  size_t allocated;
+
+  /* Bytes currently allocated at the end of the last collection.  */
+  size_t allocated_last_gc;
+
+  /* Total amount of memory mapped.  */
+  size_t bytes_mapped;
+
+  /* Bit N set if any allocations have been done at context depth N.  */
+  unsigned long context_depth_allocations;
+
+  /* Bit N set if any collections have been done at context depth N.  */
+  unsigned long context_depth_collections;
+
+  /* The current depth in the context stack.  */
+  unsigned short context_depth;
+
+  /* A cache of free system pages.  */
+  page_entry *free_pages;
+
+#ifdef USING_MALLOC_PAGE_GROUPS
+  page_group *page_groups;
+#endif
+
+  /* Next zone in the linked list of zones.  */
+  struct alloc_zone *next_zone;
+
+  /* Return true if this zone was collected during this collection.  */
+  bool was_collected;
+} main_zone;
+
+struct alloc_zone *rtl_zone;
+struct alloc_zone *garbage_zone;
+struct alloc_zone *tree_zone;
+
+/* Allocate pages in chunks of this size, to throttle calls to memory
+   allocation routines.  The first page is used, the rest go onto the
+   free list.  This cannot be larger than HOST_BITS_PER_INT for the
+   in_use bitmask for page_group.  */
+#define GGC_QUIRE_SIZE 16
+
+static int ggc_allocated_p (const void *);
+static page_entry *lookup_page_table_entry (const void *);
+static void set_page_table_entry (void *, page_entry *);
+#ifdef USING_MMAP
+static char *alloc_anon (char *, size_t, struct alloc_zone *);
+#endif
+#ifdef USING_MALLOC_PAGE_GROUPS
+static size_t page_group_index (char *, char *);
+static void set_page_group_in_use (page_group *, char *);
+static void clear_page_group_in_use (page_group *, char *);
+#endif
+static struct page_entry * alloc_small_page ( struct alloc_zone *);
+static struct page_entry * alloc_large_page (size_t, struct alloc_zone *);
+static void free_chunk (struct alloc_chunk *, size_t, struct alloc_zone *);
+static void free_page (struct page_entry *);
+static void release_pages (struct alloc_zone *);
+static void sweep_pages (struct alloc_zone *);
+static void * ggc_alloc_zone_1 (size_t, struct alloc_zone *, short);
+static bool ggc_collect_1 (struct alloc_zone *, bool);
+static void check_cookies (void);
+
+
+/* Returns nonzero if P was allocated in GC'able memory.  */
+
+static inline int
+ggc_allocated_p (const void *p)
+{
+  page_entry ***base;
+  size_t L1, L2;
+
+#if HOST_BITS_PER_PTR <= 32
+  base = &G.lookup[0];
+#else
+  page_table table = G.lookup;
+  size_t high_bits = (size_t) p & ~ (size_t) 0xffffffff;
+  while (1)
+    {
+      if (table == NULL)
+	return 0;
+      if (table->high_bits == high_bits)
+	break;
+      table = table->next;
+    }
+  base = &table->table[0];
+#endif
+
+  /* Extract the level 1 and 2 indices.  */
+  L1 = LOOKUP_L1 (p);
+  L2 = LOOKUP_L2 (p);
+
+  return base[L1] && base[L1][L2];
+}
+
+/* Traverse the page table and find the entry for a page.
+   Die (probably) if the object wasn't allocated via GC.  */
+
+static inline page_entry *
+lookup_page_table_entry(const void *p)
+{
+  page_entry ***base;
+  size_t L1, L2;
+
+#if HOST_BITS_PER_PTR <= 32
+  base = &G.lookup[0];
+#else
+  page_table table = G.lookup;
+  size_t high_bits = (size_t) p & ~ (size_t) 0xffffffff;
+  while (table->high_bits != high_bits)
+    table = table->next;
+  base = &table->table[0];
+#endif
+
+  /* Extract the level 1 and 2 indices.  */
+  L1 = LOOKUP_L1 (p);
+  L2 = LOOKUP_L2 (p);
+
+  return base[L1][L2];
+
+}
+
+/* Set the page table entry for a page.  */
+
+static void
+set_page_table_entry(void *p, page_entry *entry)
+{
+  page_entry ***base;
+  size_t L1, L2;
+
+#if HOST_BITS_PER_PTR <= 32
+  base = &G.lookup[0];
+#else
+  page_table table;
+  size_t high_bits = (size_t) p & ~ (size_t) 0xffffffff;
+  for (table = G.lookup; table; table = table->next)
+    if (table->high_bits == high_bits)
+      goto found;
+
+  /* Not found -- allocate a new table.  */
+  table = (page_table) xcalloc (1, sizeof(*table));
+  table->next = G.lookup;
+  table->high_bits = high_bits;
+  G.lookup = table;
+found:
+  base = &table->table[0];
+#endif
+
+  /* Extract the level 1 and 2 indices.  */
+  L1 = LOOKUP_L1 (p);
+  L2 = LOOKUP_L2 (p);
+
+  if (base[L1] == NULL)
+    base[L1] = (page_entry **) xcalloc (PAGE_L2_SIZE, sizeof (page_entry *));
+
+  base[L1][L2] = entry;
+}
+
+#ifdef USING_MMAP
+/* Allocate SIZE bytes of anonymous memory, preferably near PREF,
+   (if non-null).  The ifdef structure here is intended to cause a
+   compile error unless exactly one of the HAVE_* is defined.  */
+
+static inline char *
+alloc_anon (char *pref ATTRIBUTE_UNUSED, size_t size, struct alloc_zone *zone)
+{
+#ifdef HAVE_MMAP_ANON
+  char *page = (char *) mmap (pref, size, PROT_READ | PROT_WRITE,
+			      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+#endif
+#ifdef HAVE_MMAP_DEV_ZERO
+  char *page = (char *) mmap (pref, size, PROT_READ | PROT_WRITE,
+			      MAP_PRIVATE, G.dev_zero_fd, 0);
+#endif
+  VALGRIND_MALLOCLIKE_BLOCK(page, size, 0, 0);
+
+  if (page == (char *) MAP_FAILED)
+    {
+      perror ("virtual memory exhausted");
+      exit (FATAL_EXIT_CODE);
+    }
+
+  /* Remember that we allocated this memory.  */
+  zone->bytes_mapped += size;
+  /* Pretend we don't have access to the allocated pages.  We'll enable
+     access to smaller pieces of the area in ggc_alloc.  Discard the
+     handle to avoid handle leak.  */
+  VALGRIND_DISCARD (VALGRIND_MAKE_NOACCESS (page, size));
+  return page;
+}
+#endif
+#ifdef USING_MALLOC_PAGE_GROUPS
+/* Compute the index for this page into the page group.  */
+
+static inline size_t
+page_group_index (char *allocation, char *page)
+{
+  return (size_t) (page - allocation) >> G.lg_pagesize;
+}
+
+/* Set and clear the in_use bit for this page in the page group.  */
+
+static inline void
+set_page_group_in_use (page_group *group, char *page)
+{
+  group->in_use |= 1 << page_group_index (group->allocation, page);
+}
+
+static inline void
+clear_page_group_in_use (page_group *group, char *page)
+{
+  group->in_use &= ~(1 << page_group_index (group->allocation, page));
+}
+#endif
+
+/* Allocate a new page for allocating objects of size 2^ORDER,
+   and return an entry for it.  The entry is not added to the
+   appropriate page_table list.  */
+
+static inline struct page_entry *
+alloc_small_page (struct alloc_zone *zone)
+{
+  struct page_entry *entry;
+  char *page;
+#ifdef USING_MALLOC_PAGE_GROUPS
+  page_group *group;
+#endif
+
+  page = NULL;
+
+  /* Check the list of free pages for one we can use.  */
+  entry = zone->free_pages;
+  if (entry != NULL)
+    {
+      /* Recycle the allocated memory from this page ...  */
+      zone->free_pages = entry->next;
+      page = entry->page;
+
+#ifdef USING_MALLOC_PAGE_GROUPS
+      group = entry->group;
+#endif
+    }
+#ifdef USING_MMAP
+  else
+    {
+      /* We want just one page.  Allocate a bunch of them and put the
+	 extras on the freelist.  (Can only do this optimization with
+	 mmap for backing store.)  */
+      struct page_entry *e, *f = zone->free_pages;
+      int i;
+
+      page = alloc_anon (NULL, G.pagesize * GGC_QUIRE_SIZE, zone);
+
+      /* This loop counts down so that the chain will be in ascending
+	 memory order.  */
+      for (i = GGC_QUIRE_SIZE - 1; i >= 1; i--)
+	{
+	  e = (struct page_entry *) xmalloc (sizeof (struct page_entry));
+	  e->bytes = G.pagesize;
+	  e->page = page + (i << G.lg_pagesize);
+	  e->next = f;
+	  f = e;
+	}
+
+      zone->free_pages = f;
+    }
+#endif
+#ifdef USING_MALLOC_PAGE_GROUPS
+  else
+    {
+      /* Allocate a large block of memory and serve out the aligned
+	 pages therein.  This results in much less memory wastage
+	 than the traditional implementation of valloc.  */
+
+      char *allocation, *a, *enda;
+      size_t alloc_size, head_slop, tail_slop;
+      int multiple_pages = (entry_size == G.pagesize);
+
+      if (multiple_pages)
+	alloc_size = GGC_QUIRE_SIZE * G.pagesize;
+      else
+	alloc_size = entry_size + G.pagesize - 1;
+      allocation = xmalloc (alloc_size);
+      VALGRIND_MALLOCLIKE_BLOCK(addr, alloc_size, 0, 0);
+
+      page = (char *) (((size_t) allocation + G.pagesize - 1) & -G.pagesize);
+      head_slop = page - allocation;
+      if (multiple_pages)
+	tail_slop = ((size_t) allocation + alloc_size) & (G.pagesize - 1);
+      else
+	tail_slop = alloc_size - entry_size - head_slop;
+      enda = allocation + alloc_size - tail_slop;
+
+      /* We allocated N pages, which are likely not aligned, leaving
+	 us with N-1 usable pages.  We plan to place the page_group
+	 structure somewhere in the slop.  */
+      if (head_slop >= sizeof (page_group))
+	group = (page_group *)page - 1;
+      else
+	{
+	  /* We magically got an aligned allocation.  Too bad, we have
+	     to waste a page anyway.  */
+	  if (tail_slop == 0)
+	    {
+	      enda -= G.pagesize;
+	      tail_slop += G.pagesize;
+	    }
+	  if (tail_slop < sizeof (page_group))
+	    abort ();
+	  group = (page_group *)enda;
+	  tail_slop -= sizeof (page_group);
+	}
+
+      /* Remember that we allocated this memory.  */
+      group->next = G.page_groups;
+      group->allocation = allocation;
+      group->alloc_size = alloc_size;
+      group->in_use = 0;
+      zone->page_groups = group;
+      G.bytes_mapped += alloc_size;
+
+      /* If we allocated multiple pages, put the rest on the free list.  */
+      if (multiple_pages)
+	{
+	  struct page_entry *e, *f = G.free_pages;
+	  for (a = enda - G.pagesize; a != page; a -= G.pagesize)
+	    {
+	      e = (struct page_entry *) xmalloc (sizeof (struct page_entry));
+	      e->bytes = G.pagesize;
+	      e->page = a;
+	      e->group = group;
+	      e->next = f;
+	      f = e;
+	    }
+	  zone->free_pages = f;
+	}
+    }
+#endif
+
+  if (entry == NULL)
+    entry = (struct page_entry *) xmalloc (sizeof (struct page_entry));
+
+  entry->next = 0;
+  entry->bytes = G.pagesize;
+  entry->bytes_free = G.pagesize;
+  entry->page = page;
+  entry->context_depth = zone->context_depth;
+  entry->large_p = false;
+  entry->zone = zone;
+  zone->context_depth_allocations |= (unsigned long)1 << zone->context_depth;
+
+#ifdef USING_MALLOC_PAGE_GROUPS
+  entry->group = group;
+  set_page_group_in_use (group, page);
+#endif
+
+  set_page_table_entry (page, entry);
+
+  if (GGC_DEBUG_LEVEL >= 2)
+    fprintf (G.debug_file,
+	     "Allocating %s page at %p, data %p-%p\n", entry->zone->name,
+	     (PTR) entry, page, page + G.pagesize - 1);
+
+  return entry;
+}
+
+/* Allocate a large page of size SIZE in ZONE.  */
+
+static inline struct page_entry *
+alloc_large_page (size_t size, struct alloc_zone *zone)
+{
+  struct page_entry *entry;
+  char *page;
+
+  page = (char *) xmalloc (size + CHUNK_OVERHEAD + sizeof (struct page_entry));
+  entry = (struct page_entry *) (page + size + CHUNK_OVERHEAD);
+
+  entry->next = 0;
+  entry->bytes = size;
+  entry->bytes_free = LARGE_OBJECT_SIZE + CHUNK_OVERHEAD;
+  entry->page = page;
+  entry->context_depth = zone->context_depth;
+  entry->large_p = true;
+  entry->zone = zone;
+  zone->context_depth_allocations |= (unsigned long)1 << zone->context_depth;
+
+#ifdef USING_MALLOC_PAGE_GROUPS
+  entry->group = NULL;
+#endif
+  set_page_table_entry (page, entry);
+
+  if (GGC_DEBUG_LEVEL >= 2)
+    fprintf (G.debug_file,
+	     "Allocating %s large page at %p, data %p-%p\n", entry->zone->name,
+	     (PTR) entry, page, page + size - 1);
+
+  return entry;
+}
+
+
+/* For a page that is no longer needed, put it on the free page list.  */
+
+static inline void
+free_page (page_entry *entry)
+{
+  if (GGC_DEBUG_LEVEL >= 2)
+    fprintf (G.debug_file,
+	     "Deallocating %s page at %p, data %p-%p\n", entry->zone->name, (PTR) entry,
+	     entry->page, entry->page + entry->bytes - 1);
+
+  set_page_table_entry (entry->page, NULL);
+
+  if (entry->large_p)
+    {
+      free (entry->page);
+      VALGRIND_FREELIKE_BLOCK (entry->page, entry->bytes);
+    }
+  else
+    {
+      /* Mark the page as inaccessible.  Discard the handle to
+	 avoid handle leak.  */
+      VALGRIND_DISCARD (VALGRIND_MAKE_NOACCESS (entry->page, entry->bytes));
+
+#ifdef USING_MALLOC_PAGE_GROUPS
+      clear_page_group_in_use (entry->group, entry->page);
+#endif
+
+      entry->next = entry->zone->free_pages;
+      entry->zone->free_pages = entry;
+    }
+}
+
+/* Release the free page cache to the system.  */
+
+static void
+release_pages (struct alloc_zone *zone)
+{
+#ifdef USING_MMAP
+  page_entry *p, *next;
+  char *start;
+  size_t len;
+
+  /* Gather up adjacent pages so they are unmapped together.  */
+  p = zone->free_pages;
+
+  while (p)
+    {
+      start = p->page;
+      next = p->next;
+      len = p->bytes;
+      free (p);
+      p = next;
+
+      while (p && p->page == start + len)
+	{
+	  next = p->next;
+	  len += p->bytes;
+	  free (p);
+	  p = next;
+	}
+
+      munmap (start, len);
+      zone->bytes_mapped -= len;
+    }
+
+  zone->free_pages = NULL;
+#endif
+#ifdef USING_MALLOC_PAGE_GROUPS
+  page_entry **pp, *p;
+  page_group **gp, *g;
+
+  /* Remove all pages from free page groups from the list.  */
+  pp = &(zone->free_pages);
+  while ((p = *pp) != NULL)
+    if (p->group->in_use == 0)
+      {
+	*pp = p->next;
+	free (p);
+      }
+    else
+      pp = &p->next;
+
+  /* Remove all free page groups, and release the storage.  */
+  gp = &(zone->page_groups);
+  while ((g = *gp) != NULL)
+    if (g->in_use == 0)
+      {
+	*gp = g->next;
+	zone->bytes_mapped -= g->alloc_size;
+	free (g->allocation);
+	VALGRIND_FREELIKE_BLOCK(g->allocation, 0);
+      }
+    else
+      gp = &g->next;
+#endif
+}
+
+/* Place CHUNK of size SIZE on the free list for ZONE.  */
+
+static inline void
+free_chunk (struct alloc_chunk *chunk, size_t size, struct alloc_zone *zone)
+{
+  size_t bin = 0;
+
+  bin = SIZE_BIN_DOWN (size);
+  if (bin == 0)
+    abort ();
+  if (bin > NUM_FREE_BINS)
+    bin = 0;
+#ifdef COOKIE_CHECKING
+  if (chunk->magic != CHUNK_MAGIC && chunk->magic != DEADCHUNK_MAGIC)
+    abort ();
+  chunk->magic = DEADCHUNK_MAGIC;
+#endif
+  chunk->u.next_free = zone->free_chunks[bin];
+  zone->free_chunks[bin] = chunk;
+  if (GGC_DEBUG_LEVEL >= 3)
+    fprintf (G.debug_file, "Deallocating object, chunk=%p\n", (void *)chunk);
+  VALGRIND_DISCARD (VALGRIND_MAKE_READABLE (chunk, sizeof (struct alloc_chunk)));
+}
+
+/* Allocate a chunk of memory of SIZE bytes.  */
+
+static void *
+ggc_alloc_zone_1 (size_t size, struct alloc_zone *zone, short type)
+{
+  size_t bin = 0;
+  size_t lsize = 0;
+  struct page_entry *entry;
+  struct alloc_chunk *chunk, *lchunk, **pp;
+  void *result;
+
+  /* Align size, so that we're assured of aligned allocations.  */
+  if (size < FREE_BIN_DELTA)
+    size = FREE_BIN_DELTA;
+  size = (size + MAX_ALIGNMENT - 1) & -MAX_ALIGNMENT;
+
+  /* Large objects are handled specially.  */
+  if (size >= G.pagesize - 2*CHUNK_OVERHEAD - FREE_BIN_DELTA)
+    {
+      entry = alloc_large_page (size, zone);
+      entry->survived = 0;
+      entry->next = entry->zone->pages;
+      entry->zone->pages = entry;
+
+
+      chunk = (struct alloc_chunk *) entry->page;
+      VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (chunk, sizeof (struct alloc_chunk)));
+      chunk->size = LARGE_OBJECT_SIZE;
+
+      goto found;
+    }
+
+  /* First look for a tiny object already segregated into its own
+     size bucket.  */
+  bin = SIZE_BIN_UP (size);
+  if (bin <= NUM_FREE_BINS)
+    {
+      chunk = zone->free_chunks[bin];
+      if (chunk)
+	{
+	  zone->free_chunks[bin] = chunk->u.next_free;
+	  VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (chunk, sizeof (struct alloc_chunk)));
+	  goto found;
+	}
+    }
+
+  /* Failing that, look through the "other" bucket for a chunk
+     that is large enough.  */
+  pp = &(zone->free_chunks[0]);
+  chunk = *pp;
+  while (chunk && chunk->size < size)
+    {
+      pp = &chunk->u.next_free;
+      chunk = *pp;
+    }
+
+  /* Failing that, allocate new storage.  */
+  if (!chunk)
+    {
+      entry = alloc_small_page (zone);
+      entry->next = entry->zone->pages;
+      entry->zone->pages = entry;
+
+      chunk = (struct alloc_chunk *) entry->page;
+      VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (chunk, sizeof (struct alloc_chunk)));
+      chunk->size = G.pagesize - CHUNK_OVERHEAD;
+    }
+  else
+    {
+      *pp = chunk->u.next_free;
+      VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (chunk, sizeof (struct alloc_chunk)));
+    }
+  /* Release extra memory from a chunk that's too big.  */
+  lsize = chunk->size - size;
+  if (lsize >= CHUNK_OVERHEAD + FREE_BIN_DELTA)
+    {
+      VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (chunk, sizeof (struct alloc_chunk)));
+      chunk->size = size;
+
+      lsize -= CHUNK_OVERHEAD;
+      lchunk = (struct alloc_chunk *)(chunk->u.data + size);
+      VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (lchunk, sizeof (struct alloc_chunk)));
+#ifdef COOKIE_CHECKING
+      lchunk->magic = CHUNK_MAGIC;
+#endif
+      lchunk->type = 0;
+      lchunk->mark = 0;
+      lchunk->size = lsize;
+      free_chunk (lchunk, lsize, zone);
+    }
+  /* Calculate the object's address.  */
+ found:
+#ifdef COOKIE_CHECKING
+  chunk->magic = CHUNK_MAGIC;
+#endif
+  chunk->type = 1;
+  chunk->mark = 0;
+  chunk->typecode = type;
+  result = chunk->u.data;
+
+#ifdef ENABLE_GC_CHECKING
+  /* Keep poisoning-by-writing-0xaf the object, in an attempt to keep the
+     exact same semantics in presence of memory bugs, regardless of
+     ENABLE_VALGRIND_CHECKING.  We override this request below.  Drop the
+     handle to avoid handle leak.  */
+  VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (result, size));
+
+  /* `Poison' the entire allocated object.  */
+  memset (result, 0xaf, size);
+#endif
+
+  /* Tell Valgrind that the memory is there, but its content isn't
+     defined.  The bytes at the end of the object are still marked
+     unaccessible.  */
+  VALGRIND_DISCARD (VALGRIND_MAKE_WRITABLE (result, size));
+
+  /* Keep track of how many bytes are being allocated.  This
+     information is used in deciding when to collect.  */
+  zone->allocated += size + CHUNK_OVERHEAD;
+
+  if (GGC_DEBUG_LEVEL >= 3)
+    fprintf (G.debug_file, "Allocating object, chunk=%p size=%lu at %p\n",
+	     (void *)chunk, (unsigned long) size, result);
+
+  return result;
+}
+
+/* Allocate a SIZE of chunk memory of GTE type, into an approriate zone
+   for that type.  */
+
+void *
+ggc_alloc_typed (enum gt_types_enum gte, size_t size)
+{
+  if (gte == gt_ggc_e_14lang_tree_node)
+    return ggc_alloc_zone_1 (size, tree_zone, gte);
+  else if (gte == gt_ggc_e_7rtx_def)
+    return ggc_alloc_zone_1 (size, rtl_zone, gte);
+  else if (gte == gt_ggc_e_9rtvec_def)
+    return ggc_alloc_zone_1 (size, rtl_zone, gte);
+  else
+    return ggc_alloc_zone_1 (size, &main_zone, gte);
+}
+
+/* Normal ggc_alloc simply allocates into the main zone.  */
+
+void *
+ggc_alloc (size_t size)
+{
+  return ggc_alloc_zone_1 (size, &main_zone, -1);
+}
+
+/* Zone allocation allocates into the specified zone.  */
+
+void *
+ggc_alloc_zone (size_t size, struct alloc_zone *zone)
+{
+  return ggc_alloc_zone_1 (size, zone, -1);
+}
+
+/* If P is not marked, mark it and return false.  Otherwise return true.
+   P must have been allocated by the GC allocator; it mustn't point to
+   static objects, stack variables, or memory allocated with malloc.  */
+
+int
+ggc_set_mark (const void *p)
+{
+  page_entry *entry;
+  struct alloc_chunk *chunk;
+
+#ifdef ENABLE_CHECKING
+  /* Look up the page on which the object is alloced.  If the object
+     wasn't allocated by the collector, we'll probably die.  */
+  entry = lookup_page_table_entry (p);
+  if (entry == NULL)
+    abort ();
+#endif
+  chunk = (struct alloc_chunk *) ((char *)p - CHUNK_OVERHEAD);
+#ifdef COOKIE_CHECKING
+  if (chunk->magic != CHUNK_MAGIC)
+    abort ();
+#endif
+  if (chunk->mark)
+    return 1;
+  chunk->mark = 1;
+
+#ifndef ENABLE_CHECKING
+  entry = lookup_page_table_entry (p);
+#endif
+
+  /* Large pages are either completely full or completely empty. So if
+     they are marked, they are completely full.  */
+  if (entry->large_p)
+    entry->bytes_free = 0;
+  else
+    entry->bytes_free -= chunk->size + CHUNK_OVERHEAD;
+
+  if (GGC_DEBUG_LEVEL >= 4)
+    fprintf (G.debug_file, "Marking %p\n", p);
+
+  return 0;
+}
+
+/* Return 1 if P has been marked, zero otherwise.
+   P must have been allocated by the GC allocator; it mustn't point to
+   static objects, stack variables, or memory allocated with malloc.  */
+
+int
+ggc_marked_p (const void *p)
+{
+  struct alloc_chunk *chunk;
+
+#ifdef ENABLE_CHECKING
+  {
+    page_entry *entry = lookup_page_table_entry (p);
+    if (entry == NULL)
+      abort ();
+  }
+#endif
+
+  chunk = (struct alloc_chunk *) ((char *)p - CHUNK_OVERHEAD);
+#ifdef COOKIE_CHECKING
+  if (chunk->magic != CHUNK_MAGIC)
+    abort ();
+#endif
+  return chunk->mark;
+}
+
+/* Return the size of the gc-able object P.  */
+
+size_t
+ggc_get_size (const void *p)
+{
+  struct alloc_chunk *chunk;
+  struct page_entry *entry;
+
+#ifdef ENABLE_CHECKING
+  entry = lookup_page_table_entry (p);
+  if (entry == NULL)
+    abort ();
+#endif
+
+  chunk = (struct alloc_chunk *) ((char *)p - CHUNK_OVERHEAD);
+#ifdef COOKIE_CHECKING
+  if (chunk->magic != CHUNK_MAGIC)
+    abort ();
+#endif
+  if (chunk->size == LARGE_OBJECT_SIZE)
+    {
+#ifndef ENABLE_CHECKING
+      entry = lookup_page_table_entry (p);
+#endif
+      return entry->bytes;
+    }
+
+  return chunk->size;
+}
+
+/* Initialize the ggc-zone-mmap allocator.  */
+void
+init_ggc ()
+{
+  /* Create the zones.  */
+  main_zone.name = "Main zone";
+  G.zones = &main_zone;
+
+  rtl_zone = xcalloc (1, sizeof (struct alloc_zone));
+  rtl_zone->name = "RTL zone";
+  /* The main zone's connected to the ... rtl_zone */
+  G.zones->next_zone = rtl_zone;
+
+  garbage_zone = xcalloc (1, sizeof (struct alloc_zone));
+  garbage_zone->name = "Garbage zone";
+  /* The rtl zone's connected to the ... garbage zone */
+  rtl_zone->next_zone = garbage_zone;
+
+  tree_zone = xcalloc (1, sizeof (struct alloc_zone));
+  tree_zone->name = "Tree zone";
+  /* The garbage zone's connected to ... the tree zone */
+  garbage_zone->next_zone = tree_zone;
+
+  G.pagesize = getpagesize();
+  G.lg_pagesize = exact_log2 (G.pagesize);
+#ifdef HAVE_MMAP_DEV_ZERO
+  G.dev_zero_fd = open ("/dev/zero", O_RDONLY);
+  if (G.dev_zero_fd == -1)
+    abort ();
+#endif
+
+#if 0
+  G.debug_file = fopen ("ggc-mmap.debug", "w");
+  setlinebuf (G.debug_file);
+#else
+  G.debug_file = stdout;
+#endif
+
+#ifdef USING_MMAP
+  /* StunOS has an amazing off-by-one error for the first mmap allocation
+     after fiddling with RLIMIT_STACK.  The result, as hard as it is to
+     believe, is an unaligned page allocation, which would cause us to
+     hork badly if we tried to use it.  */
+  {
+    char *p = alloc_anon (NULL, G.pagesize, &main_zone);
+    struct page_entry *e;
+    if ((size_t)p & (G.pagesize - 1))
+      {
+	/* How losing.  Discard this one and try another.  If we still
+	   can't get something useful, give up.  */
+
+	p = alloc_anon (NULL, G.pagesize, &main_zone);
+	if ((size_t)p & (G.pagesize - 1))
+	  abort ();
+      }
+
+    /* We have a good page, might as well hold onto it...  */
+    e = (struct page_entry *) xmalloc (sizeof (struct page_entry));
+    e->bytes = G.pagesize;
+    e->page = p;
+    e->next = main_zone.free_pages;
+    main_zone.free_pages = e;
+  }
+#endif
+}
+
+/* Increment the `GC context'.  Objects allocated in an outer context
+   are never freed, eliminating the need to register their roots.  */
+
+void
+ggc_push_context ()
+{
+  struct alloc_zone *zone;
+  for (zone = G.zones; zone; zone = zone->next_zone)
+    ++(zone->context_depth);
+  /* Die on wrap.  */
+  if (main_zone.context_depth >= HOST_BITS_PER_LONG)
+    abort ();
+}
+
+/* Decrement the `GC context'.  All objects allocated since the
+   previous ggc_push_context are migrated to the outer context.  */
+
+static void
+ggc_pop_context_1 (struct alloc_zone *zone)
+{
+  unsigned long omask;
+  unsigned depth;
+  page_entry *p;
+
+  depth = --(zone->context_depth);
+  omask = (unsigned long)1 << (depth + 1);
+
+  if (!((zone->context_depth_allocations | zone->context_depth_collections) & omask))
+    return;
+
+  zone->context_depth_allocations |= (zone->context_depth_allocations & omask) >> 1;
+  zone->context_depth_allocations &= omask - 1;
+  zone->context_depth_collections &= omask - 1;
+
+  /* Any remaining pages in the popped context are lowered to the new
+     current context; i.e. objects allocated in the popped context and
+     left over are imported into the previous context.  */
+    for (p = zone->pages; p != NULL; p = p->next)
+      if (p->context_depth > depth)
+	p->context_depth = depth;
+}
+
+/* Pop all the zone contexts.  */
+
+void
+ggc_pop_context ()
+{
+  struct alloc_zone *zone;
+  for (zone = G.zones; zone; zone = zone->next_zone)
+    ggc_pop_context_1 (zone);
+}
+
+
+/* Poison the chunk.  */
+#ifdef ENABLE_GC_CHECKING
+#define poison_chunk(CHUNK, SIZE) \
+  memset ((CHUNK)->u.data, 0xa5, (SIZE))
+#else
+#define poison_chunk(CHUNK, SIZE)
+#endif
+
+/* Free all empty pages and objects within a page for a given zone  */
+
+static void
+sweep_pages (struct alloc_zone *zone)
+{
+  page_entry **pp, *p, *next;
+  struct alloc_chunk *chunk, *last_free, *end;
+  size_t last_free_size, allocated = 0;
+
+  /* First, reset the free_chunks lists, since we are going to
+     re-free free chunks in hopes of coalescing them into large chunks.  */
+  memset (zone->free_chunks, 0, sizeof (zone->free_chunks));
+  pp = &zone->pages;
+  for (p = zone->pages; p ; p = next)
+    {
+      next = p->next;
+
+      /* For empty pages, just free the page.  */
+      if (p->bytes_free == G.pagesize && p->context_depth == zone->context_depth)
+	{
+	  *pp = next;
+#ifdef ENABLE_GC_CHECKING
+	  /* Poison the page.  */
+	  memset (p->page, 0xb5, p->bytes);
+#endif
+	  free_page (p);
+	  continue;
+	}
+
+      /* Large pages are all or none affairs. Either they are
+	 completely empty, or they are completeley full.
+	 Thus, if the above didn't catch it, we need not do anything
+	 except remove the mark and reset the bytes_free.
+
+	 XXX: Should we bother to increment allocated.  */
+      else if (p->large_p)
+	{
+	  p->bytes_free = p->bytes;
+	  ((struct alloc_chunk *)p->page)->mark = 0;
+	  continue;
+	}
+      pp = &p->next;
+
+      /* This page has now survived another collection.  */
+      p->survived++;
+
+      /* Which leaves full and partial pages.  Step through all chunks,
+	 consolidate those that are free and insert them into the free
+	 lists.  Note that consolidation slows down collection
+	 slightly.  */
+
+      chunk = (struct alloc_chunk *)p->page;
+      end = (struct alloc_chunk *)(p->page + G.pagesize);
+      last_free = NULL;
+      last_free_size = 0;
+
+      do
+	{
+	  prefetch ((struct alloc_chunk *)(chunk->u.data + chunk->size));
+	  if (chunk->mark || p->context_depth < zone->context_depth)
+	    {
+	      if (last_free)
+		{
+		  last_free->type = 0;
+		  last_free->size = last_free_size;
+		  last_free->mark = 0;
+		  poison_chunk (last_free, last_free_size);
+		  free_chunk (last_free, last_free_size, zone);
+		  last_free = NULL;
+		}
+	      if (chunk->mark)
+	        {
+	          allocated += chunk->size + CHUNK_OVERHEAD;
+ 	          p->bytes_free += chunk->size + CHUNK_OVERHEAD;
+		}
+	      chunk->mark = 0;
+#ifdef ENABLE_CHECKING
+	      if (p->bytes_free > p->bytes)
+		abort ();
+#endif
+	    }
+	  else
+	    {
+	      if (last_free)
+	        {
+		  last_free_size += CHUNK_OVERHEAD + chunk->size;
+		}
+	      else
+		{
+		  last_free = chunk;
+		  last_free_size = chunk->size;
+		}
+	    }
+
+	  chunk = (struct alloc_chunk *)(chunk->u.data + chunk->size);
+	}
+      while (chunk < end);
+
+      if (last_free)
+	{
+	  last_free->type = 0;
+	  last_free->size = last_free_size;
+	  last_free->mark = 0;
+	  poison_chunk (last_free, last_free_size);
+	  free_chunk (last_free, last_free_size, zone);
+	}
+    }
+
+  zone->allocated = allocated;
+}
+
+/* mark-and-sweep routine for collecting a single zone.  NEED_MARKING
+   is true if we need to mark before sweeping, false if some other
+   zone collection has already performed marking for us.  Returns true
+   if we collected, false otherwise.  */
+
+static bool
+ggc_collect_1 (struct alloc_zone *zone, bool need_marking)
+{
+  /* Avoid frequent unnecessary work by skipping collection if the
+     total allocations haven't expanded much since the last
+     collection.  */
+  float allocated_last_gc =
+    MAX (zone->allocated_last_gc, (size_t)PARAM_VALUE (GGC_MIN_HEAPSIZE) * 1024);
+
+  float min_expand = allocated_last_gc * PARAM_VALUE (GGC_MIN_EXPAND) / 100;
+
+  if (zone->allocated < allocated_last_gc + min_expand)
+    return false;
+
+  if (!quiet_flag)
+    fprintf (stderr, " {%s GC %luk -> ", zone->name, (unsigned long) zone->allocated / 1024);
+
+  /* Zero the total allocated bytes.  This will be recalculated in the
+     sweep phase.  */
+  zone->allocated = 0;
+
+  /* Release the pages we freed the last time we collected, but didn't
+     reuse in the interim.  */
+  release_pages (zone);
+
+  /* Indicate that we've seen collections at this context depth.  */
+  zone->context_depth_collections
+    = ((unsigned long)1 << (zone->context_depth + 1)) - 1;
+  if (need_marking)
+    ggc_mark_roots ();
+  sweep_pages (zone);
+  zone->was_collected = true;
+  zone->allocated_last_gc = zone->allocated;
+
+
+  if (!quiet_flag)
+    fprintf (stderr, "%luk}", (unsigned long) zone->allocated / 1024);
+  return true;
+}
+
+/* Calculate the average page survival rate in terms of number of
+   collections.  */
+
+static float
+calculate_average_page_survival (struct alloc_zone *zone)
+{
+  float count = 0.0;
+  float survival = 0.0;
+  page_entry *p;
+  for (p = zone->pages; p; p = p->next)
+    {
+      count += 1.0;
+      survival += p->survived;
+    }
+  return survival/count;
+}
+
+/* Check the magic cookies all of the chunks contain, to make sure we
+   aren't doing anything stupid, like stomping on alloc_chunk
+   structures.  */
+
+static inline void
+check_cookies ()
+{
+#ifdef COOKIE_CHECKING
+  page_entry *p;
+  for (zone = G.zones; zone; zone = zone->next_zone)
+    {
+      for (p = zone->pages; p; p = p->next)
+	{
+	  if (!p->large_p)
+	    {
+	      struct alloc_chunk *chunk = (struct alloc_chunk *)p->page;
+	      struct alloc_chunk *end = (struct alloc_chunk *)(p->page + G.pagesize);
+	      do
+		{
+		  if (chunk->magic != CHUNK_MAGIC && chunk->magic != DEADCHUNK_MAGIC)
+		    abort ();
+		  chunk = (struct alloc_chunk *)(chunk->u.data + chunk->size);
+		}
+	      while (chunk < end);
+	    }
+	}
+    }
+#endif
+}
+
+
+/* Top level collection routine.  */
+
+void
+ggc_collect ()
+{
+  struct alloc_zone *zone;
+  bool marked = false;
+  float f;
+
+  timevar_push (TV_GC);
+  check_cookies ();
+  /* Start by possibly collecting the main zone.  */
+  main_zone.was_collected = false;
+  marked |= ggc_collect_1 (&main_zone, true);
+  /* In order to keep the number of collections down, we don't
+     collect other zones unless we are collecting the main zone.  This
+     gives us roughly the same number of collections as we used to
+     have with the old gc.  The number of collection is important
+     because our main slowdown (according to profiling) is now in
+     marking.  So if we mark twice as often as we used to, we'll be
+     twice as slow.  Hopefully we'll avoid this cost when we mark
+     zone-at-a-time.  */
+
+  if (main_zone.was_collected)
+    {
+      check_cookies ();
+      rtl_zone->was_collected = false;
+      marked |= ggc_collect_1 (rtl_zone, !marked);
+      check_cookies ();
+      tree_zone->was_collected = false;
+      marked |= ggc_collect_1 (tree_zone, !marked);
+      check_cookies ();
+      garbage_zone->was_collected = false;
+      marked |= ggc_collect_1 (garbage_zone, !marked);
+    }
+
+  /* Print page survival stats, if someone wants them.  */
+  if (GGC_DEBUG_LEVEL >= 2)
+    {
+      if (rtl_zone->was_collected)
+	{
+	  f = calculate_average_page_survival (rtl_zone);
+	  printf ("Average RTL page survival is %f\n", f);
+	}
+      if (main_zone.was_collected)
+	{
+	  f = calculate_average_page_survival (&main_zone);
+	  printf ("Average main page survival is %f\n", f);
+	}
+      if (tree_zone->was_collected)
+	{
+	  f = calculate_average_page_survival (tree_zone);
+	  printf ("Average tree page survival is %f\n", f);
+	}
+    }
+  /* Since we don't mark zone at a time right now, marking in any
+     zone means marking in every zone. So we have to clear all the
+     marks in all the zones that weren't collected already.  */
+  if (marked)
+    {
+      page_entry *p;
+      for (zone = G.zones; zone; zone = zone->next_zone)
+      {
+	if (zone->was_collected)
+	  continue;
+	for (p = zone->pages; p; p = p->next)
+	  {
+	    if (!p->large_p)
+	      {
+		struct alloc_chunk *chunk = (struct alloc_chunk *)p->page;
+		struct alloc_chunk *end = (struct alloc_chunk *)(p->page + G.pagesize);
+		do
+		  {
+		    prefetch ((struct alloc_chunk *)(chunk->u.data + chunk->size));
+		    if (chunk->mark || p->context_depth < zone->context_depth)
+		      {
+		        if (chunk->mark)
+		 	  p->bytes_free += chunk->size + CHUNK_OVERHEAD;
+#ifdef ENABLE_CHECKING
+			if (p->bytes_free > p->bytes)
+			  abort ();
+#endif
+			chunk->mark = 0;
+		      }
+		    chunk = (struct alloc_chunk *)(chunk->u.data + chunk->size);
+		  }
+		while (chunk < end);
+	      }
+	    else
+	      {
+		p->bytes_free = p->bytes;
+		((struct alloc_chunk *)p->page)->mark = 0;
+	      }
+	  }
+      }
+    }
+  timevar_pop (TV_GC);
+}
+
+/* Print allocation statistics.  */
+
+void
+ggc_print_statistics ()
+{
+}
+
+struct ggc_pch_data
+{
+  struct ggc_pch_ondisk
+  {
+    unsigned total;
+  } d;
+  size_t base;
+  size_t written;
+
+};
+
+/* Initialize the PCH datastructure.  */
+
+struct ggc_pch_data *
+init_ggc_pch (void)
+{
+  return xcalloc (sizeof (struct ggc_pch_data), 1);
+}
+
+/* Add the size of object X to the size of the PCH data.  */
+
+void
+ggc_pch_count_object (struct ggc_pch_data *d, void *x ATTRIBUTE_UNUSED,
+		      size_t size, bool is_string)
+{
+  if (!is_string)
+    {
+      d->d.total += size + CHUNK_OVERHEAD;
+    }
+  else
+    d->d.total += size;
+}
+
+/* Return the total size of the PCH data.  */
+
+size_t
+ggc_pch_total_size (struct ggc_pch_data *d)
+{
+  return d->d.total;
+}
+
+/* Set the base address for the objects in the PCH file.  */
+
+void
+ggc_pch_this_base (struct ggc_pch_data *d, void *base)
+{
+  d->base = (size_t) base;
+}
+
+/* Allocate a place for object X of size SIZE in the PCH file.  */
+
+char *
+ggc_pch_alloc_object (struct ggc_pch_data *d, void *x,
+		      size_t size, bool is_string)
+{
+  char *result;
+  result = (char *)d->base;
+  if (!is_string)
+    {
+      struct alloc_chunk *chunk = (struct alloc_chunk *) ((char *)x - CHUNK_OVERHEAD);
+      if (chunk->size == LARGE_OBJECT_SIZE)
+	d->base += ggc_get_size (x) + CHUNK_OVERHEAD;
+      else
+	d->base += chunk->size + CHUNK_OVERHEAD;
+      return result + CHUNK_OVERHEAD;
+    }
+  else
+    {
+      d->base += size;
+      return result;
+    }
+
+}
+
+/* Prepare to write out the PCH data to file F.  */
+
+void
+ggc_pch_prepare_write (struct ggc_pch_data *d ATTRIBUTE_UNUSED,
+		       FILE *f ATTRIBUTE_UNUSED)
+{
+  /* Nothing to do.  */
+}
+
+/* Write out object X of SIZE to file F.  */
+
+void
+ggc_pch_write_object (struct ggc_pch_data *d ATTRIBUTE_UNUSED,
+		      FILE *f, void *x, void *newx ATTRIBUTE_UNUSED,
+		      size_t size, bool is_string)
+{
+  if (!is_string)
+    {
+      struct alloc_chunk *chunk = (struct alloc_chunk *) ((char *)x - CHUNK_OVERHEAD);
+      size = chunk->size;
+      if (fwrite (chunk, size + CHUNK_OVERHEAD, 1, f) != 1)
+	fatal_error ("can't write PCH file: %m");
+      d->written += size + CHUNK_OVERHEAD;
+    }
+   else
+     {
+       if (fwrite (x, size, 1, f) != 1)
+	 fatal_error ("can't write PCH file: %m");
+       d->written += size;
+     }
+  if (d->written == d->d.total
+      && fseek (f, ROUND_UP_VALUE (d->d.total, G.pagesize), SEEK_CUR) != 0)
+    fatal_error ("can't write PCH file: %m");
+}
+
+void
+ggc_pch_finish (struct ggc_pch_data *d, FILE *f)
+{
+  if (fwrite (&d->d, sizeof (d->d), 1, f) != 1)
+    fatal_error ("can't write PCH file: %m");
+  free (d);
+}
+
+
+void
+ggc_pch_read (FILE *f, void *addr)
+{
+  struct ggc_pch_ondisk d;
+  struct page_entry *entry;
+  char *pte;
+  if (fread (&d, sizeof (d), 1, f) != 1)
+    fatal_error ("can't read PCH file: %m");
+  entry = xcalloc (1, sizeof (struct page_entry));
+  entry->bytes = d.total;
+  entry->page = addr;
+  entry->context_depth = 0;
+  entry->zone = &main_zone;
+  for (pte = entry->page;
+       pte < entry->page + entry->bytes;
+       pte += G.pagesize)
+    set_page_table_entry (pte, entry);
+
+}
diff --git a/gcc/ggc.h b/gcc/ggc.h
index 153b29ebd36..4f25f7373c2 100644
--- a/gcc/ggc.h
+++ b/gcc/ggc.h
@@ -159,8 +159,9 @@ extern struct ggc_pch_data *init_ggc_pch (void);
 
 /* The second parameter and third parameters give the address and size
    of an object.  Update the ggc_pch_data structure with as much of
-   that information as is necessary.  */
-extern void ggc_pch_count_object (struct ggc_pch_data *, void *, size_t);
+   that information as is necessary. The last argument should be true
+   if the object is a string.  */
+extern void ggc_pch_count_object (struct ggc_pch_data *, void *, size_t, bool);
 
 /* Return the total size of the data to be written to hold all
    the objects previously passed to ggc_pch_count_object.  */
@@ -171,14 +172,16 @@ extern size_t ggc_pch_total_size (struct ggc_pch_data *);
 extern void ggc_pch_this_base (struct ggc_pch_data *, void *);
 
 /* Assuming that the objects really do end up at the address
-   passed to ggc_pch_this_base, return the address of this object.  */
-extern char *ggc_pch_alloc_object (struct ggc_pch_data *, void *, size_t);
+   passed to ggc_pch_this_base, return the address of this object.
+   The last argument should be true if the object is a string.  */
+extern char *ggc_pch_alloc_object (struct ggc_pch_data *, void *, size_t, bool);
 
 /* Write out any initial information required.  */
 extern void ggc_pch_prepare_write (struct ggc_pch_data *, FILE *);
-/* Write out this object, including any padding.  */
+/* Write out this object, including any padding.  The last argument should be
+   true if the object is a string.  */
 extern void ggc_pch_write_object (struct ggc_pch_data *, FILE *, void *,
-				  void *, size_t);
+				  void *, size_t, bool);
 /* All objects have been written, write out any final information
    required.  */
 extern void ggc_pch_finish (struct ggc_pch_data *, FILE *);
@@ -190,22 +193,38 @@ extern void ggc_pch_read (FILE *, void *);
 
 /* Allocation.  */
 
+/* Zone structure.  */
+struct alloc_zone;
+/* For single pass garbage.  */
+extern struct alloc_zone *garbage_zone;
+/* For regular rtl allocations.  */
+extern struct alloc_zone *rtl_zone;
+/* For regular tree allocations.  */
+extern struct alloc_zone *tree_zone;
+
 /* The internal primitive.  */
 extern void *ggc_alloc (size_t);
+/* Allocate an object into the specified allocation zone.  */
+extern void *ggc_alloc_zone (size_t, struct alloc_zone *);
+/* Allocate an object of the specified type and size. */
+extern void *ggc_alloc_typed (enum gt_types_enum, size_t);
 /* Like ggc_alloc, but allocates cleared memory.  */
 extern void *ggc_alloc_cleared (size_t);
+/* Like ggc_alloc_zone, but allocates cleared memory.  */
+extern void *ggc_alloc_cleared_zone (size_t, struct alloc_zone *);
 /* Resize a block.  */
 extern void *ggc_realloc (void *, size_t);
 /* Like ggc_alloc_cleared, but performs a multiplication.  */
 extern void *ggc_calloc (size_t, size_t);
 
-#define ggc_alloc_rtx(CODE) ((rtx) ggc_alloc (RTX_SIZE (CODE)))
+#define ggc_alloc_rtx(CODE)                    \
+  ((rtx) ggc_alloc_typed (gt_ggc_e_7rtx_def, RTX_SIZE (CODE)))
 
 #define ggc_alloc_rtvec(NELT)						  \
-  ((rtvec) ggc_alloc (sizeof (struct rtvec_def)				  \
+  ((rtvec) ggc_alloc_typed (gt_ggc_e_9rtvec_def, sizeof (struct rtvec_def) \
 		      + ((NELT) - 1) * sizeof (rtx)))
 
-#define ggc_alloc_tree(LENGTH) ((tree) ggc_alloc (LENGTH))
+#define ggc_alloc_tree(LENGTH) ((tree) ggc_alloc_zone (LENGTH, tree_zone))
 
 #define htab_create_ggc(SIZE, HASH, EQ, DEL) \
   htab_create_alloc (SIZE, HASH, EQ, DEL, ggc_calloc, NULL)