Change in coreboot[master]: src/lib: Update gcov-io.[ch] (test) - coreboot-gerrit

1 Apr 2020

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40013 )
Change subject: src/lib: Update gcov-io.[ch] (test)
......................................................................
src/lib: Update gcov-io.[ch] (test)
Change-Id: Iacdbd3ad563e13aea0718689bc4f6e5ac6a80cfc
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr
---
M src/lib/gcov-io.c
M src/lib/gcov-io.h
2 files changed, 524 insertions(+), 645 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/40013/1

diff --git a/src/lib/gcov-io.c b/src/lib/gcov-io.c
index e142524..213c413 100644
--- a/src/lib/gcov-io.c
+++ b/src/lib/gcov-io.c
@@ -1,6 +1,5 @@
 /* File format for coverage information
-   Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007,
-   2008  Free Software Foundation, Inc.
+   Copyright (C) 1996-2020 Free Software Foundation, Inc.
    Contributed by Bob Manson manson@cygnus.com.
    Completely remangled by Nathan Sidwell nathan@codesourcery.com.
@@ -19,29 +18,96 @@
 Under Section 7 of GPL version 3, you are granted additional
 permissions described in the GCC Runtime Library Exception, version
 3.1, as published by the Free Software Foundation.
-*/
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+http://www.gnu.org/licenses/.  */
/* Routines declared in gcov-io.h.  This file should be #included by
    another source file, after having #included gcov-io.h.  */
#if !IN_GCOV
-static void gcov_write_block(unsigned int);
-static gcov_unsigned_t *gcov_write_words(unsigned int);
+static void gcov_write_block (unsigned);
+static gcov_unsigned_t *gcov_write_words (unsigned);
 #endif
-static const gcov_unsigned_t *gcov_read_words(unsigned int);
+static const gcov_unsigned_t *gcov_read_words (unsigned);
 #if !IN_LIBGCOV
-static void gcov_allocate(unsigned int);
+static void gcov_allocate (unsigned);
 #endif
-static inline gcov_unsigned_t from_file(gcov_unsigned_t value)
+/* Optimum number of gcov_unsigned_t's read from or written to disk.  */
+#define GCOV_BLOCK_SIZE (1 << 10)
+
+struct gcov_var
+{
+  FILE *file;
+  gcov_position_t start;	/* Position of first byte of block */
+  unsigned offset;		/* Read/write position within the block.  */
+  unsigned length;		/* Read limit in the block.  */
+  unsigned overread;		/* Number of words overread.  */
+  int error;			/* < 0 overflow, > 0 disk error.  */
+  int mode;	                /* < 0 writing, > 0 reading */
+#if IN_LIBGCOV
+  /* Holds one block plus 4 bytes, thus all coverage reads & writes
+     fit within this buffer and we always can transfer GCOV_BLOCK_SIZE
+     to and from the disk. libgcov never backtracks and only writes 4
+     or 8 byte objects.  */
+  gcov_unsigned_t buffer[GCOV_BLOCK_SIZE + 1];
+#else
+  int endian;			/* Swap endianness.  */
+  /* Holds a variable length block, as the compiler can write
+     strings and needs to backtrack.  */
+  size_t alloc;
+  gcov_unsigned_t *buffer;
+#endif
+} gcov_var;
+
+/* Save the current position in the gcov file.  */
+/* We need to expose this function when compiling for gcov-tool.  */
+#ifndef IN_GCOV_TOOL
+static inline
+#endif
+gcov_position_t
+gcov_position (void)
+{
+  gcov_nonruntime_assert (gcov_var.mode > 0); 
+  return gcov_var.start + gcov_var.offset;
+}
+
+/* Return nonzero if the error flag is set.  */
+/* We need to expose this function when compiling for gcov-tool.  */
+#ifndef IN_GCOV_TOOL
+static inline
+#endif
+int
+gcov_is_error (void)
+{
+  return gcov_var.file ? gcov_var.error : 1;
+}
+
+#if IN_LIBGCOV
+/* Move to beginning of file and initialize for writing.  */
+GCOV_LINKAGE inline void
+gcov_rewrite (void)
+{
+  gcov_var.mode = -1; 
+  gcov_var.start = 0;
+  gcov_var.offset = 0;
+  fseek (gcov_var.file, 0L, SEEK_SET);
+}
+#endif
+
+static inline gcov_unsigned_t from_file (gcov_unsigned_t value)
 {
 #if !IN_LIBGCOV
-	if (gcov_var.endian) {
-		value = (value >> 16) | (value << 16);
-		value = ((value & 0xff00ff) << 8) | ((value >> 8) & 0xff00ff);
-	}
+  if (gcov_var.endian)
+    {
+      value = (value >> 16) | (value << 16);
+      value = ((value & 0xff00ff) << 8) | ((value >> 8) & 0xff00ff);
+    }
 #endif
-	return value;
+  return value;
 }
/* Open a gcov file. NAME is the name of the file to open and MODE
@@ -49,120 +115,111 @@
    opened. If MODE is >= 0 an existing file will be opened, if
    possible, and if MODE is <= 0, a new file will be created. Use
    MODE=0 to attempt to reopen an existing file and then fall back on
-   creating a new one.  If MODE < 0, the file will be opened in
+   creating a new one.  If MODE > 0, the file will be opened in
    read-only mode.  Otherwise it will be opened for modification.
-   Return zero on failure, >0 on opening an existing file and <0 on
-   creating a new one.  */
+   Return zero on failure, non-zero on success.  */
GCOV_LINKAGE int
 #if IN_LIBGCOV
-gcov_open(const char *name)
+gcov_open (const char *name)
 #else
