From 987009bf0d31f2aa399cbf58ddf91a90b09848ca Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 26 Aug 1999 05:18:44 +0000 Subject: system.h: Don't redefine abort or trim_filename. 1999-08-25 22:10 -0700 Zack Weinberg * system.h: Don't redefine abort or trim_filename. * rtl.h: Define abort to fancy_abort (__FILE__, __LINE__, 0) or fancy_abort (__FILE__, __LINE__, __FUNCTION__) depending on whether or not __FUNCTION__ is available. * tree.h: Duplicate rtl.h's definition of abort, for files that don't include rtl.h. Delete all code to perform type checking with a compiler other than GCC. * varray.h: Delete all code to perform type checking with a compiler other than GCC. Make VARRAY_CHECK() always evaluate its arguments exactly once, using a statement expression. Adjust the VARRAY_ accessor macros to match. * toplev.h (fatal_insn, fatal_insn_not_found): Kill. (_fatal_insn, _fatal_insn_not_found): New fns, take info on caller's location. Define fatal_insn and fatal_insn_not_found as macros that use _fatal_insn and _fatal_insn_not_found. (fancy_abort, trim_filename): Kill prototypes. * rtl.c (trim_filename): Move here from toplev.c. (fancy_abort): New function. (DIR_SEPARATOR): Provide default definition. * tree.c (tree_check_failed, tree_class_check_failed): Go through fancy_abort. (tree_check, tree_class_check, cst_or_constructor_check, expr_check): Delete. * varray.c (varray_check_failed): New function. * toplev.c (fatal_insn, fatal_insn_not_found): Replace with _fatal_insn and _fatal_insn_not_found. Go through fancy_abort. (trim_filename, fancy_abort): Delete. * builtins.c (expand_builtin_args_info): Report ICE with abort. * except.c (start_catch_handler): Report ICE with error/abort combo. * final.c (output_operand_lossage): Likewise. * flow.c (verify_flow_info): Likewise. * gcc.c: Prototype fatal. * gengenrtl.c: Undef abort after including rtl.h not system.h. * genattr.c, genattrtab.c, genemit.c, genextract.c, genflags.c, genopinit.c, genoutput.c, genpeep.c, genrecog.c: Don't define fancy_abort. From-SVN: r28889 --- gcc/varray.h | 63 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) (limited to 'gcc/varray.h') diff --git a/gcc/varray.h b/gcc/varray.h index 7d4f697..5d773a3 100644 --- a/gcc/varray.h +++ b/gcc/varray.h @@ -162,38 +162,41 @@ extern varray_type varray_grow PROTO((varray_type, size_t)); #define VARRAY_SIZE(VA) ((VA)->num_elements) -/* Check for VARRAY_xxx macros being in bound, return N for use as an - index. */ -#ifdef ENABLE_CHECKING -#define VARRAY_CHECK(VA, N) \ -((((size_t)(N) < (VA)->num_elements) \ - ? 0 \ - : (fatal ("Virtual array %s element %ld out of bounds, at %s:%d", \ - (VA)->name, (long)(N), __FILE__, __LINE__), 0)), \ - (N)) +/* Check for VARRAY_xxx macros being in bound. */ +#if defined ENABLE_CHECKING && (__GNUC__ > 2 || __GNUC_MINOR__ > 6) +extern void varray_check_failed PROTO ((varray_type, size_t, + const char *, int, + const char *)) ATTRIBUTE_NORETURN; +#define VARRAY_CHECK(VA, N, T) \ +(*({ varray_type _va = VA; \ + size_t _n = N; \ + if (_n >= _va->num_elements) \ + varray_check_failed (_va, _n, __FILE__, __LINE__, \ + __PRETTY_FUNCTION__); \ + &_va->data.T[_n]; })) #else -#define VARRAY_CHECK(VA, N) (N) +#define VARRAY_CHECK(VA, N, T) ((VA)->data.T[N]) #endif -#define VARRAY_CHAR(VA, N) ((VA)->data.c[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_UCHAR(VA, N) ((VA)->data.uc[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_SHORT(VA, N) ((VA)->data.s[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_USHORT(VA, N) ((VA)->data.us[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_INT(VA, N) ((VA)->data.i[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_UINT(VA, N) ((VA)->data.u[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_LONG(VA, N) ((VA)->data.l[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_ULONG(VA, N) ((VA)->data.ul[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_WIDE_INT(VA, N) ((VA)->data.hint[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_UWIDE_INT(VA, N) ((VA)->data.uhint[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_GENERIC_PTR(VA,N) ((VA)->data.generic[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_CHAR_PTR(VA,N) ((VA)->data.cptr[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_RTX(VA, N) ((VA)->data.rtx[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_RTVEC(VA, N) ((VA)->data.rtvec[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_TREE(VA, N) ((VA)->data.tree[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_BITMAP(VA, N) ((VA)->data.bitmap[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_SCHED(VA, N) ((VA)->data.sched[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_REG(VA, N) ((VA)->data.reg[ VARRAY_CHECK (VA, N) ]) -#define VARRAY_CONST_EQUIV(VA, N) ((VA)->data.const_equiv[VARRAY_CHECK (VA, N)]) -#define VARRAY_BB(VA, N) ((VA)->data.bb[ VARRAY_CHECK (VA, N) ]) +#define VARRAY_CHAR(VA, N) VARRAY_CHECK (VA, N, c) +#define VARRAY_UCHAR(VA, N) VARRAY_CHECK (VA, N, uc) +#define VARRAY_SHORT(VA, N) VARRAY_CHECK (VA, N, s) +#define VARRAY_USHORT(VA, N) VARRAY_CHECK (VA, N, us) +#define VARRAY_INT(VA, N) VARRAY_CHECK (VA, N, i) +#define VARRAY_UINT(VA, N) VARRAY_CHECK (VA, N, u) +#define VARRAY_LONG(VA, N) VARRAY_CHECK (VA, N, l) +#define VARRAY_ULONG(VA, N) VARRAY_CHECK (VA, N, ul) +#define VARRAY_WIDE_INT(VA, N) VARRAY_CHECK (VA, N, hint) +#define VARRAY_UWIDE_INT(VA, N) VARRAY_CHECK (VA, N, uhint) +#define VARRAY_GENERIC_PTR(VA,N) VARRAY_CHECK (VA, N, generic) +#define VARRAY_CHAR_PTR(VA,N) VARRAY_CHECK (VA, N, cptr) +#define VARRAY_RTX(VA, N) VARRAY_CHECK (VA, N, rtx) +#define VARRAY_RTVEC(VA, N) VARRAY_CHECK (VA, N, rtvec) +#define VARRAY_TREE(VA, N) VARRAY_CHECK (VA, N, tree) +#define VARRAY_BITMAP(VA, N) VARRAY_CHECK (VA, N, bitmap) +#define VARRAY_SCHED(VA, N) VARRAY_CHECK (VA, N, sched) +#define VARRAY_REG(VA, N) VARRAY_CHECK (VA, N, reg) +#define VARRAY_CONST_EQUIV(VA, N) VARRAY_CHECK (VA, N, const_equiv) +#define VARRAY_BB(VA, N) VARRAY_CHECK (VA, N, bb) #endif /* _VARRAY_H_ */ -- cgit v1.1