/* Virtual array support.
- Copyright (C) 1998 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
- This file is part of GNU CC.
+ This file is part of GCC.
- GNU CC is free software; you can redistribute it and/or modify it
+ 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.
- GNU CC 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.
+ 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 GNU CC; see the file COPYING. If not, write to the Free
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with GCC; see the file COPYING. If not, write to the Free
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+ MA 02111-1307, USA. */
#include "config.h"
+#include "errors.h"
#include "system.h"
-#include "rtl.h"
-#include "tree.h"
-#include "bitmap.h"
+#include "coretypes.h"
+#include "tm.h"
#include "varray.h"
+#include "ggc.h"
#define VARRAY_HDR_SIZE (sizeof (struct varray_head_tag) - sizeof (varray_data))
+/* Do not add any more non-GC items here. Please either remove or GC those items that
+ are not GCed. */
+
+static const struct {
+ unsigned char size;
+ bool uses_ggc;
+} element[NUM_VARRAY_DATA] = {
+ { sizeof (char), 1 },
+ { sizeof (unsigned char), 1 },
+ { sizeof (short), 1 },
+ { sizeof (unsigned short), 1 },
+ { sizeof (int), 1 },
+ { sizeof (unsigned int), 1 },
+ { sizeof (long), 1 },
+ { sizeof (unsigned long), 1 },
+ { sizeof (HOST_WIDE_INT), 1 },
+ { sizeof (unsigned HOST_WIDE_INT), 1 },
+ { sizeof (PTR), 1 },
+ { sizeof (char *), 1 },
+ { sizeof (struct rtx_def *), 1 },
+ { sizeof (struct rtvec_def *), 1 },
+ { sizeof (union tree_node *), 1 },
+ { sizeof (struct bitmap_head_def *), 1 },
+ { sizeof (struct reg_info_def *), 0 },
+ { sizeof (struct const_equiv_data), 0 },
+ { sizeof (struct basic_block_def *), 0 },
+ { sizeof (struct elt_list *), 1 },
+};
+
/* Allocate a virtual array with NUM_ELEMENT elements, each of which is
ELEMENT_SIZE bytes long, named NAME. Array elements are zeroed. */
varray_type
-varray_init (num_elements, element_size, name)
+varray_init (num_elements, element_kind, name)
size_t num_elements;
- size_t element_size;
+ enum varray_data_enum element_kind;
const char *name;
{
- size_t data_size = num_elements * element_size;
- varray_type ptr = (varray_type) xcalloc (VARRAY_HDR_SIZE + data_size, 1);
+ size_t data_size = num_elements * element[element_kind].size;
+ varray_type ptr;
+ if (element[element_kind].uses_ggc)
+ ptr = (varray_type) ggc_alloc_cleared (VARRAY_HDR_SIZE + data_size);
+ else
+ ptr = (varray_type) xcalloc (VARRAY_HDR_SIZE + data_size, 1);
ptr->num_elements = num_elements;
ptr->elements_used = 0;
- ptr->element_size = element_size;
+ ptr->type = element_kind;
ptr->name = name;
return ptr;
}
if (n != old_elements)
{
- size_t element_size = va->element_size;
- size_t old_data_size = old_elements * element_size;
- size_t data_size = n * element_size;
-
- va = (varray_type) xrealloc ((char *)va, VARRAY_HDR_SIZE + data_size);
+ size_t elem_size = element[va->type].size;
+ size_t old_data_size = old_elements * elem_size;
+ size_t data_size = n * elem_size;
+
+ if (element[va->type].uses_ggc)
+ va = (varray_type) ggc_realloc (va, VARRAY_HDR_SIZE + data_size);
+ else
+ va = (varray_type) xrealloc ((char *) va, VARRAY_HDR_SIZE + data_size);
va->num_elements = n;
if (n > old_elements)
- bzero (&va->data.c[old_data_size], data_size - old_data_size);
+ memset (&va->data.c[old_data_size], 0, data_size - old_data_size);
}
return va;
}
+/* Reset a varray to its original state. */
+void
+varray_clear (va)
+ varray_type va;
+{
+ size_t data_size = element[va->type].size * va->num_elements;
+
+ memset (va->data.c, 0, data_size);
+ va->elements_used = 0;
+}
+
/* Check the bounds of a varray access. */
#if defined ENABLE_CHECKING && (GCC_VERSION >= 2007)
-extern void error PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1;
+extern void error PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1;
void
varray_check_failed (va, n, file, line, function)
int line;
const char *function;
{
- error("Virtual array %s[%lu]: element %lu out of bounds",
- va->name, (unsigned long) va->num_elements, (unsigned long) n);
- fancy_abort (file, line, function);
+ internal_error ("virtual array %s[%lu]: element %lu out of bounds in %s, at %s:%d",
+ va->name, (unsigned long) va->num_elements, (unsigned long) n,
+ function, trim_filename (file), line);
}
#endif
OSDN Git Service