-gcov_open(const char *name, int mode)
+gcov_open (const char *name, int mode)
 #endif
 {
 #if IN_LIBGCOV
-	const int mode = 0;
+  int mode = 0;
 #endif
 #if GCOV_LOCKED
-	struct flock s_flock;
-	int fd;
+  struct flock s_flock;
+  int fd;
-	s_flock.l_whence = SEEK_SET;
-	s_flock.l_start = 0;
-	s_flock.l_len = 0; /* Until EOF.  */
-	s_flock.l_pid = getpid();
+  s_flock.l_whence = SEEK_SET;
+  s_flock.l_start = 0;
+  s_flock.l_len = 0; /* Until EOF.  */
+  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_var.error = 0;
+  gcov_nonruntime_assert (!gcov_var.file);
+  gcov_var.start = 0;
+  gcov_var.offset = gcov_var.length = 0;
+  gcov_var.overread = -1u;
+  gcov_var.error = 0;
 #if !IN_LIBGCOV
-	gcov_var.endian = 0;
+  gcov_var.endian = 0;
 #endif
 #if GCOV_LOCKED
-	if (mode > 0) {
-		/* Read-only mode - acquire a read-lock.  */
-		s_flock.l_type = F_RDLCK;
-		fd = open(name, O_RDONLY);
-	} else {
-		/* Write mode - acquire a write-lock.  */
-		s_flock.l_type = F_WRLCK;
-		fd = open(name, O_RDWR | O_CREAT, 0666);
-	}
-	if (fd < 0)
-		return 0;
+  if (mode > 0)
+    {
+      /* Read-only mode - acquire a read-lock.  */
+      s_flock.l_type = F_RDLCK;
+      /* pass mode (ignored) for compatibility */
+      fd = open (name, O_RDONLY, S_IRUSR | S_IWUSR);
+    }
+  else
+     {
+       /* Write mode - acquire a write-lock.  */
+       s_flock.l_type = F_WRLCK;
+       /* Truncate if force new mode.  */
+       fd = open (name, O_RDWR | O_CREAT | (mode < 0 ? O_TRUNC : 0), 0666);
+    }
+  if (fd < 0)
+    return 0;
-	while (fcntl(fd, F_SETLKW, &s_flock) && errno == EINTR)
-		continue;
+  while (fcntl (fd, F_SETLKW, &s_flock) && errno == EINTR)
+    continue;
-	gcov_var.file = fdopen(fd, (mode > 0) ? "rb" : "r+b");
+  gcov_var.file = fdopen (fd, (mode > 0) ? "rb" : "r+b");
-	if (!gcov_var.file) {
-		close(fd);
-		return 0;
-	}
-
-	if (mode > 0)
-		gcov_var.mode = 1;
-	else if (mode == 0) {
-		struct stat st;
-
-		if (fstat(fd, &st) < 0) {
-			fclose(gcov_var.file);
-			gcov_var.file = 0;
-			return 0;
-		}
-		if (st.st_size != 0)
-			gcov_var.mode = 1;
-		else
-			gcov_var.mode = mode * 2 + 1;
-	} else
-		gcov_var.mode = mode * 2 + 1;
+  if (!gcov_var.file)
+    {
+      close (fd);
+      return 0;
+    }
 #else
-	if (mode >= 0)
-		gcov_var.file = fopen(name, (mode > 0) ? "rb" : "r+b");
+  if (mode >= 0)
+    /* Open an existing file.  */
+    gcov_var.file = fopen (name, (mode > 0) ? "rb" : "r+b");
-	if (gcov_var.file)
-		gcov_var.mode = 1;
-	else if (mode <= 0) {
-		gcov_var.file = fopen(name, "w+b");
-		if (gcov_var.file)
-			gcov_var.mode = mode * 2 + 1;
-	}
-	if (!gcov_var.file)
-		return 0;
+  if (gcov_var.file)
+    mode = 1;
+  else if (mode <= 0)
+    /* Create a new file.  */
+    gcov_var.file = fopen (name, "w+b");
+
+  if (!gcov_var.file)
+    return 0;
 #endif
-	setbuf(gcov_var.file, (char *)0);
+  gcov_var.mode = mode ? mode : 1;
-	return 1;
+  setbuf (gcov_var.file, (char *)0);
+
+  return 1;
 }
/* Close the current gcov file. Flushes data to disk. Returns nonzero
    on failure or error flag set.  */
GCOV_LINKAGE int
-gcov_close(void)
+gcov_close (void)
 {
-	if (gcov_var.file) {
+  if (gcov_var.file)
+    {
 #if !IN_GCOV
-	if (gcov_var.offset && gcov_var.mode < 0)
-		gcov_write_block(gcov_var.offset);
+      if (gcov_var.offset && gcov_var.mode < 0)
+	gcov_write_block (gcov_var.offset);
 #endif
-		fclose(gcov_var.file);
-		gcov_var.file = 0;
-		gcov_var.length = 0;
-	}
+      fclose (gcov_var.file);
+      gcov_var.file = 0;
+      gcov_var.length = 0;
+    }
 #if !IN_LIBGCOV
-	free(gcov_var.buffer);
-	gcov_var.alloc = 0;
-	gcov_var.buffer = 0;
+  free (gcov_var.buffer);
+  gcov_var.alloc = 0;
+  gcov_var.buffer = 0;
 #endif
-	gcov_var.mode = 0;
-	return gcov_var.error;
+  gcov_var.mode = 0;
+  return gcov_var.error;
 }
#if !IN_LIBGCOV
@@ -171,34 +228,34 @@
    not EXPECTED.  */
GCOV_LINKAGE int
-gcov_magic(gcov_unsigned_t magic, gcov_unsigned_t expected)
+gcov_magic (gcov_unsigned_t magic, gcov_unsigned_t expected)
 {
-	if (magic == expected)
-		return 1;
-	magic = (magic >> 16) | (magic << 16);
-	magic = ((magic & 0xff00ff) << 8) | ((magic >> 8) & 0xff00ff);
-	if (magic == expected) {
-		gcov_var.endian = 1;
-		return -1;
-	}
-	return 0;
+  if (magic == expected)
+    return 1;
+  magic = (magic >> 16) | (magic << 16);
+  magic = ((magic & 0xff00ff) << 8) | ((magic >> 8) & 0xff00ff);
+  if (magic == expected)
+    {
+      gcov_var.endian = 1;
+      return -1;
+    }
+  return 0;
 }
 #endif
#if !IN_LIBGCOV
 static void
-gcov_allocate(unsigned int length)
+gcov_allocate (unsigned length)
 {
-	size_t new_size = gcov_var.alloc;
+  size_t new_size = gcov_var.alloc;
-	if (!new_size)
-		new_size = GCOV_BLOCK_SIZE;
-	new_size += length;
-	new_size *= 2;
+  if (!new_size)
+    new_size = GCOV_BLOCK_SIZE;
+  new_size += length;
+  new_size *= 2;
-	gcov_var.alloc = new_size;
-	gcov_var.buffer = XRESIZEVAR(gcov_unsigned_t, gcov_var.buffer,
-		new_size << 2);
+  gcov_var.alloc = new_size;
+  gcov_var.buffer = XRESIZEVAR (gcov_unsigned_t, gcov_var.buffer, new_size << 2);
 }
 #endif
@@ -206,51 +263,51 @@
 /* Write out the current block, if needs be.  */
static void
-gcov_write_block(unsigned int size)
+gcov_write_block (unsigned size)
 {
-	if (fwrite(gcov_var.buffer, size << 2, 1, gcov_var.file) != 1)
-		gcov_var.error = 1;
-	gcov_var.start += size;
-	gcov_var.offset -= size;
+  if (fwrite (gcov_var.buffer, size << 2, 1, gcov_var.file) != 1)
+    gcov_var.error = 1;
+  gcov_var.start += size;
+  gcov_var.offset -= size;
 }
/* Allocate space to write BYTES bytes to the gcov file. Return a
    pointer to those bytes, or NULL on failure.  */
static gcov_unsigned_t *
-gcov_write_words(unsigned int words)
+gcov_write_words (unsigned words)
 {
-	gcov_unsigned_t *result;
+  gcov_unsigned_t *result;
-	gcc_assert(gcov_var.mode < 0);
+  gcov_nonruntime_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);
-		}
+  if (gcov_var.offset >= GCOV_BLOCK_SIZE)
+    {
+      gcov_write_block (GCOV_BLOCK_SIZE);
+      if (gcov_var.offset)
+	{
+	  memcpy (gcov_var.buffer, gcov_var.buffer + GCOV_BLOCK_SIZE, 4);
    }
+    }
 #else
-	if (gcov_var.offset + words > gcov_var.alloc)
-		gcov_allocate(gcov_var.offset + words);
+  if (gcov_var.offset + words > gcov_var.alloc)
+    gcov_allocate (gcov_var.offset + words);
 #endif
-	result = &gcov_var.buffer[gcov_var.offset];
-	gcov_var.offset += words;
+  result = &gcov_var.buffer[gcov_var.offset];
+  gcov_var.offset += words;
-	return result;
+  return result;
 }
/* Write unsigned VALUE to coverage file.  Sets error flag
    appropriately.  */
GCOV_LINKAGE void
-gcov_write_unsigned(gcov_unsigned_t value)
+gcov_write_unsigned (gcov_unsigned_t value)
 {
-	gcov_unsigned_t *buffer = gcov_write_words(1);
+  gcov_unsigned_t *buffer = gcov_write_words (1);
-	buffer[0] = value;
+  buffer[0] = value;
 }
