#include "function.h"
#include "toplev.h"
#include "ggc.h"
-#include "target.h"
#include "coverage.h"
-#include "libfuncs.h"
#include "langhooks.h"
#include "hashtab.h"
+#include "tree-iterator.h"
+#include "cgraph.h"
#include "gcov-io.c"
if (!gcov_magic (gcov_read_unsigned (), GCOV_DATA_MAGIC))
{
- warning ("`%s' is not a gcov data file", da_file_name);
+ warning ("%qs is not a gcov data file", da_file_name);
gcov_close ();
return;
}
GCOV_UNSIGNED2STRING (v, tag);
GCOV_UNSIGNED2STRING (e, GCOV_VERSION);
- warning ("`%s' is version `%.*s', expected version `%.*s'",
+ warning ("%qs is version %q.*s, expected version %q.*s",
da_file_name, 4, v, 4, e);
gcov_close ();
return;
}
gcov_sync (offset, length);
if ((is_error = gcov_is_error ()))
- break;
- }
-
- if (!gcov_is_eof ())
- {
- error (is_error < 0 ? "`%s' has overflowed" : "`%s' is corrupted",
- da_file_name);
- htab_delete (counts_hash);
+ {
+ error (is_error < 0 ? "%qs has overflowed" : "%qs is corrupted",
+ da_file_name);
+ htab_delete (counts_hash);
+ break;
+ }
}
gcov_close ();
entry = htab_find (counts_hash, &elt);
if (!entry)
{
- warning ("no coverage for function '%s' found.", IDENTIFIER_POINTER
+ warning ("no coverage for function %qs found.", IDENTIFIER_POINTER
(DECL_ASSEMBLER_NAME (current_function_decl)));
return 0;
}
checksum = compute_checksum ();
if (entry->checksum != checksum)
{
- error ("coverage mismatch for function '%s' while reading counter '%s'.",
+ error ("coverage mismatch for function %qs while reading counter %qs.",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)),
ctr_names[counter]);
error ("checksum is %x instead of %x", entry->checksum, checksum);
}
else if (entry->summary.num != expected)
{
- error ("coverage mismatch for function '%s' while reading counter '%s'.",
+ error ("coverage mismatch for function %qs while reading counter %qs.",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl)),
ctr_names[counter]);
error ("number of counters is %d instead of %d", entry->summary.num, expected);
will make any clever transformation on it. */
char buf[20];
tree domain_tree
- = build_index_type (build_int_2 (1000, 0)); /* replaced later */
+ = build_index_type (build_int_cst (NULL_TREE, 1000)); /* replaced later */
tree gcov_type_array_type
= build_array_type (GCOV_TYPE_NODE, domain_tree);
tree_ctr_tables[counter]
enum machine_mode mode = mode_for_size (gcov_size, MODE_INT, 0);
rtx ref;
- if (no >= fn_n_ctrs[counter] - fn_b_ctrs[counter])
- abort ();
+ gcc_assert (no < fn_n_ctrs[counter] - fn_b_ctrs[counter]);
no += prg_n_ctrs[counter] + fn_b_ctrs[counter];
if (!ctr_labels[counter])
{
{
tree domain_type = TYPE_DOMAIN (TREE_TYPE (tree_ctr_tables[counter]));
- if (no >= fn_n_ctrs[counter] - fn_b_ctrs[counter])
- abort ();
+ gcc_assert (no < fn_n_ctrs[counter] - fn_b_ctrs[counter]);
no += prg_n_ctrs[counter] + fn_b_ctrs[counter];
/* "no" here is an array index, scaled to bytes later. */
- return build (ARRAY_REF, GCOV_TYPE_NODE, tree_ctr_tables[counter],
- fold_convert (domain_type, build_int_2 (no, 0)),
- TYPE_MIN_VALUE (domain_type),
- size_binop (EXACT_DIV_EXPR, TYPE_SIZE_UNIT (GCOV_TYPE_NODE),
- size_int (TYPE_ALIGN (GCOV_TYPE_NODE))));
+ return build4 (ARRAY_REF, GCOV_TYPE_NODE, tree_ctr_tables[counter],
+ fold_convert (domain_type,
+ build_int_cst (NULL_TREE, no)),
+ TYPE_MIN_VALUE (domain_type),
+ size_binop (EXACT_DIV_EXPR, TYPE_SIZE_UNIT (GCOV_TYPE_NODE),
+ size_int (TYPE_ALIGN_UNIT (GCOV_TYPE_NODE))));
}
\f
/* Generate a checksum for a string. CHKSUM is the current
{
int y;
unsigned seed;
+ int scan;
for (y = 1; y < 9; y++)
if (!(string[i + y] >= '0' && string[i + y] <= '9')
break;
if (y != 18)
continue;
- if (!sscanf (string + i + 10, "%X", &seed))
- abort ();
+ scan = sscanf (string + i + 10, "%X", &seed);
+ gcc_assert (scan);
if (seed != crc32_string (0, flag_random_seed))
continue;
string = dup = xstrdup (string);
if (bbg_file_opened > 1 && gcov_is_error ())
{
- warning ("error writing `%s'", bbg_file_name);
+ warning ("error writing %qs", bbg_file_name);
bbg_file_opened = -1;
}
TREE_CHAIN (field) = fields;
fields = field;
- array_type = build_index_type (build_int_2 (counters - 1, 0));
+ array_type = build_int_cst (NULL_TREE, counters - 1);
+ array_type = build_index_type (array_type);
array_type = build_array_type (unsigned_type_node, array_type);
/* counters */
tree array_value = NULL_TREE;
/* ident */
- value = tree_cons (fields,
- convert (unsigned_intSI_type_node,
- build_int_2 (function->ident, 0)),
- value);
+ value = tree_cons (fields, build_int_cstu (unsigned_intSI_type_node,
+ function->ident), value);
fields = TREE_CHAIN (fields);
/* checksum */
- value = tree_cons (fields,
- convert (unsigned_intSI_type_node,
- build_int_2 (function->checksum, 0)),
- value);
+ value = tree_cons (fields, build_int_cstu (unsigned_intSI_type_node,
+ function->checksum), value);
fields = TREE_CHAIN (fields);
/* counters */
for (ix = 0; ix != GCOV_COUNTERS; ix++)
if (prg_ctr_mask & (1 << ix))
{
- tree counters = convert (unsigned_type_node,
- build_int_2 (function->n_ctrs[ix], 0));
+ tree counters = build_int_cstu (unsigned_type_node,
+ function->n_ctrs[ix]);
array_value = tree_cons (NULL_TREE, counters, array_value);
}
/* counters */
value = tree_cons (fields,
- convert (unsigned_intSI_type_node,
- build_int_2 (prg_n_ctrs[counter], 0)),
+ build_int_cstu (unsigned_intSI_type_node,
+ prg_n_ctrs[counter]),
value);
fields = TREE_CHAIN (fields);
{
tree array_type;
- array_type = build_index_type (build_int_2 (prg_n_ctrs[counter] - 1, 0));
+ array_type = build_int_cstu (unsigned_type_node,
+ prg_n_ctrs[counter] - 1);
+ array_type = build_index_type (array_type);
array_type = build_array_type (TREE_TYPE (TREE_TYPE (fields)),
array_type);
field = build_decl (FIELD_DECL, NULL_TREE, unsigned_intSI_type_node);
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field, convert (unsigned_intSI_type_node,
- build_int_2 (GCOV_VERSION, 0)),
- value);
+ value = tree_cons (field, build_int_cstu (unsigned_intSI_type_node,
+ GCOV_VERSION), value);
/* next -- NULL */
field = build_decl (FIELD_DECL, NULL_TREE, build_pointer_type (const_type));
field = build_decl (FIELD_DECL, NULL_TREE, unsigned_intSI_type_node);
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field, convert (unsigned_intSI_type_node,
- build_int_2 (local_tick, 0)),
- value);
+ value = tree_cons (field, build_int_cstu (unsigned_intSI_type_node,
+ local_tick), value);
/* Filename */
string_type = build_pointer_type (build_qualified_type (char_type_node,
filename_string = build_string (filename_len + 1, filename);
if (filename != da_file_name)
free (filename);
- TREE_TYPE (filename_string) =
- build_array_type (char_type_node,
- build_index_type (build_int_2 (filename_len, 0)));
+ TREE_TYPE (filename_string) = build_array_type
+ (char_type_node, build_index_type
+ (build_int_cst (NULL_TREE, filename_len)));
value = tree_cons (field, build1 (ADDR_EXPR, string_type, filename_string),
value);
{
tree array_type;
- array_type = build_index_type (build_int_2 (n_fns - 1, 0));
+ array_type = build_index_type (build_int_cst (NULL_TREE, n_fns - 1));
array_type = build_array_type (fn_info_type, array_type);
fn_info_value = build_constructor (array_type, nreverse (fn_info_value));
TREE_CHAIN (field) = fields;
fields = field;
value = tree_cons (field,
- convert (unsigned_type_node, build_int_2 (n_fns, 0)),
+ build_int_cstu (unsigned_type_node, n_fns),
value);
/* fn_info table */
TREE_CHAIN (field) = fields;
fields = field;
value = tree_cons (field,
- convert (unsigned_type_node,
- build_int_2 (prg_ctr_mask, 0)),
+ build_int_cstu (unsigned_type_node, prg_ctr_mask),
value);
/* counters */
ctr_info_type = build_ctr_info_type ();
- ctr_info_ary_type = build_index_type (build_int_2 (n_ctr_types, 0));
+ ctr_info_ary_type = build_index_type (build_int_cst (NULL_TREE,
+ n_ctr_types));
ctr_info_ary_type = build_array_type (ctr_info_type, ctr_info_ary_type);
for (ix = 0; ix != GCOV_COUNTERS; ix++)
if (prg_ctr_mask & (1 << ix))
static void
create_coverage (void)
{
- tree gcov_info, gcov_info_value;
- char name[20];
- char *ctor_name;
- tree ctor;
- rtx gcov_info_address;
+ tree gcov_info, gcov_init, body, t;
+ char name_buf[32];
no_coverage = 1; /* Disable any further coverage. */
if (!prg_ctr_mask)
return;
- gcov_info_value = build_gcov_info ();
-
- gcov_info = build_decl (VAR_DECL, NULL_TREE, TREE_TYPE (gcov_info_value));
- DECL_INITIAL (gcov_info) = gcov_info_value;
+ t = build_gcov_info ();
+ gcov_info = build_decl (VAR_DECL, NULL_TREE, TREE_TYPE (t));
TREE_STATIC (gcov_info) = 1;
- ASM_GENERATE_INTERNAL_LABEL (name, "LPBX", 0);
- DECL_NAME (gcov_info) = get_identifier (name);
+ ASM_GENERATE_INTERNAL_LABEL (name_buf, "LPBX", 0);
+ DECL_NAME (gcov_info) = get_identifier (name_buf);
+ DECL_INITIAL (gcov_info) = t;
/* Build structure. */
assemble_variable (gcov_info, 0, 0, 0);
- /* Build the constructor function to invoke __gcov_init. */
- ctor_name = concat (IDENTIFIER_POINTER (get_file_function_name ('I')),
- "_GCOV", NULL);
- ctor = build_decl (FUNCTION_DECL, get_identifier (ctor_name),
- build_function_type (void_type_node, NULL_TREE));
- free (ctor_name);
- DECL_EXTERNAL (ctor) = 0;
-
- /* It can be a static function as long as collect2 does not have
- to scan the object file to find its ctor/dtor routine. */
- TREE_PUBLIC (ctor) = ! targetm.have_ctors_dtors;
- TREE_USED (ctor) = 1;
- DECL_RESULT (ctor) = build_decl (RESULT_DECL, NULL_TREE, void_type_node);
- DECL_UNINLINABLE (ctor) = 1;
-
- rest_of_decl_compilation (ctor, 0, 1, 0);
- announce_function (ctor);
- current_function_decl = ctor;
- make_decl_rtl (ctor, NULL);
- init_function_start (ctor);
- expand_function_start (ctor, 0);
- /* Actually generate the code to call __gcov_init. */
- gcov_info_address = force_reg (Pmode, XEXP (DECL_RTL (gcov_info), 0));
- emit_library_call (gcov_init_libfunc, LCT_NORMAL, VOIDmode, 1,
- gcov_info_address, Pmode);
-
- expand_function_end ();
- /* Create a dummy BLOCK. */
- DECL_INITIAL (ctor) = make_node (BLOCK);
- TREE_USED (DECL_INITIAL (ctor)) = 1;
-
- rest_of_compilation ();
-
- if (! quiet_flag)
- fflush (asm_out_file);
- current_function_decl = NULL_TREE;
-
- if (targetm.have_ctors_dtors)
- targetm.asm_out.constructor (XEXP (DECL_RTL (ctor), 0),
- DEFAULT_INIT_PRIORITY);
+ /* Build a decl for __gcov_init. */
+ t = build_pointer_type (TREE_TYPE (gcov_info));
+ t = build_function_type_list (void_type_node, t, NULL);
+ t = build_decl (FUNCTION_DECL, get_identifier ("__gcov_init"), t);
+ TREE_PUBLIC (t) = 1;
+ DECL_EXTERNAL (t) = 1;
+ gcov_init = t;
+
+ /* Generate a call to __gcov_init(&gcov_info). */
+ body = NULL;
+ t = build_fold_addr_expr (gcov_info);
+ t = tree_cons (NULL, t, NULL);
+ t = build_function_call_expr (gcov_init, t);
+ append_to_statement_list (t, &body);
+
+ /* Generate a constructor to run it. */
+ cgraph_build_static_cdtor ('I', body, DEFAULT_INIT_PRIORITY);
}
\f
/* Perform file-level initialization. Read in data file, generate name