Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / ggc.h

diff --git a/gcc/ggc.h b/gcc/ggc.h
index 2c56a3c..704237c 100644 (file)
--- a/gcc/ggc.h
+++ b/gcc/ggc.h
@@ -1,12 +1,13 @@
 /* Garbage collection for the GNU compiler.
 /* Garbage collection for the GNU compiler.

-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+   2008, 2009, 2010, 2011 Free Software Foundation, Inc.

 
 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
 
 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
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,20 +16,21 @@ 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
 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.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#ifndef GCC_GGC_H
+#define GCC_GGC_H
+#include "statistics.h"

 
 /* Symbols are marked with `ggc' for `gcc gc' so as not to interfere with
    an external gc library that might be linked in.  */
 
 /* Constants for general use.  */
 extern const char empty_string[];      /* empty string */
 
 /* Symbols are marked with `ggc' for `gcc gc' so as not to interfere with
    an external gc library that might be linked in.  */
 
 /* Constants for general use.  */
 extern const char empty_string[];      /* empty string */

-extern const char digit_vector[];      /* "0" .. "9" */
-#define digit_string(d) (digit_vector + ((d) * 2))

 
 /* Internal functions and data structures used by the GTY
 
 /* Internal functions and data structures used by the GTY

-   machinery.  */
+   machinery, including the generated gt*.[hc] files.  */

 
 /* The first parameter is a pointer to a pointer, the second a cookie.  */
 typedef void (*gt_pointer_operator) (void *, void *);
 
 /* The first parameter is a pointer to a pointer, the second a cookie.  */
 typedef void (*gt_pointer_operator) (void *, void *);


@@ -50,7 +52,8 @@ typedef void (*gt_handle_reorder) (void *, void *, gt_pointer_operator,
                                   void *);
 
 /* Used by the gt_pch_n_* routines.  Register an object in the hash table.  */
                                   void *);
 
 /* Used by the gt_pch_n_* routines.  Register an object in the hash table.  */

-extern int gt_pch_note_object (void *, void *, gt_note_pointers);
+extern int gt_pch_note_object (void *, void *, gt_note_pointers,
+                              enum gt_types_enum);

 
 /* Used by the gt_pch_n_* routines.  Register that an object has a reorder
    function.  */
 
 /* Used by the gt_pch_n_* routines.  Register that an object has a reorder
    function.  */


