X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Flibgcov.c;h=af3d9cfba63d6e9106de37f6282c85d15a16d3e8;hb=3882b9ba53d8861b347334c1f066dfdbdf295810;hp=8b478a7707c4fa6431874093e6a2bfee22a1f064;hpb=0dfbb9e09d99b4f74de3cefc3c8b210d2b6f5f7d;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/libgcov.c b/gcc/libgcov.c index 8b478a7707c..af3d9cfba63 100644 --- a/gcc/libgcov.c +++ b/gcc/libgcov.c @@ -1,33 +1,29 @@ /* Routines required for instrumenting a program. */ /* Compile this one with gcc. */ /* Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 + Free Software Foundation, Inc. This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later +Software Foundation; either version 3, or (at your option) any later version. -In addition to the permissions in the GNU General Public License, the -Free Software Foundation gives you unlimited permission to link the -compiled version of this file into combinations with other programs, -and to distribute those combinations without any restriction coming -from the use of this file. (The General Public License restrictions -do apply in other respects; for example, they cover modification of -the file, and distribution when not linked into a combine -executable.) - GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +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 +. */ #include "tconfig.h" #include "tsystem.h" @@ -91,8 +87,9 @@ static gcov_unsigned_t gcov_crc32; /* Size of the longest file name. */ static size_t gcov_max_filename = 0; -/* Make sure path compenent of the given FILENAME exists, create - missing directories. FILENAME must be writable. +#ifdef TARGET_POSIX_IO +/* Make sure path component of the given FILENAME exists, create + missing directories. FILENAME must be writable. Returns zero on success, or -1 if an error occurred. */ static int @@ -117,17 +114,18 @@ create_file_directory (char *filename) *s = sep; return -1; }; - + *s = sep; }; return 0; } +#endif /* Check if VERSION of the info block PTR matches libgcov one. Return 1 on success, or zero in case of versions mismatch. - If FILENAME is not NULL, its value used for reporting purposes + If FILENAME is not NULL, its value used for reporting purposes instead of value from the info block. */ - + static int gcov_version (struct gcov_info *ptr, gcov_unsigned_t version, const char *filename) @@ -138,7 +136,7 @@ gcov_version (struct gcov_info *ptr, gcov_unsigned_t version, GCOV_UNSIGNED2STRING (v, version); GCOV_UNSIGNED2STRING (e, GCOV_VERSION); - + fprintf (stderr, "profiling:%s:Version mismatch - expected %.4s got %.4s\n", filename? filename : ptr->filename, e, v); @@ -205,20 +203,22 @@ gcov_exit (void) if (gcov_prefix_strip < 0) gcov_prefix_strip = 0; } - + prefix_length = strlen(gcov_prefix); - /* Remove an unneccesary trailing '/' */ + /* Remove an unnecessary trailing '/' */ if (IS_DIR_SEPARATOR (gcov_prefix[prefix_length - 1])) prefix_length--; } - + else + prefix_length = 0; + /* Allocate and initialize the filename scratch space. */ - gi_filename = alloca (prefix_length + gcov_max_filename + 1); + gi_filename = (char *) alloca (prefix_length + gcov_max_filename + 1); if (prefix_length) memcpy (gi_filename, gcov_prefix, prefix_length); gi_filename_up = gi_filename + prefix_length; - + /* Now merge each file. */ for (gi_ptr = gcov_list; gi_ptr; gi_ptr = gi_ptr->next) { @@ -236,8 +236,8 @@ gcov_exit (void) memset (&this_object, 0, sizeof (this_object)); memset (&object, 0, sizeof (object)); - - /* Build relocated filename, stripping off leading + + /* Build relocated filename, stripping off leading directories from the initial filename if requested. */ if (gcov_prefix_strip > 0) { @@ -294,9 +294,10 @@ gcov_exit (void) fi_stride += __alignof__ (struct gcov_fn_info) - 1; fi_stride &= ~(__alignof__ (struct gcov_fn_info) - 1); } - + if (!gcov_open (gi_filename)) { +#ifdef TARGET_POSIX_IO /* Open failed likely due to missed directory. Create directory and retry to open file. */ if (create_file_directory (gi_filename)) @@ -304,6 +305,7 @@ gcov_exit (void) fprintf (stderr, "profiling:%s:Skip\n", gi_filename); continue; } +#endif if (!gcov_open (gi_filename)) { fprintf (stderr, "profiling:%s:Cannot open\n", gi_filename); @@ -329,7 +331,7 @@ gcov_exit (void) if (length != gi_ptr->stamp) /* Read from a different compilation. Overwrite the file. */ goto rewrite; - + /* Merge execution counts for each function. */ for (f_ix = 0; f_ix < gi_ptr->n_functions; f_ix++) { @@ -358,10 +360,10 @@ gcov_exit (void) if (!((1 << t_ix) & gi_ptr->ctr_mask)) continue; - + n_counts = fi_ptr->n_ctrs[c_ix]; merge = gi_ptr->counts[c_ix].merge; - + tag = gcov_read_unsigned (); length = gcov_read_unsigned (); if (tag != GCOV_TAG_FOR_COUNTER (t_ix) @@ -380,7 +382,7 @@ gcov_exit (void) while (1) { int is_program; - + eof_pos = gcov_position (); tag = gcov_read_unsigned (); if (!tag) @@ -402,11 +404,11 @@ gcov_exit (void) } } goto rewrite; - + read_error:; fprintf (stderr, error < 0 ? "profiling:%s:Overflow merging\n" : "profiling:%s:Error merging\n", gi_filename); - + read_fatal:; gcov_close (); continue; @@ -436,7 +438,7 @@ gcov_exit (void) if (cs_obj->run_max < cs_tobj->run_max) cs_obj->run_max = cs_tobj->run_max; cs_obj->sum_max += cs_tobj->run_max; - + if (!cs_prg->runs++) cs_prg->num = cs_tprg->num; else if (cs_prg->num != cs_tprg->num) @@ -448,7 +450,7 @@ gcov_exit (void) } else if (cs_obj->num || cs_prg->num) goto read_mismatch; - + if (!cs_all->runs && cs_prg->runs) memcpy (cs_all, cs_prg, sizeof (*cs_all)); else if (!all.checksum @@ -461,7 +463,7 @@ gcov_exit (void) all.checksum = ~0u; } } - + c_ix = 0; for (t_ix = 0; t_ix < GCOV_COUNTERS; t_ix++) if ((1 << t_ix) & gi_ptr->ctr_mask) @@ -471,11 +473,11 @@ gcov_exit (void) } program.checksum = gcov_crc32; - + /* Write out the data. */ gcov_write_tag_length (GCOV_DATA_MAGIC, GCOV_VERSION); gcov_write_unsigned (gi_ptr->stamp); - + /* Write execution counts for each function. */ for (f_ix = 0; f_ix < gi_ptr->n_functions; f_ix++) { @@ -496,7 +498,7 @@ gcov_exit (void) continue; n_counts = fi_ptr->n_ctrs[c_ix]; - + gcov_write_tag_length (GCOV_TAG_FOR_COUNTER (t_ix), GCOV_TAG_COUNTER_LENGTH (n_counts)); c_ptr = values[c_ix]; @@ -542,7 +544,7 @@ __gcov_init (struct gcov_info *info) /* Refresh the longest file name information */ if (filename_length > gcov_max_filename) gcov_max_filename = filename_length; - + do { unsigned ix; @@ -558,12 +560,12 @@ __gcov_init (struct gcov_info *info) } } while (*ptr++); - + gcov_crc32 = crc32; - + if (!gcov_list) atexit (gcov_exit); - + info->next = gcov_list; gcov_list = info; } @@ -584,7 +586,7 @@ __gcov_flush (void) { unsigned t_ix; const struct gcov_ctr_info *ci_ptr; - + for (t_ix = 0, ci_ptr = gi_ptr->counts; t_ix != GCOV_COUNTERS; t_ix++) if ((1 << t_ix) & gi_ptr->ctr_mask) { @@ -608,13 +610,25 @@ __gcov_merge_add (gcov_type *counters, unsigned n_counters) } #endif /* L_gcov_merge_add */ +#ifdef L_gcov_merge_ior +/* The profile merging function that just adds the counters. It is given + an array COUNTERS of N_COUNTERS old counters and it reads the same number + of counters from the gcov file. */ +void +__gcov_merge_ior (gcov_type *counters, unsigned n_counters) +{ + for (; n_counters; counters++, n_counters--) + *counters |= gcov_read_counter (); +} +#endif + #ifdef L_gcov_merge_single /* The profile merging function for choosing the most common value. It is given an array COUNTERS of N_COUNTERS old counters and it reads the same number of counters from the gcov file. The counters are split into 3-tuples where the members of the tuple have meanings: - + -- the stored candidate on the most common value of the measured entity -- counter -- total number of evaluations of the value */ @@ -652,7 +666,7 @@ __gcov_merge_single (gcov_type *counters, unsigned n_counters) given an array COUNTERS of N_COUNTERS old counters and it reads the same number of counters from the gcov file. The counters are split into 4-tuples where the members of the tuple have meanings: - + -- the last value of the measured entity -- the stored candidate on the most common difference -- counter @@ -661,13 +675,13 @@ void __gcov_merge_delta (gcov_type *counters, unsigned n_counters) { unsigned i, n_measures; - gcov_type last, value, counter, all; + gcov_type value, counter, all; gcc_assert (!(n_counters % 4)); n_measures = n_counters / 4; for (i = 0; i < n_measures; i++, counters += 4) { - last = gcov_read_counter (); + /* last = */ gcov_read_counter (); value = gcov_read_counter (); counter = gcov_read_counter (); all = gcov_read_counter (); @@ -720,7 +734,6 @@ __gcov_pow2_profiler (gcov_type *counters, gcov_type value) } #endif -#ifdef L_gcov_one_value_profiler /* Tries to determine the most common value among its inputs. Checks if the value stored in COUNTERS[0] matches VALUE. If this is the case, COUNTERS[1] is incremented. If this is not the case and COUNTERS[1] is not zero, @@ -731,8 +744,8 @@ __gcov_pow2_profiler (gcov_type *counters, gcov_type value) In any case, COUNTERS[2] is incremented. */ -void -__gcov_one_value_profiler (gcov_type *counters, gcov_type value) +static inline void +__gcov_one_value_profiler_body (gcov_type *counters, gcov_type value) { if (value == counters[0]) counters[1]++; @@ -745,6 +758,53 @@ __gcov_one_value_profiler (gcov_type *counters, gcov_type value) counters[1]--; counters[2]++; } + +#ifdef L_gcov_one_value_profiler +void +__gcov_one_value_profiler (gcov_type *counters, gcov_type value) +{ + __gcov_one_value_profiler_body (counters, value); +} +#endif + +#ifdef L_gcov_indirect_call_profiler +/* Tries to determine the most common value among its inputs. */ +void +__gcov_indirect_call_profiler (gcov_type* counter, gcov_type value, + void* cur_func, void* callee_func) +{ + /* If the C++ virtual tables contain function descriptors then one + function may have multiple descriptors and we need to dereference + the descriptors to see if they point to the same function. */ + if (cur_func == callee_func + || (TARGET_VTABLE_USES_DESCRIPTORS && callee_func + && *(void **) cur_func == *(void **) callee_func)) + __gcov_one_value_profiler_body (counter, value); +} +#endif + + +#ifdef L_gcov_average_profiler +/* Increase corresponding COUNTER by VALUE. FIXME: Perhaps we want + to saturate up. */ + +void +__gcov_average_profiler (gcov_type *counters, gcov_type value) +{ + counters[0] += value; + counters[1] ++; +} +#endif + +#ifdef L_gcov_ior_profiler +/* Increase corresponding COUNTER by VALUE. FIXME: Perhaps we want + to saturate up. */ + +void +__gcov_ior_profiler (gcov_type *counters, gcov_type value) +{ + *counters |= value; +} #endif #ifdef L_gcov_fork @@ -764,7 +824,7 @@ __gcov_fork (void) that they are not lost. */ int -__gcov_execl (const char *path, const char *arg, ...) +__gcov_execl (const char *path, char *arg, ...) { va_list ap, aq; unsigned i, length; @@ -780,8 +840,8 @@ __gcov_execl (const char *path, const char *arg, ...) length++; va_end (ap); - args = alloca (length * sizeof (void *)); - args[0] = (char *) arg; + args = (char **) alloca (length * sizeof (void *)); + args[0] = arg; for (i = 1; i < length; i++) args[i] = va_arg (aq, char *); va_end (aq); @@ -795,7 +855,7 @@ __gcov_execl (const char *path, const char *arg, ...) that they are not lost. */ int -__gcov_execlp (const char *path, const char *arg, ...) +__gcov_execlp (const char *path, char *arg, ...) { va_list ap, aq; unsigned i, length; @@ -811,8 +871,8 @@ __gcov_execlp (const char *path, const char *arg, ...) length++; va_end (ap); - args = alloca (length * sizeof (void *)); - args[0] = (char *) arg; + args = (char **) alloca (length * sizeof (void *)); + args[0] = arg; for (i = 1; i < length; i++) args[i] = va_arg (aq, char *); va_end (aq); @@ -826,7 +886,7 @@ __gcov_execlp (const char *path, const char *arg, ...) that they are not lost. */ int -__gcov_execle (const char *path, const char *arg, ...) +__gcov_execle (const char *path, char *arg, ...) { va_list ap, aq; unsigned i, length; @@ -843,8 +903,8 @@ __gcov_execle (const char *path, const char *arg, ...) length++; va_end (ap); - args = alloca (length * sizeof (void *)); - args[0] = (char *) arg; + args = (char **) alloca (length * sizeof (void *)); + args[0] = arg; for (i = 1; i < length; i++) args[i] = va_arg (aq, char *); envp = va_arg (aq, char **);