From cccd217d2bb66bb1a4386615a27105a2021ea53f Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Fri, 1 Apr 2005 14:08:01 +0000
Subject: 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
---
 gcc/gcov-io.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'gcc/gcov-io.c')

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);
-- 
cgit v1.1