@@ -60,7 +63,7 @@ extern void gt_pch_note_reorder (void *, void *, gt_handle_reorder);
 typedef void (*gt_pointer_walker) (void *);
 
 /* Structures for the easy way to mark roots.
 typedef void (*gt_pointer_walker) (void *);
 
 /* Structures for the easy way to mark roots.

-   In an array, terminated by having base == NULL.*/
+   In an array, terminated by having base == NULL.  */

 struct ggc_root_tab {
   void *base;
   size_t nelt;
 struct ggc_root_tab {
   void *base;
   size_t nelt;


@@ -113,149 +116,244 @@ extern int ggc_set_mark (const void *);
    static objects, stack variables, or memory allocated with malloc.  */
 extern int ggc_marked_p        (const void *);
 
    static objects, stack variables, or memory allocated with malloc.  */
 extern int ggc_marked_p        (const void *);
 

-/* Mark the entries in the string pool.  */
-extern void ggc_mark_stringpool        (void);
+/* PCH and GGC handling for strings, mostly trivial.  */
+extern void gt_pch_n_S (const void *);
+extern void gt_ggc_m_S (const void *);

 
 

-/* Call ggc_set_mark on all the roots.  */
+/* End of GTY machinery API.  */

 
 

-extern void ggc_mark_roots (void);
+struct alloc_zone;

 
 

-/* Save and restore the string pool entries for PCH.  */
+/* Initialize the string pool.  */
+extern void init_stringpool (void);

 
 

-extern void gt_pch_save_stringpool (void);
-extern void gt_pch_fixup_stringpool (void);
-extern void gt_pch_restore_stringpool (void);
+/* Initialize the garbage collector.  */
+extern void init_ggc (void);

 
 

-/* PCH and GGC handling for strings, mostly trivial.  */
+/* When true, identifier nodes are considered as GC roots.  When
+   false, identifier nodes are treated like any other GC-allocated
+   object, and the identifier hash table is treated as a weak
+   hash.  */
+extern bool ggc_protect_identifiers;

 
 

-extern void gt_pch_p_S (void *, void *, gt_pointer_operator, void *);
-extern void gt_pch_n_S (const void *);
-extern void gt_ggc_m_S (void *);
+/* Write out all GCed objects to F.  */
+extern void gt_pch_save (FILE *f);

 
 

-/* Initialize the string pool.  */
-extern void init_stringpool (void);
+\f
+/* Allocation.  */

 
 

-/* A GC implementation must provide these functions.  They are internal
-   to the GC system.  */
+/* The internal primitive.  */
+extern void *ggc_internal_alloc_stat (size_t MEM_STAT_DECL);

 
 

-/* Initialize the garbage collector.  */
-extern void init_ggc (void);
+extern size_t ggc_round_alloc_size (size_t requested_size);

 
 

-/* Start a new GGC context.  Memory allocated in previous contexts
-   will not be collected while the new context is active.  */
-extern void ggc_push_context (void);
+#define ggc_internal_alloc(s) ggc_internal_alloc_stat (s MEM_STAT_INFO)

 
 

-/* Finish a GC context.  Any uncollected memory in the new context
-   will be merged with the old context.  */
-extern void ggc_pop_context (void);
+/* Allocate an object of the specified type and size.  */
+extern void *ggc_alloc_typed_stat (enum gt_types_enum, size_t MEM_STAT_DECL);

 
 

-struct ggc_pch_data;
+#define ggc_alloc_typed(s, z) ggc_alloc_typed_stat (s, z MEM_STAT_INFO)

 
 

-/* Return a new ggc_pch_data structure.  */
-extern struct ggc_pch_data *init_ggc_pch (void);
+/* Allocates cleared memory.  */
+extern void *ggc_internal_cleared_alloc_stat (size_t MEM_STAT_DECL);

 
 

-/* 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);
+/* Resize a block.  */
+extern void *ggc_realloc_stat (void *, size_t MEM_STAT_DECL);

 
 

-/* Return the total size of the data to be written to hold all
-   the objects previously passed to ggc_pch_count_object.  */
-extern size_t ggc_pch_total_size (struct ggc_pch_data *);
+/* Free a block.  To be used when known for certain it's not reachable.  */
+extern void ggc_free (void *);

 
 

-/* The objects, when read, will most likely be at the address
-   in the second parameter.  */
-extern void ggc_pch_this_base (struct ggc_pch_data *, void *);
+extern void ggc_record_overhead (size_t, size_t, void * MEM_STAT_DECL);
+extern void ggc_free_overhead (void *);
+extern void ggc_prune_overhead_list (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);
+extern void dump_ggc_loc_statistics (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.  */
-extern void ggc_pch_write_object (struct ggc_pch_data *, FILE *, void *,
-                                 void *, size_t);
-/* All objects have been written, write out any final information
-   required.  */
-extern void ggc_pch_finish (struct ggc_pch_data *, FILE *);
+/* Reallocators.  */
+#define GGC_RESIZEVEC(T, P, N) \
+    ((T *) ggc_realloc_stat ((P), (N) * sizeof (T) MEM_STAT_INFO))

 
 

-/* A PCH file has just been read in at the address specified second
-   parameter.  Set up the GC implementation for the new objects.  */
-extern void ggc_pch_read (FILE *, void *);
+#define GGC_RESIZEVAR(T, P, N)                          \
+    ((T *) ggc_realloc_stat ((P), (N) MEM_STAT_INFO))

 
 

-\f
-/* Allocation.  */
+static inline void *
+ggc_internal_vec_alloc_stat (size_t s, size_t c MEM_STAT_DECL)
+{
+    return ggc_internal_alloc_stat (c * s PASS_MEM_STAT);
+}

 
 

-/* The internal primitive.  */
-extern void *ggc_alloc (size_t);
-/* Like ggc_alloc, but allocates cleared memory.  */
-extern void *ggc_alloc_cleared (size_t);
-/* 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);
+static inline void *
+ggc_internal_cleared_vec_alloc_stat (size_t s, size_t c MEM_STAT_DECL)
+{
+    return ggc_internal_cleared_alloc_stat (c * s PASS_MEM_STAT);
+}
+
+#define ggc_internal_cleared_vec_alloc(s, c) \
+    (ggc_internal_cleared_vec_alloc_stat ((s), (c) MEM_STAT_INFO))

 
 

-#define ggc_alloc_rtx(NSLOTS)                                            \
-  ((rtx) ggc_alloc (sizeof (struct rtx_def)                              \
-                   + ((NSLOTS) - 1) * sizeof (rtunion)))
+static inline void *
+ggc_alloc_atomic_stat (size_t s MEM_STAT_DECL)
+{
+    return ggc_internal_alloc_stat (s PASS_MEM_STAT);
+}
+
+#define ggc_alloc_atomic(S)  (ggc_alloc_atomic_stat ((S) MEM_STAT_INFO))
+
+#define ggc_alloc_cleared_atomic(S)             \
+    (ggc_internal_cleared_alloc_stat ((S) MEM_STAT_INFO))

 
 

-#define ggc_alloc_rtvec(NELT)                                            \
-  ((rtvec) ggc_alloc (sizeof (struct rtvec_def)                                  \
-                     + ((NELT) - 1) * sizeof (rtx)))
+extern void * ggc_cleared_alloc_htab_ignore_args (size_t, size_t);

 
 

-#define ggc_alloc_tree(LENGTH) ((tree) ggc_alloc (LENGTH))
+extern void * ggc_cleared_alloc_ptr_array_two_args (size_t, size_t);

 
 #define htab_create_ggc(SIZE, HASH, EQ, DEL) \
 
 #define htab_create_ggc(SIZE, HASH, EQ, DEL) \

-  htab_create_alloc (SIZE, HASH, EQ, DEL, ggc_calloc, NULL)
+  htab_create_typed_alloc (SIZE, HASH, EQ, DEL,        \
+                          ggc_cleared_alloc_htab_ignore_args,          \
+                          ggc_cleared_alloc_ptr_array_two_args,        \
+                          ggc_free)
+
+#define splay_tree_new_ggc(COMPARE, ALLOC_TREE, ALLOC_NODE)                 \
+  splay_tree_new_typed_alloc (COMPARE, NULL, NULL, &ALLOC_TREE, &ALLOC_NODE, \
+                             &ggc_splay_dont_free, NULL)
+
+extern void *ggc_splay_alloc (enum gt_types_enum, int, void *);

 
 

-#define splay_tree_new_ggc(COMPARE)                                     \
-  splay_tree_new_with_allocator (COMPARE, NULL, NULL,                   \
-                                 &ggc_splay_alloc, &ggc_splay_dont_free, \
-                                NULL)
-extern void *ggc_splay_alloc (int, void *);

 extern void ggc_splay_dont_free (void *, void *);
 
 /* Allocate a gc-able string, and fill it with LENGTH bytes from CONTENTS.
    If LENGTH is -1, then CONTENTS is assumed to be a
    null-terminated string and the memory sized accordingly.  */
 extern void ggc_splay_dont_free (void *, void *);
 
 /* Allocate a gc-able string, and fill it with LENGTH bytes from CONTENTS.
    If LENGTH is -1, then CONTENTS is assumed to be a
    null-terminated string and the memory sized accordingly.  */

-extern const char *ggc_alloc_string (const char *contents, int length);
+extern const char *ggc_alloc_string_stat (const char *contents, int length
+                                          MEM_STAT_DECL);
+
+#define ggc_alloc_string(c, l) ggc_alloc_string_stat (c, l MEM_STAT_INFO)

 
 /* Make a copy of S, in GC-able memory.  */
 
 /* Make a copy of S, in GC-able memory.  */

-#define ggc_strdup(S) ggc_alloc_string((S), -1)
+#define ggc_strdup(S) ggc_alloc_string_stat ((S), -1 MEM_STAT_INFO)

 
 /* Invoke the collector.  Garbage collection occurs only when this
    function is called, not during allocations.  */
 extern void ggc_collect        (void);
 
 
 /* Invoke the collector.  Garbage collection occurs only when this
    function is called, not during allocations.  */
 extern void ggc_collect        (void);
 

-/* Return the number of bytes allocated at the indicated address.  */
-extern size_t ggc_get_size (const void *);
+/* Register an additional root table.  This can be useful for some
+   plugins.  Does nothing if the passed pointer is NULL. */
+extern void ggc_register_root_tab (const struct ggc_root_tab *);

 
 

-/* Write out all GCed objects to F.  */
-extern void gt_pch_save (FILE *f);
+/* Register an additional cache table.  This can be useful for some
+   plugins.  Does nothing if the passed pointer is NULL. */
+extern void ggc_register_cache_tab (const struct ggc_cache_tab *);

 
 /* Read objects previously saved with gt_pch_save from F.  */
 extern void gt_pch_restore (FILE *f);
 \f
 /* Statistics.  */
 
 
 /* Read objects previously saved with gt_pch_save from F.  */
 extern void gt_pch_restore (FILE *f);
 \f
 /* Statistics.  */
 

-/* This structure contains the statistics common to all collectors.
-   Particular collectors can extend this structure.  */
-typedef struct ggc_statistics
-{
-  /* At present, we don't really gather any interesting statistics.  */
-  int unused;
-} ggc_statistics;
-
-/* Used by the various collectors to gather and print statistics that
-   do not depend on the collector in use.  */
-extern void ggc_print_common_statistics (FILE *, ggc_statistics *);
-

 /* Print allocation statistics.  */
 extern void ggc_print_statistics (void);
 /* Print allocation statistics.  */
 extern void ggc_print_statistics (void);

+

 extern void stringpool_statistics (void);
 
 /* Heuristics.  */
 extern void stringpool_statistics (void);
 
 /* Heuristics.  */

-extern int ggc_min_expand_heuristic (void);
-extern int ggc_min_heapsize_heuristic (void);

 extern void init_ggc_heuristics (void);
 extern void init_ggc_heuristics (void);

+
+/* Zone collection.  */
+
+/* For regular rtl allocations.  */
+extern struct alloc_zone rtl_zone;
+
+/* For regular tree allocations.  */
+extern struct alloc_zone tree_zone;
+
+/* For IDENTIFIER_NODE allocations.  */
+extern struct alloc_zone tree_id_zone;
+
+#define ggc_alloc_rtvec_sized(NELT)                                     \
+  ggc_alloc_zone_rtvec_def (sizeof (struct rtvec_def)                  \
+                           + ((NELT) - 1) * sizeof (rtx),              \
+                           &rtl_zone)
+
+#if defined (GGC_ZONE) && !defined (GENERATOR_FILE)
+
+/* Allocate an object into the specified allocation zone.  */
+extern void *ggc_internal_alloc_zone_stat (size_t,
+                                         struct alloc_zone * MEM_STAT_DECL);
+
+extern void *ggc_internal_cleared_alloc_zone_stat (size_t,
+                                         struct alloc_zone * MEM_STAT_DECL);
+
+static inline void *
+ggc_internal_zone_alloc_stat (struct alloc_zone * z, size_t s MEM_STAT_DECL)
+{
+    return ggc_internal_alloc_zone_stat (s, z PASS_MEM_STAT);
+}
+
+static inline void *
+ggc_internal_zone_cleared_alloc_stat (struct alloc_zone * z, size_t s
+                                      MEM_STAT_DECL)
+{
+    return ggc_internal_cleared_alloc_zone_stat (s, z PASS_MEM_STAT);
+}
+
+static inline void *
+ggc_internal_zone_vec_alloc_stat (struct alloc_zone * z, size_t s, size_t n
+                                  MEM_STAT_DECL)
+{
+    return ggc_internal_alloc_zone_stat (s * n, z PASS_MEM_STAT);
+}
+
+
+#else
+
+static inline void *
+ggc_internal_zone_alloc_stat (struct alloc_zone * z ATTRIBUTE_UNUSED,
+                              size_t s MEM_STAT_DECL)
+{
+    return ggc_internal_alloc_stat (s PASS_MEM_STAT);
+}
+
+static inline void *
+ggc_internal_zone_cleared_alloc_stat (struct alloc_zone * z ATTRIBUTE_UNUSED,
+                                      size_t s MEM_STAT_DECL)
+{
+    return ggc_internal_cleared_alloc_stat (s PASS_MEM_STAT);
+}
+
+static inline void *
+ggc_internal_zone_vec_alloc_stat (struct alloc_zone * z ATTRIBUTE_UNUSED,
+                                  size_t s, size_t n MEM_STAT_DECL)
+{
+    return ggc_internal_vec_alloc_stat (s, n PASS_MEM_STAT);
+}
+
+#endif
+
+/* Memory statistics passing versions of some allocators.  Too few of them to
+   make gengtype produce them, so just define the needed ones here.  */
+static inline struct rtx_def *
+ggc_alloc_zone_rtx_def_stat (struct alloc_zone * z, size_t s MEM_STAT_DECL)
+{
+  return (struct rtx_def *) ggc_internal_zone_alloc_stat (z, s PASS_MEM_STAT);
+}
+
+static inline union tree_node *
+ggc_alloc_zone_tree_node_stat (struct alloc_zone * z, size_t s MEM_STAT_DECL)
+{
+  return (union tree_node *) ggc_internal_zone_alloc_stat (z, s PASS_MEM_STAT);
+}
+
+static inline union tree_node *
+ggc_alloc_zone_cleared_tree_node_stat (struct alloc_zone * z, size_t s
+                                       MEM_STAT_DECL)
+{
+  return (union tree_node *)
+    ggc_internal_zone_cleared_alloc_stat (z, s PASS_MEM_STAT);
+}
+
+static inline union gimple_statement_d *
+ggc_alloc_cleared_gimple_statement_d_stat (size_t s MEM_STAT_DECL)
+{
+  return (union gimple_statement_d *)
+    ggc_internal_cleared_alloc_stat (s PASS_MEM_STAT);
+}
+
+#endif