From a9243bfced3137c8fc9830b7c43c4cdabc313cc6 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 26 May 2014 10:42:43 +0000 Subject: system.h: Define __STDC_FORMAT_MACROS before including inttypes.h. 2014-05-23 Richard Biener * system.h: Define __STDC_FORMAT_MACROS before including inttypes.h. * hwint.h (HOST_WIDEST_INT, HOST_BITS_PER_WIDEST_INT, HOST_WIDEST_INT_PRINT, HOST_WIDEST_INT_PRINT_DEC, HOST_WIDEST_INT_PRINT_DEC_C, HOST_WIDEST_INT_PRINT_UNSIGNED, HOST_WIDEST_INT_PRINT_HEX, HOST_WIDEST_INT_PRINT_DOUBLE_HEX, HOST_WIDEST_INT_C): Remove. (PRId64, PRIi64, PRIo64, PRIu64, PRIx64, PRIX64): Define if C99 inttypes.h is not available. * coretypes.h (gcov_type, gcov_type_unsigned): Use [u]int64_t. * gcov-io.h (gcov_type, gcov_type_unsigned): Likewise. * gcov-io.c (gcov_histo_index): Drop non-64bit hwi case. * cfgloop.h (struct niter_desc): Use uint64_t for niter field. * bitmap.c (struct bitmap_descriptor_d): Use uint64_t for counters. (struct output_info): Likewise. (print_statistics): Adjust. (dump_bitmap_statistics): Likewise. * bt-load.c (migrate_btr_defs): Print with PRId64. * cfg.c (dump_edge_info, dump_bb_info): Likewise. (MAX_SAFE_MULTIPLIER): Adjust. * cfghooks.c (dump_bb_for_graph): Print with PRId64. * cgraph.c (cgraph_redirect_edge_call_stmt_to_callee, dump_cgraph_node): Likewise. * final.c (dump_basic_block_info): Likewise. * gcov-dump.c (tag_counters, tag_summary, dump_working_sets): Likewise. * gcov.c (format_gcov): Likewise. * ipa-cp.c (good_cloning_opportunity_p): Likewise. Use int64_t for calculation. (get_clone_agg_value): Use HOST_WIDE_INT for offset. * ipa-inline.c (compute_max_insns): Use int64_t for calcuation. (inline_small_functions, dump_overall_stats, dump_inline_stats): Use PRId64 for dumping. * ipa-profile.c (dump_histogram, ipa_profile): Likewise. * ira-color.c (struct allocno_hard_regs): Use int64_t for cost. (add_allocno_hard_regs): Adjust. * loop-doloop.c (doloop_modify): Print using PRId64. * loop-iv.c (inverse): Compute in uint64_t. (determine_max_iter, iv_number_of_iterations): Likewise. * loop-unroll.c (decide_peel_completely, decide_peel_simple): Print using PRId64. * lto-streamer-out.c (write_symbol): Use uint64_t. * mcf.c (CAP_INFINITY): Use int64_t maximum. (dump_fixup_edge, create_fixup_graph, cancel_negative_cycle, find_max_flow, adjust_cfg_counts): Use int64_t and dump with PRId64. * modulo-sched.c (const_iteration_count): Use int64_t. (sms_schedule): Dump using PRId64. * predict.c (dump_prediction): Likewise. * pretty-print.h (pp_widest_integer): Remove. * profile.c (get_working_sets, is_edge_inconsistent, is_inconsistent, read_profile_edge_counts): Dump using PRId64. * tree-pretty-print.c (pp_double_int): Remove case handling HOST_BITS_PER_DOUBLE_INT == HOST_BITS_PER_WIDEST_INT. * tree-ssa-math-opts.c (struct symbolic_number): Use uint64_t and adjust users. (pass_optimize_bswap::execute): Remove restriction on hosts. * tree-streamer-in.c (streamer_alloc_tree): Use HOST_WIDE_INT. * tree-streamer-out.c (streamer_write_tree_header): Likewise. * tree.c (widest_int_cst_value): Remove. * tree.h (widest_int_cst_value): Likewise. * value-prof.c (dump_histogram_value): Print using PRId64. * gengtype.c (main): Also inject int64_t. * ggc-page.c (struct max_alignment): Use int64_t. * alloc-pool.c (struct allocation_object_def): Likewise. * ira-conflicts.c (build_conflict_bit_table): Use uint64_t for computation. * doc/tm.texi.in: Remove reference to HOST_WIDEST_INT. * doc/tm.texi: Regenerated. * gengtype-lex.l (IWORD): Handle [u]int64_t. * config/sh/sh.c (expand_cbranchdi4): Use gcov_type. * config/mmix/mmix-protos.h (mmix_intval, mmix_shiftable_wyde_value, mmix_output_register_setting): Use [u]int64_t in prototypes. * config/mmix/mmix.c (mmix_print_operand, mmix_output_register_setting, mmix_shiftable_wyde_value, mmix_output_shiftvalue_op_from_str, mmix_output_octa, mmix_output_shifted_value): Adjust. (mmix_intval): Adjust. Remove unreachable case. * config/mmix/mmix.md (*nonlocal_goto_receiver_expanded): Use int64_t. lto/ * lto.c (lto_parse_hex): Use int64_t. (lto_resolution_read): Likewise. From-SVN: r210931 --- gcc/mcf.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'gcc/mcf.c') diff --git a/gcc/mcf.c b/gcc/mcf.c index 9a76639..70909235 100644 --- a/gcc/mcf.c +++ b/gcc/mcf.c @@ -51,7 +51,7 @@ along with GCC; see the file COPYING3. If not see #include "dumpfile.h" /* CAP_INFINITY: Constant to represent infinite capacity. */ -#define CAP_INFINITY INTTYPE_MAXIMUM (HOST_WIDEST_INT) +#define CAP_INFINITY INTTYPE_MAXIMUM (int64_t) /* COST FUNCTION. */ #define K_POS(b) ((b)) @@ -203,12 +203,12 @@ dump_fixup_edge (FILE *file, fixup_graph_type *fixup_graph, fixup_edge_p fedge) if (fedge->type) { - fprintf (file, "flow/capacity=" HOST_WIDEST_INT_PRINT_DEC "/", + fprintf (file, "flow/capacity=%"PRId64 "/", fedge->flow); if (fedge->max_capacity == CAP_INFINITY) fputs ("+oo,", file); else - fprintf (file, "" HOST_WIDEST_INT_PRINT_DEC ",", fedge->max_capacity); + fprintf (file, "%"PRId64 ",", fedge->max_capacity); } if (fedge->is_rflow_valid) @@ -216,10 +216,10 @@ dump_fixup_edge (FILE *file, fixup_graph_type *fixup_graph, fixup_edge_p fedge) if (fedge->rflow == CAP_INFINITY) fputs (" rflow=+oo.", file); else - fprintf (file, " rflow=" HOST_WIDEST_INT_PRINT_DEC ",", fedge->rflow); + fprintf (file, " rflow=%"PRId64 ",", fedge->rflow); } - fprintf (file, " cost=" HOST_WIDEST_INT_PRINT_DEC ".", fedge->cost); + fprintf (file, " cost=%"PRId64 ".", fedge->cost); fprintf (file, "\t(%d->%d)", fedge->src, fedge->dest); @@ -626,9 +626,9 @@ create_fixup_graph (fixup_graph_type *fixup_graph) if (dump_file) { fprintf (dump_file, "\nAdjust supply and demand:\n"); - fprintf (dump_file, "supply_value=" HOST_WIDEST_INT_PRINT_DEC "\n", + fprintf (dump_file, "supply_value=%"PRId64 "\n", supply_value); - fprintf (dump_file, "demand_value=" HOST_WIDEST_INT_PRINT_DEC "\n", + fprintf (dump_file, "demand_value=%"PRId64 "\n", demand_value); } @@ -898,10 +898,10 @@ cancel_negative_cycle (fixup_graph_type *fixup_graph, { fprintf (dump_file, "%d", cycle[k]); fprintf (dump_file, - ": (" HOST_WIDEST_INT_PRINT_DEC ", " HOST_WIDEST_INT_PRINT_DEC + ": (%"PRId64 ", %"PRId64 ")\n", sum_cost, cycle_flow); fprintf (dump_file, - "Augment cycle with " HOST_WIDEST_INT_PRINT_DEC "\n", + "Augment cycle with %"PRId64 "\n", cycle_flow); } @@ -1093,10 +1093,10 @@ find_max_flow (fixup_graph_type *fixup_graph, int source, int sink) fprintf (dump_file, "<-"); } fprintf (dump_file, - "ENTRY (path_capacity=" HOST_WIDEST_INT_PRINT_DEC ")\n", + "ENTRY (path_capacity=%"PRId64 ")\n", increment); fprintf (dump_file, - "Network flow is " HOST_WIDEST_INT_PRINT_DEC ".\n", + "Network flow is %"PRId64 ".\n", max_flow); } } @@ -1133,7 +1133,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) /* Fixup BB. */ if (dump_file) fprintf (dump_file, - "BB%d: " HOST_WIDEST_INT_PRINT_DEC "", bb->index, bb->count); + "BB%d: %"PRId64 "", bb->index, bb->count); pfedge = find_fixup_edge (fixup_graph, i, i + 1); if (pfedge->flow) @@ -1141,7 +1141,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) bb->count += pfedge->flow; if (dump_file) { - fprintf (dump_file, " + " HOST_WIDEST_INT_PRINT_DEC "(", + fprintf (dump_file, " + %"PRId64 "(", pfedge->flow); print_edge (dump_file, fixup_graph, i, i + 1); fprintf (dump_file, ")"); @@ -1156,7 +1156,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) bb->count -= pfedge_n->flow; if (dump_file) { - fprintf (dump_file, " - " HOST_WIDEST_INT_PRINT_DEC "(", + fprintf (dump_file, " - %"PRId64 "(", pfedge_n->flow); print_edge (dump_file, fixup_graph, i + 1, pfedge->norm_vertex_index); @@ -1164,7 +1164,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) } } if (dump_file) - fprintf (dump_file, " = " HOST_WIDEST_INT_PRINT_DEC "\n", bb->count); + fprintf (dump_file, " = %"PRId64 "\n", bb->count); /* Fixup edge. */ FOR_EACH_EDGE (e, ei, bb->succs) @@ -1175,7 +1175,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) j = 2 * e->dest->index; if (dump_file) - fprintf (dump_file, "%d->%d: " HOST_WIDEST_INT_PRINT_DEC "", + fprintf (dump_file, "%d->%d: %"PRId64 "", bb->index, e->dest->index, e->count); pfedge = find_fixup_edge (fixup_graph, i + 1, j); @@ -1188,7 +1188,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) e->count += pfedge->flow; if (dump_file) { - fprintf (dump_file, " + " HOST_WIDEST_INT_PRINT_DEC "(", + fprintf (dump_file, " + %"PRId64 "(", pfedge->flow); print_edge (dump_file, fixup_graph, i + 1, j); fprintf (dump_file, ")"); @@ -1203,7 +1203,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) e->count -= pfedge_n->flow; if (dump_file) { - fprintf (dump_file, " - " HOST_WIDEST_INT_PRINT_DEC "(", + fprintf (dump_file, " - %"PRId64 "(", pfedge_n->flow); print_edge (dump_file, fixup_graph, j, pfedge->norm_vertex_index); @@ -1223,7 +1223,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) if (dump_file) { fprintf (dump_file, "(self edge)"); - fprintf (dump_file, " + " HOST_WIDEST_INT_PRINT_DEC "(", + fprintf (dump_file, " + %"PRId64 "(", pfedge_n->flow); print_edge (dump_file, fixup_graph, i + 1, pfedge->norm_vertex_index); @@ -1234,7 +1234,7 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) if (bb->count) e->probability = REG_BR_PROB_BASE * e->count / bb->count; if (dump_file) - fprintf (dump_file, " = " HOST_WIDEST_INT_PRINT_DEC "\t(%.1f%%)\n", + fprintf (dump_file, " = %"PRId64 "\t(%.1f%%)\n", e->count, e->probability * 100.0 / REG_BR_PROB_BASE); } } @@ -1287,14 +1287,14 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) || (bb->count != sum_edge_counts (bb->succs))) { fprintf (dump_file, - "BB%d(" HOST_WIDEST_INT_PRINT_DEC ") **INVALID**: ", + "BB%d(%"PRId64 ") **INVALID**: ", bb->index, bb->count); fprintf (stderr, - "******** BB%d(" HOST_WIDEST_INT_PRINT_DEC + "******** BB%d(%"PRId64 ") **INVALID**: \n", bb->index, bb->count); - fprintf (dump_file, "in_edges=" HOST_WIDEST_INT_PRINT_DEC " ", + fprintf (dump_file, "in_edges=%"PRId64 " ", sum_edge_counts (bb->preds)); - fprintf (dump_file, "out_edges=" HOST_WIDEST_INT_PRINT_DEC "\n", + fprintf (dump_file, "out_edges=%"PRId64 "\n", sum_edge_counts (bb->succs)); } } -- cgit v1.1