diff options
author | Nathan Sidwell <nathan@codesourcery.com> | 2005-04-01 14:08:01 +0000 |
---|---|---|
committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2005-04-01 14:08:01 +0000 |
commit | cccd217d2bb66bb1a4386615a27105a2021ea53f (patch) | |
tree | 182cf8fa5a93fc8486b3e28c2de7702967ed9a7f /gcc | |
parent | 3cf1107531370bc19dff50f66e151fc1aaafde9a (diff) | |
download | gcc-cccd217d2bb66bb1a4386615a27105a2021ea53f.zip gcc-cccd217d2bb66bb1a4386615a27105a2021ea53f.tar.gz gcc-cccd217d2bb66bb1a4386615a27105a2021ea53f.tar.bz2 |
gcov-io.h (GCOV_CHECK, [...]): Remove.
* gcov-io.h (GCOV_CHECK, GCOV_CHECK_READING,
GCOV_CHECK_WRITING): Remove.
(gcov_position, gcov_rewrite): Use gcc_assert.
* gcov-io.c (gcov_open, gcov_write_words, gcov_write_length,
gcov_read_words, gcov_sync, gcov_seek): Use gcc_assert.
* libgcov.c (__gcov_merge_single, __gcov_merge_delta): Use
gcc_assert.
From-SVN: r97392
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 10 | ||||
-rw-r--r-- | gcc/gcov-io.c | 22 | ||||
-rw-r--r-- | gcc/gcov-io.h | 18 | ||||
-rw-r--r-- | gcc/libgcov.c | 4 |
4 files changed, 25 insertions, 29 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0346462..e7df520 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2005-04-01 Nathan Sidwell <nathan@codesourcery.com> + + * gcov-io.h (GCOV_CHECK, GCOV_CHECK_READING, + GCOV_CHECK_WRITING): Remove. + (gcov_position, gcov_rewrite): Use gcc_assert. + * gcov-io.c (gcov_open, gcov_write_words, gcov_write_length, + gcov_read_words, gcov_sync, gcov_seek): Use gcc_assert. + * libgcov.c (__gcov_merge_single, __gcov_merge_delta): Use + gcc_assert. + 2005-04-01 Kazu Hirata <kazu@cs.umass.edu> * tree-inline.c: Fix a typo. diff --git a/gcc/gcov-io.c b/gcc/gcov-io.c index 640a55a..67e08f0 100644 --- a/gcc/gcov-io.c +++ b/gcc/gcov-io.c @@ -74,7 +74,7 @@ gcov_open (const char *name, int mode) s_flock.l_pid = getpid (); #endif - GCOV_CHECK (!gcov_var.file); + gcc_assert (!gcov_var.file); gcov_var.start = 0; gcov_var.offset = gcov_var.length = 0; gcov_var.overread = -1u; @@ -221,14 +221,14 @@ gcov_write_words (unsigned words) { gcov_unsigned_t *result; - GCOV_CHECK_WRITING (); + gcc_assert (gcov_var.mode < 0); #if IN_LIBGCOV if (gcov_var.offset >= GCOV_BLOCK_SIZE) { gcov_write_block (GCOV_BLOCK_SIZE); if (gcov_var.offset) { - GCOV_CHECK (gcov_var.offset == 1); + gcc_assert (gcov_var.offset == 1); memcpy (gcov_var.buffer, gcov_var.buffer + GCOV_BLOCK_SIZE, 4); } } @@ -323,9 +323,9 @@ gcov_write_length (gcov_position_t position) gcov_unsigned_t length; gcov_unsigned_t *buffer; - GCOV_CHECK_WRITING (); - GCOV_CHECK (position + 2 <= gcov_var.start + gcov_var.offset); - GCOV_CHECK (position >= gcov_var.start); + gcc_assert (gcov_var.mode < 0); + gcc_assert (position + 2 <= gcov_var.start + gcov_var.offset); + gcc_assert (position >= gcov_var.start); offset = position - gcov_var.start; length = gcov_var.offset - offset - 2; buffer = (gcov_unsigned_t *) &gcov_var.buffer[offset]; @@ -380,14 +380,14 @@ gcov_read_words (unsigned words) const gcov_unsigned_t *result; unsigned excess = gcov_var.length - gcov_var.offset; - GCOV_CHECK_READING (); + gcc_assert (gcov_var.mode > 0); if (excess < words) { gcov_var.start += gcov_var.offset; #if IN_LIBGCOV if (excess) { - GCOV_CHECK (excess == 1); + gcc_assert (excess == 1); memcpy (gcov_var.buffer, gcov_var.buffer + gcov_var.offset, 4); } #else @@ -396,7 +396,7 @@ gcov_read_words (unsigned words) gcov_var.offset = 0; gcov_var.length = excess; #if IN_LIBGCOV - GCOV_CHECK (!gcov_var.length || gcov_var.length == 1); + gcc_assert (!gcov_var.length || gcov_var.length == 1); excess = GCOV_BLOCK_SIZE; #else if (gcov_var.length + words > gcov_var.alloc) @@ -494,7 +494,7 @@ gcov_read_summary (struct gcov_summary *summary) GCOV_LINKAGE void gcov_sync (gcov_position_t base, gcov_unsigned_t length) { - GCOV_CHECK_READING (); + gcc_assert (gcov_var.mode > 0); base += length; if (base - gcov_var.start <= gcov_var.length) gcov_var.offset = base - gcov_var.start; @@ -513,7 +513,7 @@ gcov_sync (gcov_position_t base, gcov_unsigned_t length) GCOV_LINKAGE void gcov_seek (gcov_position_t base) { - GCOV_CHECK_WRITING (); + gcc_assert (gcov_var.mode < 0); if (gcov_var.offset) gcov_write_block (gcov_var.offset); fseek (gcov_var.file, base << 2, SEEK_SET); diff --git a/gcc/gcov-io.h b/gcc/gcov-io.h index eaa23ad..904f541 100644 --- a/gcc/gcov-io.h +++ b/gcc/gcov-io.h @@ -546,26 +546,12 @@ GCOV_LINKAGE void gcov_write_length (gcov_position_t /*position*/); GCOV_LINKAGE time_t gcov_time (void); #endif -/* Make sure the library is used correctly. */ -#if IN_LIBGCOV -#if ENABLE_CHECKING -#define GCOV_CHECK(EXPR) (!(EXPR) ? abort (), 0 : 0) -#else -/* Include EXPR, so that unused variable warnings do not occur. */ -#define GCOV_CHECK(EXPR) ((void)(0 && (EXPR))) -#endif -#else -#define GCOV_CHECK(EXPR) gcc_assert (EXPR) -#endif -#define GCOV_CHECK_READING() GCOV_CHECK(gcov_var.mode > 0) -#define GCOV_CHECK_WRITING() GCOV_CHECK(gcov_var.mode < 0) - /* Save the current position in the gcov file. */ static inline gcov_position_t gcov_position (void) { - GCOV_CHECK_READING (); + gcc_assert (gcov_var.mode > 0); return gcov_var.start + gcov_var.offset; } @@ -583,7 +569,7 @@ gcov_is_error (void) static inline void gcov_rewrite (void) { - GCOV_CHECK_READING (); + gcc_assert (gcov_var.mode > 0); gcov_var.mode = -1; gcov_var.start = 0; gcov_var.offset = 0; diff --git a/gcc/libgcov.c b/gcc/libgcov.c index 49cf3c7..6e9c9d3 100644 --- a/gcc/libgcov.c +++ b/gcc/libgcov.c @@ -519,7 +519,7 @@ __gcov_merge_single (gcov_type *counters, unsigned n_counters) unsigned i, n_measures; gcov_type value, counter, all; - GCOV_CHECK (!(n_counters % 3)); + gcc_assert (!(n_counters % 3)); n_measures = n_counters / 3; for (i = 0; i < n_measures; i++, counters += 3) { @@ -558,7 +558,7 @@ __gcov_merge_delta (gcov_type *counters, unsigned n_counters) unsigned i, n_measures; gcov_type last, value, counter, all; - GCOV_CHECK (!(n_counters % 4)); + gcc_assert (!(n_counters % 4)); n_measures = n_counters / 4; for (i = 0; i < n_measures; i++, counters += 4) { |