/* Write counter VALUE to coverage file.  Sets error flag
@@ -258,15 +315,15 @@
#if IN_LIBGCOV
 GCOV_LINKAGE void
-gcov_write_counter(gcov_type value)
+gcov_write_counter (gcov_type value)
 {
-	gcov_unsigned_t *buffer = gcov_write_words(2);
+  gcov_unsigned_t *buffer = gcov_write_words (2);
-	buffer[0] = (gcov_unsigned_t) value;
-	if (sizeof(value) > sizeof(gcov_unsigned_t))
-		buffer[1] = (gcov_unsigned_t) (value >> 32);
-	else
-		buffer[1] = 0;
+  buffer[0] = (gcov_unsigned_t) value;
+  if (sizeof (value) > sizeof (gcov_unsigned_t))
+    buffer[1] = (gcov_unsigned_t) (value >> 32);
+  else
+    buffer[1] = 0;
 }
 #endif /* IN_LIBGCOV */
@@ -275,22 +332,59 @@
    error, overflow flag on overflow */
GCOV_LINKAGE void
-gcov_write_string(const char *string)
+gcov_write_string (const char *string)
 {
-	unsigned int length = 0;
-	unsigned int alloc = 0;
-	gcov_unsigned_t *buffer;
+  unsigned length = 0;
+  unsigned alloc = 0;
+  gcov_unsigned_t *buffer;
-	if (string) {
-		length = strlen(string);
-		alloc = (length + 4) >> 2;
+  if (string)
+    {
+      length = strlen (string);
+      alloc = (length + 4) >> 2;
+    }
+
+  buffer = gcov_write_words (1 + alloc);
+
+  buffer[0] = alloc;
+
+  if (alloc > 0)
+    {
+      buffer[alloc] = 0; /* place nul terminators.  */
+      memcpy (&buffer[1], string, length);
+    }
+}
+#endif
+
+#if !IN_LIBGCOV
+/* Write FILENAME to coverage file.  Sets error flag on file
+   error, overflow flag on overflow */
+
+GCOV_LINKAGE void
+gcov_write_filename (const char *filename)
+{
+  if (profile_abs_path_flag && filename && filename[0]
+      && !(IS_DIR_SEPARATOR (filename[0])
+#if HAVE_DOS_BASED_FILE_SYSTEM
+	   || filename[1] == ':'
+#endif
+	  ))
+    {
+      char *buf = getcwd (NULL, 0);
+      if (buf != NULL && buf[0])
+	{
+	  size_t len = strlen (buf);
+	  buf = (char*)xrealloc (buf, len + strlen (filename) + 2);
+	  if (!IS_DIR_SEPARATOR (buf[len - 1]))
+	    strcat (buf, "/");
+	  strcat (buf, filename);
+	  gcov_write_string (buf);
+	  free (buf);
+	  return;
    }
+    }
-	buffer = gcov_write_words(1 + alloc);
-
-	buffer[0] = alloc;
-	buffer[alloc] = 0;
-	memcpy(&buffer[1], string, length);
+  gcov_write_string (filename);
 }
 #endif
@@ -299,15 +393,15 @@
    value to be used for gcov_write_length.  */
GCOV_LINKAGE gcov_position_t
-gcov_write_tag(gcov_unsigned_t tag)
+gcov_write_tag (gcov_unsigned_t tag)
 {
-	gcov_position_t result = gcov_var.start + gcov_var.offset;
-	gcov_unsigned_t *buffer = gcov_write_words(2);
+  gcov_position_t result = gcov_var.start + gcov_var.offset;
+  gcov_unsigned_t *buffer = gcov_write_words (2);
-	buffer[0] = tag;
-	buffer[1] = 0;
+  buffer[0] = tag;
+  buffer[1] = 0;
-	return result;
+  return result;
 }
/* Write a record length using POSITION, which was returned by
@@ -316,21 +410,21 @@
    overflow.  */
GCOV_LINKAGE void
-gcov_write_length(gcov_position_t position)
+gcov_write_length (gcov_position_t position)
 {
-	unsigned int offset;
-	gcov_unsigned_t length;
-	gcov_unsigned_t *buffer;
+  unsigned offset;
+  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];
-	buffer[1] = length;
-	if (gcov_var.offset >= GCOV_BLOCK_SIZE)
-		gcov_write_block(gcov_var.offset);
+  gcov_nonruntime_assert (gcov_var.mode < 0);
+  gcov_nonruntime_assert (position + 2 <= gcov_var.start + gcov_var.offset);
+  gcov_nonruntime_assert (position >= gcov_var.start);
+  offset = position - gcov_var.start;
+  length = gcov_var.offset - offset - 2;
+  buffer = (gcov_unsigned_t *) &gcov_var.buffer[offset];
+  buffer[1] = length;
+  if (gcov_var.offset >= GCOV_BLOCK_SIZE)
+    gcov_write_block (gcov_var.offset);
 }
#else /* IN_LIBGCOV */
@@ -338,33 +432,25 @@
 /* Write a tag TAG and length LENGTH.  */
GCOV_LINKAGE void
-gcov_write_tag_length(gcov_unsigned_t tag, gcov_unsigned_t length)
+gcov_write_tag_length (gcov_unsigned_t tag, gcov_unsigned_t length)
 {
-	gcov_unsigned_t *buffer = gcov_write_words(2);
+  gcov_unsigned_t *buffer = gcov_write_words (2);
-	buffer[0] = tag;
-	buffer[1] = length;
+  buffer[0] = tag;
+  buffer[1] = length;
 }
/* Write a summary structure to the gcov file.  Return nonzero on
    overflow.  */
GCOV_LINKAGE void
-gcov_write_summary(gcov_unsigned_t tag, const struct gcov_summary *summary)
+gcov_write_summary (gcov_unsigned_t tag, const struct gcov_summary *summary)
 {
-	unsigned int ix;
-	const struct gcov_ctr_summary *csum;
-
-	gcov_write_tag_length(tag, GCOV_TAG_SUMMARY_LENGTH);
-	gcov_write_unsigned(summary->checksum);
-	for (csum = summary->ctrs, ix = GCOV_COUNTERS_SUMMABLE; ix--; csum++) {
-		gcov_write_unsigned(csum->num);
-		gcov_write_unsigned(csum->runs);
-		gcov_write_counter(csum->sum_all);
-		gcov_write_counter(csum->run_max);
-		gcov_write_counter(csum->sum_max);
-	}
+  gcov_write_tag_length (tag, GCOV_TAG_SUMMARY_LENGTH);
+  gcov_write_unsigned (summary->runs);
+  gcov_write_unsigned (summary->sum_max);
 }
+
 #endif /* IN_LIBGCOV */
#endif /*!IN_GCOV */
@@ -373,132 +459,179 @@
    NULL on failure (read past EOF).  */
