This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] assertify gcov
- From: Nathan Sidwell <nathan at codesourcery dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 01 Apr 2005 15:05:35 +0100
- Subject: [PATCH] assertify gcov
- Organization: Codesourcery LLC
I've installed this patch that replaces gcov's GCOV_CHECK macro with
gcc_assert.
booted & tested on i686-pc-linux-gnu, with checking enabled and disabled.
nathan
--
Nathan Sidwell :: http://www.codesourcery.com :: CodeSourcery LLC
nathan@codesourcery.com :: http://www.planetfall.pwp.blueyonder.co.uk
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.
Index: gcov-io.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcov-io.c,v
retrieving revision 1.18
diff -c -3 -p -r1.18 gcov-io.c
*** gcov-io.c 9 Sep 2004 13:53:55 -0000 1.18
--- gcov-io.c 1 Apr 2005 13:25:20 -0000
*************** gcov_open (const char *name, int mode)
*** 74,80 ****
s_flock.l_pid = getpid ();
#endif
! GCOV_CHECK (!gcov_var.file);
gcov_var.start = 0;
gcov_var.offset = gcov_var.length = 0;
gcov_var.overread = -1u;
--- 74,80 ----
s_flock.l_pid = getpid ();
#endif
! gcc_assert (!gcov_var.file);
gcov_var.start = 0;
gcov_var.offset = gcov_var.length = 0;
gcov_var.overread = -1u;
*************** gcov_write_words (unsigned words)
*** 221,234 ****
{
gcov_unsigned_t *result;
! GCOV_CHECK_WRITING ();
#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);
memcpy (gcov_var.buffer, gcov_var.buffer + GCOV_BLOCK_SIZE, 4);
}
}
--- 221,234 ----
{
gcov_unsigned_t *result;
! 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)
{
! gcc_assert (gcov_var.offset == 1);
memcpy (gcov_var.buffer, gcov_var.buffer + GCOV_BLOCK_SIZE, 4);
}
}
*************** gcov_write_length (gcov_position_t posit
*** 323,331 ****
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);
offset = position - gcov_var.start;
length = gcov_var.offset - offset - 2;
buffer = (gcov_unsigned_t *) &gcov_var.buffer[offset];
--- 323,331 ----
gcov_unsigned_t length;
gcov_unsigned_t *buffer;
! 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];
*************** gcov_read_words (unsigned words)
*** 380,393 ****
const gcov_unsigned_t *result;
unsigned excess = gcov_var.length - gcov_var.offset;
! GCOV_CHECK_READING ();
if (excess < words)
{
gcov_var.start += gcov_var.offset;
#if IN_LIBGCOV
if (excess)
{
! GCOV_CHECK (excess == 1);
memcpy (gcov_var.buffer, gcov_var.buffer + gcov_var.offset, 4);
}
#else
--- 380,393 ----
const gcov_unsigned_t *result;
unsigned excess = gcov_var.length - gcov_var.offset;
! gcc_assert (gcov_var.mode > 0);
if (excess < words)
{
gcov_var.start += gcov_var.offset;
#if IN_LIBGCOV
if (excess)
{
! gcc_assert (excess == 1);
memcpy (gcov_var.buffer, gcov_var.buffer + gcov_var.offset, 4);
}
#else
*************** gcov_read_words (unsigned words)
*** 396,402 ****
gcov_var.offset = 0;
gcov_var.length = excess;
#if IN_LIBGCOV
! GCOV_CHECK (!gcov_var.length || gcov_var.length == 1);
excess = GCOV_BLOCK_SIZE;
#else
if (gcov_var.length + words > gcov_var.alloc)
--- 396,402 ----
gcov_var.offset = 0;
gcov_var.length = excess;
#if IN_LIBGCOV
! gcc_assert (!gcov_var.length || gcov_var.length == 1);
excess = GCOV_BLOCK_SIZE;
#else
if (gcov_var.length + words > gcov_var.alloc)
*************** gcov_read_summary (struct gcov_summary *
*** 494,500 ****
GCOV_LINKAGE void
gcov_sync (gcov_position_t base, gcov_unsigned_t length)
{
! GCOV_CHECK_READING ();
base += length;
if (base - gcov_var.start <= gcov_var.length)
gcov_var.offset = base - gcov_var.start;
--- 494,500 ----
GCOV_LINKAGE void
gcov_sync (gcov_position_t base, gcov_unsigned_t length)
{
! gcc_assert (gcov_var.mode > 0);
base += length;
if (base - gcov_var.start <= gcov_var.length)
gcov_var.offset = base - gcov_var.start;
*************** gcov_sync (gcov_position_t base, gcov_un
*** 513,519 ****
GCOV_LINKAGE void
gcov_seek (gcov_position_t base)
{
! GCOV_CHECK_WRITING ();
if (gcov_var.offset)
gcov_write_block (gcov_var.offset);
fseek (gcov_var.file, base << 2, SEEK_SET);
--- 513,519 ----
GCOV_LINKAGE void
gcov_seek (gcov_position_t base)
{
! gcc_assert (gcov_var.mode < 0);
if (gcov_var.offset)
gcov_write_block (gcov_var.offset);
fseek (gcov_var.file, base << 2, SEEK_SET);
Index: gcov-io.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcov-io.h,v
retrieving revision 1.52
diff -c -3 -p -r1.52 gcov-io.h
*** gcov-io.h 30 Aug 2004 15:52:08 -0000 1.52
--- gcov-io.h 1 Apr 2005 13:25:22 -0000
*************** GCOV_LINKAGE void gcov_write_length (gco
*** 546,571 ****
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 ();
return gcov_var.start + gcov_var.offset;
}
--- 546,557 ----
GCOV_LINKAGE time_t gcov_time (void);
#endif
/* Save the current position in the gcov file. */
static inline gcov_position_t
gcov_position (void)
{
! gcc_assert (gcov_var.mode > 0);
return gcov_var.start + gcov_var.offset;
}
*************** gcov_is_error (void)
*** 583,589 ****
static inline void
gcov_rewrite (void)
{
! GCOV_CHECK_READING ();
gcov_var.mode = -1;
gcov_var.start = 0;
gcov_var.offset = 0;
--- 569,575 ----
static inline void
gcov_rewrite (void)
{
! gcc_assert (gcov_var.mode > 0);
gcov_var.mode = -1;
gcov_var.start = 0;
gcov_var.offset = 0;
Index: libgcov.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/libgcov.c,v
retrieving revision 1.26
diff -c -3 -p -r1.26 libgcov.c
*** libgcov.c 29 Jul 2004 08:58:59 -0000 1.26
--- libgcov.c 1 Apr 2005 13:25:23 -0000
*************** __gcov_merge_single (gcov_type *counters
*** 519,525 ****
unsigned i, n_measures;
gcov_type value, counter, all;
! GCOV_CHECK (!(n_counters % 3));
n_measures = n_counters / 3;
for (i = 0; i < n_measures; i++, counters += 3)
{
--- 519,525 ----
unsigned i, n_measures;
gcov_type value, counter, all;
! gcc_assert (!(n_counters % 3));
n_measures = n_counters / 3;
for (i = 0; i < n_measures; i++, counters += 3)
{
*************** __gcov_merge_delta (gcov_type *counters,
*** 558,564 ****
unsigned i, n_measures;
gcov_type last, value, counter, all;
! GCOV_CHECK (!(n_counters % 4));
n_measures = n_counters / 4;
for (i = 0; i < n_measures; i++, counters += 4)
{
--- 558,564 ----
unsigned i, n_measures;
gcov_type last, value, counter, all;
! gcc_assert (!(n_counters % 4));
n_measures = n_counters / 4;
for (i = 0; i < n_measures; i++, counters += 4)
{