static const gcov_unsigned_t *
-gcov_read_words(unsigned int words)
+gcov_read_words (unsigned words)
 {
-	const gcov_unsigned_t *result;
-	unsigned int excess = gcov_var.length - gcov_var.offset;
+  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 (gcov_var.mode <= 0)
+    return NULL;
+
+  if (excess < words)
+    {
+      gcov_var.start += gcov_var.offset;
+      if (excess)
+	{
 #if IN_LIBGCOV
-		if (excess) {
-			gcc_assert(excess == 1);
-			memcpy(gcov_var.buffer, gcov_var.buffer
-				+ gcov_var.offset, 4);
-		}
+	  memcpy (gcov_var.buffer, gcov_var.buffer + gcov_var.offset, 4);
 #else
-		memmove(gcov_var.buffer, gcov_var.buffer
-			+ gcov_var.offset, excess * 4);
+	  memmove (gcov_var.buffer, gcov_var.buffer + gcov_var.offset,
+		   excess * 4);
 #endif
-		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_allocate(gcov_var.length + words);
-		excess = gcov_var.alloc - gcov_var.length;
-#endif
-		excess = fread(gcov_var.buffer + gcov_var.length,
-			1, excess << 2, gcov_var.file) >> 2;
-		gcov_var.length += excess;
-		if (gcov_var.length < words) {
-			gcov_var.overread += words - gcov_var.length;
-			gcov_var.length = 0;
-			return 0;
-		}
    }
-	result = &gcov_var.buffer[gcov_var.offset];
-	gcov_var.offset += words;
-	return result;
+      gcov_var.offset = 0;
+      gcov_var.length = excess;
+#if IN_LIBGCOV
+      excess = GCOV_BLOCK_SIZE;
+#else
+      if (gcov_var.length + words > gcov_var.alloc)
+	gcov_allocate (gcov_var.length + words);
+      excess = gcov_var.alloc - gcov_var.length;
+#endif
+      excess = fread (gcov_var.buffer + gcov_var.length,
+		      1, excess << 2, gcov_var.file) >> 2;
+      gcov_var.length += excess;
+      if (gcov_var.length < words)
+	{
+	  gcov_var.overread += words - gcov_var.length;
+	  gcov_var.length = 0;
+	  return 0;
+	}
+    }
+  result = &gcov_var.buffer[gcov_var.offset];
+  gcov_var.offset += words;
+  return result;
 }
/* Read unsigned value from a coverage file. Sets error flag on file
    error, overflow flag on overflow */
GCOV_LINKAGE gcov_unsigned_t
-gcov_read_unsigned(void)
+gcov_read_unsigned (void)
 {
-	gcov_unsigned_t value;
-	const gcov_unsigned_t *buffer = gcov_read_words(1);
+  gcov_unsigned_t value;
+  const gcov_unsigned_t *buffer = gcov_read_words (1);
-	if (!buffer)
-		return 0;
-	value = from_file(buffer[0]);
-	return value;
+  if (!buffer)
+    return 0;
+  value = from_file (buffer[0]);
+  return value;
 }
/* Read counter value from a coverage file. Sets error flag on file
    error, overflow flag on overflow */
GCOV_LINKAGE gcov_type
-gcov_read_counter(void)
+gcov_read_counter (void)
 {
-	gcov_type value;
-	const gcov_unsigned_t *buffer = gcov_read_words(2);
+  gcov_type value;
+  const gcov_unsigned_t *buffer = gcov_read_words (2);
-	if (!buffer)
-		return 0;
-	value = from_file(buffer[0]);
-	if (sizeof(value) > sizeof(gcov_unsigned_t))
-		value |= ((gcov_type) from_file(buffer[1])) << 32;
-	else if (buffer[1])
-		gcov_var.error = -1;
+  if (!buffer)
+    return 0;
+  value = from_file (buffer[0]);
+  if (sizeof (value) > sizeof (gcov_unsigned_t))
+    value |= ((gcov_type) from_file (buffer[1])) << 32;
+  else if (buffer[1])
+    gcov_var.error = -1;
-	return value;
+  return value;
 }
+/* Mangle filename path of BASE and output new allocated pointer with
+   mangled path.  */
+
+char *
+mangle_path (char const *base)
+{
+  /* Convert '/' to '#', convert '..' to '^',
+     convert ':' to '~' on DOS based file system.  */
+  const char *probe;
+  char *buffer = (char *)xmalloc (strlen (base) + 1);
+  char *ptr = buffer;
+
+#if HAVE_DOS_BASED_FILE_SYSTEM
+  if (base[0] && base[1] == ':')
+    {
+      ptr[0] = base[0];
+      ptr[1] = '~';
+      ptr += 2;
+      base += 2;
+    }
+#endif
+  for (; *base; base = probe)
+    {
+      size_t len;
+
+      for (probe = base; *probe; probe++)
+	if (*probe == '/')
+	  break;
+      len = probe - base;
+      if (len == 2 && base[0] == '.' && base[1] == '.')
+	*ptr++ = '^';
+      else
+	{
+	  memcpy (ptr, base, len);
+	  ptr += len;
+	}
+      if (*probe)
+	{
+	  *ptr++ = '#';
+	  probe++;
+	}
+    }
+
+  /* Terminate the string.  */
+  *ptr = '\0';
+
+  return buffer;
+}
+
+/* We need to expose the below function when compiling for gcov-tool.  */
+
+#if !IN_LIBGCOV || defined (IN_GCOV_TOOL)
 /* Read string from coverage file. Returns a pointer to a static
    buffer, or NULL on empty string. You must copy the string before
    calling another gcov function.  */
-#if !IN_LIBGCOV
 GCOV_LINKAGE const char *
-gcov_read_string(void)
+gcov_read_string (void)
 {
-	unsigned int length = gcov_read_unsigned();
+  unsigned length = gcov_read_unsigned ();
-	if (!length)
-		return 0;
+  if (!length)
+    return 0;
-	return (const char *) gcov_read_words(length);
+  return (const char *) gcov_read_words (length);
 }
 #endif
GCOV_LINKAGE void
-gcov_read_summary(struct gcov_summary *summary)
+gcov_read_summary (struct gcov_summary *summary)
 {
-	unsigned int ix;
-	struct gcov_ctr_summary *csum;
-
-	summary->checksum = gcov_read_unsigned();
-	for (csum = summary->ctrs, ix = GCOV_COUNTERS_SUMMABLE; ix--; csum++) {
-		csum->num = gcov_read_unsigned();
-		csum->runs = gcov_read_unsigned();
-		csum->sum_all = gcov_read_counter();
-		csum->run_max = gcov_read_counter();
-		csum->sum_max = gcov_read_counter();
-	}
+  summary->runs = gcov_read_unsigned ();
+  summary->sum_max = gcov_read_unsigned ();
 }
-#if !IN_LIBGCOV
+/* We need to expose the below function when compiling for gcov-tool.  */
+
+#if !IN_LIBGCOV || defined (IN_GCOV_TOOL)
 /* Reset to a known position.  BASE should have been obtained from
    gcov_position, LENGTH should be a record length.  */
GCOV_LINKAGE void
-gcov_sync(gcov_position_t base, gcov_unsigned_t length)
+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;
-	else {
-		gcov_var.offset = gcov_var.length = 0;
-		fseek(gcov_var.file, base << 2, SEEK_SET);
-		gcov_var.start = ftell(gcov_var.file) >> 2;
-	}
+  gcov_nonruntime_assert (gcov_var.mode > 0);
+  base += length;
+  if (base - gcov_var.start <= gcov_var.length)
+    gcov_var.offset = base - gcov_var.start;
+  else
+    {
+      gcov_var.offset = gcov_var.length = 0;
+      fseek (gcov_var.file, base << 2, SEEK_SET);
+      gcov_var.start = ftell (gcov_var.file) >> 2;
+    }
 }
 #endif
@@ -506,13 +639,12 @@
 /* Move to a given position in a gcov file.  */
GCOV_LINKAGE void
-gcov_seek(gcov_position_t base)
+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);
-	gcov_var.start = ftell(gcov_var.file) >> 2;
+  if (gcov_var.offset)
+    gcov_write_block (gcov_var.offset);
+  fseek (gcov_var.file, base << 2, SEEK_SET);
+  gcov_var.start = ftell (gcov_var.file) >> 2;
 }
 #endif
@@ -520,13 +652,13 @@
 /* Return the modification time of the current gcov file.  */
GCOV_LINKAGE time_t
-gcov_time(void)
+gcov_time (void)
 {
-	struct stat status;
+  struct stat status;
-	if (fstat(fileno(gcov_var.file), &status))
-		return 0;
-	else
-		return status.st_mtime;
+  if (fstat (fileno (gcov_var.file), &status))
+    return 0;
+  else
+    return status.st_mtime;
 }
 #endif /* IN_GCOV */
diff --git a/src/lib/gcov-io.h b/src/lib/gcov-io.h
index 4c0b2e4..531d300 100644
--- a/src/lib/gcov-io.h
+++ b/src/lib/gcov-io.h
@@ -1,6 +1,5 @@
 /* File format for coverage information
-   Copyright (C) 1996, 1997, 1998, 2000, 2002,
-   2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1996-2020 Free Software Foundation, Inc.
    Contributed by Bob Manson manson@cygnus.com.
    Completely remangled by Nathan Sidwell nathan@codesourcery.com.
@@ -19,7 +18,11 @@
 Under Section 7 of GPL version 3, you are granted additional
 permissions described in the GCC Runtime Library Exception, version
 3.1, as published by the Free Software Foundation.
-*/
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+http://www.gnu.org/licenses/.  */
/* Coverage information is held in two files.  A notes file, which is
@@ -39,15 +42,19 @@
    string. Zero length and NULL strings are simply stored as a length
    of zero (they have no trailing NUL or padding).
-	int32:  byte3 byte2 byte1 byte0 | byte0 byte1 byte2 byte3
+   	int32:  byte3 byte2 byte1 byte0 | byte0 byte1 byte2 byte3
    int64:  int32:low int32:high
    string: int32:0 | int32:length char* char:0 padding
    padding: | char:0 | char:0 char:0 | char:0 char:0 char:0
    item: int32 | int64 | string
-   The basic format of the files is
+   The basic format of the notes file is
-	file : int32:magic int32:version int32:stamp record*
+	file : int32:magic int32:version int32:stamp int32:support_unexecuted_blocks record*
+
+   The basic format of the data file is
+
+   	file : int32:magic int32:version int32:stamp record*
The magic ident is different for the notes and the data files.  The
    magic ident is used to determine the endianness of the file, when
@@ -60,23 +67,23 @@
Although the ident and version are formally 32 bit numbers, they
    are derived from 4 character ASCII strings.  The version number
-   consists of the single character major version number, a two
-   character minor version number (leading zero for versions less than
-   10), and a single character indicating the status of the release.
+   consists of a two character major version number
+   (first digit starts from 'A' letter to not to clash with the older
+   numbering scheme), the single character minor version number,
+   and a single character indicating the status of the release.
    That will be 'e' experimental, 'p' prerelease and 'r' for release.
    Because, by good fortune, these are in alphabetical order, string
    collating can be used to compare version strings.  Be aware that
    the 'e' designation will (naturally) be unstable and might be
-   incompatible with itself.  For gcc 3.4 experimental, it would be
-   '304e' (0x33303465).  When the major version reaches 10, the
-   letters A-Z will be used.  Assuming minor increments releases every
-   6 months, we have to make a major increment every 50 years.
-   Assuming major increments releases every 5 years, we're ok for the
-   next 155 years -- good enough for me.
+   incompatible with itself.  For gcc 17.0 experimental, it would be
+   'B70e' (0x42373065).  As we currently do not release more than 5 minor
+   releases, the single character should be always fine.  Major number
+   is currently changed roughly every year, which gives us space
+   for next 250 years (maximum allowed number would be 259.9).
A record has a tag, length and variable amount of data.
-	record: header data
+   	record: header data
    header: int32:tag int32:length
    data: item*
@@ -95,18 +102,18 @@
    tags, values [41..9f] for the notes file and [a1..ff] for the data
    file.
-   The basic block graph file contains the following records
-	note: unit function-graph*
+   The notes file contains the following records
+   	note: unit function-graph*
    unit: header int32:checksum string:source
    function-graph: announce_function basic_blocks {arcs | lines}*
    announce_function: header int32:ident
    	int32:lineno_checksum int32:cfg_checksum
-		string:name string:source int32:lineno
+		string:name string:source int32:start_lineno int32:start_column int32:end_lineno
    basic_block: header int32:flags*
    arcs: header int32:block_no arc*
    arc:  int32:dest_block int32:flags
-	lines: header int32:block_no line*
-		int32:0 string:NULL
+        lines: header int32:block_no line*
+               int32:0 string:NULL
    line:  int32:line_no | int32:0 string:filename
The BASIC_BLOCK record holds per-bb flags.  The number of blocks
@@ -126,16 +133,14 @@
    blocks they are for.
The data file contains the following records.
-	data: {unit summary:object summary:program* function-data*}*
+	data: {unit summary:object function-data*}*
    unit: header int32:checksum
    function-data:	announce_function present counts
    announce_function: header int32:ident
    	int32:lineno_checksum int32:cfg_checksum
    present: header int32:present
    counts: header int64:count*
-	summary: int32:checksum {count-summary}GCOV_COUNTERS_SUMMABLE
-	count-summary:	int32:num int32:runs int64:sum
-			int64:max int64:sum_max
+	summary: int32:checksum int32:runs int32:sum_max
The ANNOUNCE_FUNCTION record is the same as that in the note file,
    but without the source location.  The COUNTS gives the
@@ -177,114 +182,42 @@
 #endif
 #endif /* __COREBOOT__ */
-#if IN_LIBGCOV
-/* About the target */
-
-#if BITS_PER_UNIT == 8
-typedef unsigned int gcov_unsigned_t __attribute__((mode(SI)));
-typedef unsigned int gcov_position_t __attribute__((mode(SI)));
-#if LONG_LONG_TYPE_SIZE > 32
-typedef signed gcov_type __attribute__((mode(DI)));
-#else
-typedef signed gcov_type __attribute__((mode(SI)));
-#endif
-#else
-#if BITS_PER_UNIT == 16
-typedef unsigned int gcov_unsigned_t __attribute__((mode(HI)));
-typedef unsigned int gcov_position_t __attribute__((mode(HI)));
-#if LONG_LONG_TYPE_SIZE > 32
-typedef signed gcov_type __attribute__((mode(SI)));
-#else
-typedef signed gcov_type __attribute__((mode(HI)));
-#endif
-#else
-typedef unsigned int gcov_unsigned_t __attribute__((mode(QI)));
-typedef unsigned int gcov_position_t __attribute__((mode(QI)));
-#if LONG_LONG_TYPE_SIZE > 32
-typedef signed gcov_type __attribute__((mode(HI)));
-#else
-typedef signed gcov_type __attribute__((mode(QI)));
-#endif
-#endif
-#endif
-
-
-#if defined(TARGET_POSIX_IO)
-#define GCOV_LOCKED 1
-#else
-#define GCOV_LOCKED 0
-#endif
-
-#else /* !IN_LIBGCOV */
+#ifndef IN_LIBGCOV
 /* About the host */
-typedef unsigned int gcov_unsigned_t;
-typedef unsigned int gcov_position_t;
+typedef unsigned gcov_unsigned_t;
+typedef unsigned gcov_position_t;
 /* gcov_type is typedef'd elsewhere for the compiler */
 #if IN_GCOV
 #define GCOV_LINKAGE static
-typedef HOST_WIDEST_INT gcov_type;
+typedef int64_t gcov_type;
+typedef uint64_t gcov_type_unsigned;
 #if IN_GCOV > 0
 #include <sys/types.h>
 #endif
-#else /*!IN_GCOV */
-#define GCOV_TYPE_SIZE (LONG_LONG_TYPE_SIZE > 32 ? 64 : 32)
 #endif
-#if defined(HOST_HAS_F_SETLKW)
+#if defined (HOST_HAS_F_SETLKW)
 #define GCOV_LOCKED 1
 #else
 #define GCOV_LOCKED 0
 #endif
+#define ATTRIBUTE_HIDDEN
+
 #endif /* !IN_LIBGCOV */
-/* In gcov we want function linkage to be static.  In the compiler we want
-   it extern, so that they can be accessed from elsewhere.  In libgcov we
-   need these functions to be extern, so prefix them with __gcov.  In
-   libgcov they must also be hidden so that the instance in the executable
-   is not also used in a DSO.  */
-#if IN_LIBGCOV
-
-#ifndef __COREBOOT__
-#include "tconfig.h"
-#endif /* __COREBOOT__ */
-
-#define gcov_var __gcov_var
-#define gcov_open __gcov_open
-#define gcov_close __gcov_close
-#define gcov_write_tag_length __gcov_write_tag_length
-#define gcov_position __gcov_position
-#define gcov_seek __gcov_seek
-#define gcov_rewrite __gcov_rewrite
-#define gcov_is_error __gcov_is_error
-#define gcov_write_unsigned __gcov_write_unsigned
-#define gcov_write_counter __gcov_write_counter
-#define gcov_write_summary __gcov_write_summary
-#define gcov_read_unsigned __gcov_read_unsigned
-#define gcov_read_counter __gcov_read_counter
-#define gcov_read_summary __gcov_read_summary
-
-/* Poison these, so they don't accidentally slip in.  */
-#pragma GCC poison gcov_write_string gcov_write_tag gcov_write_length
-#pragma GCC poison gcov_read_string gcov_sync gcov_time gcov_magic
-
-#ifdef HAVE_GAS_HIDDEN
-#define ATTRIBUTE_HIDDEN  __attribute__((__visibility__("hidden")))
-#else
-#define ATTRIBUTE_HIDDEN
-#endif
-
-#else
-
-#define ATTRIBUTE_HIDDEN
-
-#endif
-
 #ifndef GCOV_LINKAGE
 #define GCOV_LINKAGE extern
 #endif
+#if IN_LIBGCOV
+#define gcov_nonruntime_assert(EXPR) ((void)(0 && (EXPR)))
+#else
+#define gcov_nonruntime_assert(EXPR) gcc_assert (EXPR)
+#define gcov_error(...) fatal_error (input_location, __VA_ARGS__)
+#endif
+
 /* File suffixes.  */
 #define GCOV_DATA_SUFFIX ".gcda"
 #define GCOV_NOTE_SUFFIX ".gcno"
@@ -295,16 +228,16 @@
/* gcov-iov.h is automatically generated by the makefile from
    version.c, it looks like
-	#define GCOV_VERSION ((gcov_unsigned_t)0x89abcdef)
+   	#define GCOV_VERSION ((gcov_unsigned_t)0x89abcdef)
 */
 #include "gcov-iov.h"
/* Convert a magic or version number to a 4 character string.  */
-#define GCOV_UNSIGNED2STRING(ARRAY, VALUE)	\
-	((ARRAY)[0] = (char)((VALUE) >> 24),	\
-	(ARRAY)[1] = (char)((VALUE) >> 16),	\
-	(ARRAY)[2] = (char)((VALUE) >> 8),	\
-	(ARRAY)[3] = (char)((VALUE) >> 0))
+#define GCOV_UNSIGNED2STRING(ARRAY,VALUE)	\
+  ((ARRAY)[0] = (char)((VALUE) >> 24),		\
+   (ARRAY)[1] = (char)((VALUE) >> 16),		\
+   (ARRAY)[2] = (char)((VALUE) >> 8),		\
+   (ARRAY)[3] = (char)((VALUE) >> 0))
/* The record tags.  Values [1..3f] are for tags which may be in either
    file.  Values [41..9f] for those in the note file and [a1..ff] for
@@ -315,71 +248,57 @@
 #define GCOV_TAG_FUNCTION_LENGTH (3)
 #define GCOV_TAG_BLOCKS		 ((gcov_unsigned_t)0x01410000)
 #define GCOV_TAG_BLOCKS_LENGTH(NUM) (NUM)
-#define GCOV_TAG_BLOCKS_NUM(LENGTH) (LENGTH)
 #define GCOV_TAG_ARCS		 ((gcov_unsigned_t)0x01430000)
 #define GCOV_TAG_ARCS_LENGTH(NUM)  (1 + (NUM) * 2)
 #define GCOV_TAG_ARCS_NUM(LENGTH)  (((LENGTH) - 1) / 2)
 #define GCOV_TAG_LINES		 ((gcov_unsigned_t)0x01450000)
-#define GCOV_TAG_COUNTER_BASE	 ((gcov_unsigned_t)0x01a10000)
+#define GCOV_TAG_COUNTER_BASE 	 ((gcov_unsigned_t)0x01a10000)
 #define GCOV_TAG_COUNTER_LENGTH(NUM) ((NUM) * 2)
 #define GCOV_TAG_COUNTER_NUM(LENGTH) ((LENGTH) / 2)
-#define GCOV_TAG_OBJECT_SUMMARY  ((gcov_unsigned_t)0xa1000000) /* Obsolete */
-#define GCOV_TAG_PROGRAM_SUMMARY ((gcov_unsigned_t)0xa3000000)
-#define GCOV_TAG_SUMMARY_LENGTH  \
-	(1 + GCOV_COUNTERS_SUMMABLE * (2 + 3 * 2))
+#define GCOV_TAG_OBJECT_SUMMARY  ((gcov_unsigned_t)0xa1000000)
+#define GCOV_TAG_PROGRAM_SUMMARY ((gcov_unsigned_t)0xa3000000) /* Obsolete */
+#define GCOV_TAG_SUMMARY_LENGTH (2)
+#define GCOV_TAG_AFDO_FILE_NAMES ((gcov_unsigned_t)0xaa000000)
+#define GCOV_TAG_AFDO_FUNCTION ((gcov_unsigned_t)0xac000000)
+#define GCOV_TAG_AFDO_WORKING_SET ((gcov_unsigned_t)0xaf000000)
+
/* Counters that are collected.  */
-#define GCOV_COUNTER_ARCS	0  /* Arc transitions.  */
-#define GCOV_COUNTERS_SUMMABLE	1  /* Counters which can be
-				      summed.  */
-#define GCOV_FIRST_VALUE_COUNTER 1 /* The first of counters used for value
-				      profiling.  They must form a consecutive
-				      interval and their order must match
-				      the order of HIST_TYPEs in
-				      value-prof.h.  */
-#define GCOV_COUNTER_V_INTERVAL	1  /* Histogram of value inside an interval.  */
-#define GCOV_COUNTER_V_POW2	2  /* Histogram of exact power2 logarithm
-				      of a value.  */
-#define GCOV_COUNTER_V_SINGLE	3  /* The most common value of expression.  */
-#define GCOV_COUNTER_V_DELTA	4  /* The most common difference between
-				      consecutive values of expression.  */
-#define GCOV_COUNTER_V_INDIR	5  /* The most common indirect address */
-#define GCOV_COUNTER_AVERAGE	6  /* Compute average value passed to the
-				      counter.  */
-#define GCOV_COUNTER_IOR	7  /* IOR of the all values passed to
-				      counter.  */
-#define GCOV_LAST_VALUE_COUNTER 7  /* The last of counters used for value
-				      profiling.  */
-#define GCOV_COUNTERS		8
+#define DEF_GCOV_COUNTER(COUNTER, NAME, MERGE_FN) COUNTER,
+enum {
+#include "gcov-counter.def"
+GCOV_COUNTERS
+};
+#undef DEF_GCOV_COUNTER
+
+/* The first of counters used for value profiling.  They must form a
+   consecutive interval and their order must match the order of
+   HIST_TYPEs in value-prof.h.  */
+#define GCOV_FIRST_VALUE_COUNTER GCOV_COUNTER_V_INTERVAL
+
+/* The last of counters used for value profiling.  */
+#define GCOV_LAST_VALUE_COUNTER (GCOV_COUNTERS - 1)
/* Number of counters used for value profiling.  */
 #define GCOV_N_VALUE_COUNTERS \
-	(GCOV_LAST_VALUE_COUNTER - GCOV_FIRST_VALUE_COUNTER + 1)
+  (GCOV_LAST_VALUE_COUNTER - GCOV_FIRST_VALUE_COUNTER + 1)
-  /* A list of human readable names of the counters */
-#define GCOV_COUNTER_NAMES	{"arcs", "interval", "pow2", "single", \
-				 "delta", "indirect_call", "average", "ior"}
+/* Number of top N value histogram.  */
+#define GCOV_TOPN_VALUES 4
-  /* Names of merge functions for counters.  */
-#define GCOV_MERGE_FUNCTIONS	{"__gcov_merge_add",	\
-				 "__gcov_merge_add",	\
-				 "__gcov_merge_add",	\
-				 "__gcov_merge_single",	\
-				 "__gcov_merge_delta",  \
-				 "__gcov_merge_single", \
-				 "__gcov_merge_add",	\
-				 "__gcov_merge_ior"}
+/* Total number of single value counters.  */
+#define GCOV_TOPN_VALUES_COUNTERS (2 * GCOV_TOPN_VALUES + 1)
/* Convert a counter index to a tag.  */
 #define GCOV_TAG_FOR_COUNTER(COUNT)				\
    (GCOV_TAG_COUNTER_BASE + ((gcov_unsigned_t)(COUNT) << 17))
 /* Convert a tag to a counter.  */
 #define GCOV_COUNTER_FOR_TAG(TAG)					\
-	((unsigned int)(((TAG) - GCOV_TAG_COUNTER_BASE) >> 17))
+	((unsigned)(((TAG) - GCOV_TAG_COUNTER_BASE) >> 17))
 /* Check whether a tag is a counter tag.  */
 #define GCOV_TAG_IS_COUNTER(TAG)				\
-	(!((TAG) & 0xFFFF) && GCOV_COUNTER_FOR_TAG(TAG) < GCOV_COUNTERS)
+	(!((TAG) & 0xFFFF) && GCOV_COUNTER_FOR_TAG (TAG) < GCOV_COUNTERS)
/* The tag level mask has 1's in the position of the inner levels, &
    the lsb of the current level, and zero on the current and outer
@@ -387,156 +306,31 @@
 #define GCOV_TAG_MASK(TAG) (((TAG) - 1) ^ (TAG))
/* Return nonzero if SUB is an immediate subtag of TAG.  */
-#define GCOV_TAG_IS_SUBTAG(TAG, SUB)				\
-	(GCOV_TAG_MASK(TAG) >> 8 == GCOV_TAG_MASK(SUB)		\
-	 && !(((SUB) ^ (TAG)) & ~GCOV_TAG_MASK(TAG)))
+#define GCOV_TAG_IS_SUBTAG(TAG,SUB)				\
+	(GCOV_TAG_MASK (TAG) >> 8 == GCOV_TAG_MASK (SUB) 	\
+	 && !(((SUB) ^ (TAG)) & ~GCOV_TAG_MASK (TAG)))
/* Return nonzero if SUB is at a sublevel to TAG.  */
-#define GCOV_TAG_IS_SUBLEVEL(TAG, SUB)				\
-	(GCOV_TAG_MASK(TAG) > GCOV_TAG_MASK(SUB))
+#define GCOV_TAG_IS_SUBLEVEL(TAG,SUB)				\
+     	(GCOV_TAG_MASK (TAG) > GCOV_TAG_MASK (SUB))
/* Basic block flags.  */
 #define GCOV_BLOCK_UNEXPECTED	(1 << 1)
/* Arc flags.  */
-#define GCOV_ARC_ON_TREE	(1 << 0)
+#define GCOV_ARC_ON_TREE 	(1 << 0)
 #define GCOV_ARC_FAKE		(1 << 1)
 #define GCOV_ARC_FALLTHROUGH	(1 << 2)
-/* Structured records.  */
-
-/* Cumulative counter data.  */
-struct gcov_ctr_summary {
-	gcov_unsigned_t num;		/* number of counters.  */
-	gcov_unsigned_t runs;		/* number of program runs */
-	gcov_type sum_all;		/* sum of all counters accumulated.  */
-	gcov_type run_max;		/* maximum value on a single run.  */
-	gcov_type sum_max;	/* sum of individual run max values.  */
-};
-
 /* Object & program summary record.  */
-struct gcov_summary {
-	gcov_unsigned_t checksum;	/* checksum of program */
-	struct gcov_ctr_summary ctrs[GCOV_COUNTERS_SUMMABLE];
-};
-/* Structures embedded in coverage program.  The structures generated
-   by write_profile must match these.  */
-
-#if IN_LIBGCOV
-/* Information about counters for a single function.  */
-struct gcov_ctr_info {
-	gcov_unsigned_t num;		/* number of counters.  */
-	gcov_type *values;		/* their values.  */
-};
-
-/* Information about a single function.  This uses the trailing array
-   idiom. The number of counters is determined from the merge pointer
-   array in gcov_info.  The key is used to detect which of a set of
-   comdat functions was selected -- it points to the gcov_info object
-   of the object file containing the selected comdat function.  */
-
-struct gcov_fn_info {
-	const struct gcov_info *key;		/* comdat key */
-	gcov_unsigned_t ident;		/* unique ident of function */
-	gcov_unsigned_t lineno_checksum;	/* function lineo_checksum */
-	gcov_unsigned_t cfg_checksum;		/* function cfg checksum */
-	struct gcov_ctr_info ctrs[0];		/* instrumented counters */
-};
-
-/* Type of function used to merge counters.  */
-typedef void (*gcov_merge_fn) (gcov_type *, gcov_unsigned_t);
-
-/* Information about a single object file.  */
-struct gcov_info {
-	gcov_unsigned_t version;	/* expected version number */
-	struct gcov_info *next;	/* link to next, used by libgcov */
-
-	gcov_unsigned_t stamp;	/* uniquifying time stamp */
-	const char *filename;		/* output file name */
-
-	gcov_merge_fn merge[GCOV_COUNTERS];  /* merge functions (null for
-						unused) */
-
-	unsigned int n_functions;		     /* number of functions */
-	const struct gcov_fn_info *const *functions; /* pointer to pointers to
-							function information  */
-};
-
-/* Register a new object file module.  */
-extern void __gcov_init(struct gcov_info *) ATTRIBUTE_HIDDEN;
-
-#ifndef __COREBOOT__
-/* Called before fork, to avoid double counting.  */
-extern void __gcov_flush(void) ATTRIBUTE_HIDDEN;
-#endif
-
-/* The merge function that just sums the counters.  */
-extern void __gcov_merge_add(gcov_type *, unsigned int) ATTRIBUTE_HIDDEN;
-
-/* The merge function to choose the most common value.  */
-extern void __gcov_merge_single(gcov_type *, unsigned int) ATTRIBUTE_HIDDEN;
-
-/* The merge function to choose the most common difference between
-   consecutive values.  */
-extern void __gcov_merge_delta(gcov_type *, unsigned int) ATTRIBUTE_HIDDEN;
-
-/* The merge function that just ors the counters together.  */
-extern void __gcov_merge_ior(gcov_type *, unsigned int) ATTRIBUTE_HIDDEN;
-
-/* The profiler functions.  */
-extern void __gcov_interval_profiler(gcov_type *, gcov_type, int, unsigned int);
-extern void __gcov_pow2_profiler(gcov_type *, gcov_type);
-extern void __gcov_one_value_profiler(gcov_type *, gcov_type);
-extern void __gcov_indirect_call_profiler(gcov_type *, gcov_type, void *,
-	void *);
-extern void __gcov_average_profiler(gcov_type *, gcov_type);
-extern void __gcov_ior_profiler(gcov_type *, gcov_type);
-
-#ifndef inhibit_libc
-/* The wrappers around some library functions..  */
-extern pid_t __gcov_fork(void) ATTRIBUTE_HIDDEN;
-extern int __gcov_execl(const char *, char *, ...) ATTRIBUTE_HIDDEN;
-extern int __gcov_execlp(const char *, char *, ...) ATTRIBUTE_HIDDEN;
-extern int __gcov_execle(const char *, char *, ...) ATTRIBUTE_HIDDEN;
-extern int __gcov_execv(const char *, char *const []) ATTRIBUTE_HIDDEN;
-extern int __gcov_execvp(const char *, char *const []) ATTRIBUTE_HIDDEN;
-extern int __gcov_execve(const char *, char  *const [], char *const [])
-	ATTRIBUTE_HIDDEN;
-#endif
-
-#endif /* IN_LIBGCOV */
-
-#if IN_LIBGCOV >= 0
-
-/* Optimum number of gcov_unsigned_t's read from or written to disk.  */
-#define GCOV_BLOCK_SIZE (1 << 10)
-
-GCOV_LINKAGE struct gcov_var
+struct gcov_summary
 {
-	FILE *file;
-	gcov_position_t start;	/* Position of first byte of block */
-	unsigned int offset;	/* Read/write position within the block.  */
-	unsigned int length;	/* Read limit in the block.  */
-	unsigned int overread;	/* Number of words overread.  */
-	int error;		/* < 0 overflow, > 0 disk error.  */
-	int mode;		/* < 0 writing, > 0 reading */
-#if IN_LIBGCOV
-	/* Holds one block plus 4 bytes, thus all coverage reads & writes
-	 * fit within this buffer and we always can transfer GCOV_BLOCK_SIZE
-	 * to and from the disk. libgcov never backtracks and only writes 4
-	 * or 8 byte objects.
-	 */
-	gcov_unsigned_t buffer[GCOV_BLOCK_SIZE + 1];
-#else
-	int endian;			/* Swap endianness.  */
-	/* Holds a variable length block, as the compiler can write
-	 * strings and needs to backtrack.
-	 */
-	size_t alloc;
-	gcov_unsigned_t *buffer;
-#endif
-} gcov_var ATTRIBUTE_HIDDEN;
+  gcov_unsigned_t runs;		/* Number of program runs.  */
+  gcov_type sum_max;    	/* Sum of individual run max values.  */
+};
+
+#if !defined(inhibit_libc)
/* Functions for reading and writing gcov files. In libgcov you can
    open the file for reading then writing. Elsewhere you can open the
@@ -547,87 +341,40 @@
    you use the functions for reading, then gcov_rewrite then the
    functions for writing.  Your file may become corrupted if you break
    these invariants.  */
-#if IN_LIBGCOV
-GCOV_LINKAGE int gcov_open(const char */*name*/) ATTRIBUTE_HIDDEN;
-#else
-GCOV_LINKAGE int gcov_open(const char */*name*/, int /*direction*/);
-GCOV_LINKAGE int gcov_magic(gcov_unsigned_t, gcov_unsigned_t);
+
+#if !IN_LIBGCOV
+GCOV_LINKAGE int gcov_open (const char */*name*/, int /*direction*/);
+GCOV_LINKAGE int gcov_magic (gcov_unsigned_t, gcov_unsigned_t);
 #endif
-GCOV_LINKAGE int gcov_close(void) ATTRIBUTE_HIDDEN;
/* Available everywhere.  */
-static gcov_position_t gcov_position(void);
-static int gcov_is_error(void);
-
-GCOV_LINKAGE gcov_unsigned_t gcov_read_unsigned(void) ATTRIBUTE_HIDDEN;
-GCOV_LINKAGE gcov_type gcov_read_counter(void) ATTRIBUTE_HIDDEN;
-GCOV_LINKAGE void gcov_read_summary(struct gcov_summary *) ATTRIBUTE_HIDDEN;
-
-#if IN_LIBGCOV
-/* Available only in libgcov */
-GCOV_LINKAGE void gcov_write_counter(gcov_type) ATTRIBUTE_HIDDEN;
-GCOV_LINKAGE void gcov_write_tag_length(gcov_unsigned_t, gcov_unsigned_t)
-	ATTRIBUTE_HIDDEN;
-GCOV_LINKAGE void gcov_write_summary(gcov_unsigned_t /*tag*/,
-				      const struct gcov_summary *)
-	ATTRIBUTE_HIDDEN;
-static void gcov_rewrite(void);
-GCOV_LINKAGE void gcov_seek(gcov_position_t /*position*/) ATTRIBUTE_HIDDEN;
-#else
-/* Available outside libgcov */
-GCOV_LINKAGE const char *gcov_read_string(void);
-GCOV_LINKAGE void gcov_sync(gcov_position_t /*base*/,
+GCOV_LINKAGE int gcov_close (void) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE gcov_unsigned_t gcov_read_unsigned (void) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE gcov_type gcov_read_counter (void) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE void gcov_read_summary (struct gcov_summary *) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE const char *gcov_read_string (void);
+GCOV_LINKAGE void gcov_sync (gcov_position_t /*base*/,
    		     gcov_unsigned_t /*length */);
-#endif
+char *mangle_path (char const *base);
#if !IN_GCOV
 /* Available outside gcov */
-GCOV_LINKAGE void gcov_write_unsigned(gcov_unsigned_t) ATTRIBUTE_HIDDEN;
+GCOV_LINKAGE void gcov_write_unsigned (gcov_unsigned_t) ATTRIBUTE_HIDDEN;
 #endif
#if !IN_GCOV && !IN_LIBGCOV
 /* Available only in compiler */
-GCOV_LINKAGE void gcov_write_string(const char *);
-GCOV_LINKAGE gcov_position_t gcov_write_tag(gcov_unsigned_t);
-GCOV_LINKAGE void gcov_write_length(gcov_position_t /*position*/);
+GCOV_LINKAGE void gcov_write_string (const char *);
+GCOV_LINKAGE void gcov_write_filename (const char *);
+GCOV_LINKAGE gcov_position_t gcov_write_tag (gcov_unsigned_t);
+GCOV_LINKAGE void gcov_write_length (gcov_position_t /*position*/);
 #endif
#if IN_GCOV > 0
 /* Available in gcov */
-GCOV_LINKAGE time_t gcov_time(void);
+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;
-}
-
-/* Return nonzero if the error flag is set.  */
-
-static inline int
-gcov_is_error(void)
-{
-	return gcov_var.file ? gcov_var.error : 1;
-}
-
-#if IN_LIBGCOV
-/* Move to beginning of file and initialize for writing.  */
-
-static inline void
-gcov_rewrite(void)
-{
-	gcc_assert(gcov_var.mode > 0);
-	gcov_var.mode = -1;
-	gcov_var.start = 0;
-	gcov_var.offset = 0;
-	fseek(gcov_var.file, 0L, SEEK_SET);
-}
-#endif
-
-#endif /* IN_LIBGCOV >= 0 */
+#endif /* !inhibit_libc  */
#endif /* GCC_GCOV_IO_H */
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/40013
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iacdbd3ad563e13aea0718689bc4f6e5ac6a80cfc
Gerrit-Change-Number: 40013
Gerrit-PatchSet: 1
Gerrit-Owner: HAOUAS Elyes ehaouas@noos.fr
Gerrit-MessageType: newchange



    