aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog19
-rw-r--r--gcc/cfgloopanal.c5
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/ptree.c20
-rw-r--r--gcc/cp/tree.c7
-rw-r--r--gcc/dbxout.c7
-rw-r--r--gcc/defaults.h4
-rw-r--r--gcc/dwarf2asm.c14
-rw-r--r--gcc/genrecog.c6
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/parse.y7
-rw-r--r--gcc/loop.c8
-rw-r--r--gcc/print-rtl.c31
-rw-r--r--gcc/print-tree.c35
-rw-r--r--gcc/ra-debug.c44
-rw-r--r--gcc/ra-rewrite.c22
-rw-r--r--gcc/sdbout.c10
-rw-r--r--gcc/sreal.c12
-rw-r--r--gcc/unroll.c19
-rw-r--r--gcc/varasm.c4
20 files changed, 130 insertions, 157 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f0a5b0..c7a2db9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,24 @@
2003-05-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+ * cfgloopanal.c (test_for_iteration): Use string concatentation on
+ HOST_WIDE_INT_PRINT_* format specifier to collapse multiple
+ function calls into one.
+ * dbxout.c (dbxout_symbol): Likewise.
+ * defaults.h (ASM_OUTPUT_SIZE_DIRECTIVE): Likewise.
+ * dwarf2asm.c (dw2_asm_output_data_uleb128,
+ dw2_asm_output_data_sleb128): Likewise.
+ * genrecog.c (debug_decision_2): Likewise.
+ * loop.c (emit_prefetch_instructions): Likewise.
+ * print-rtl.c (print_rtx): Likewise.
+ * print-tree.c (print_node_brief, print_node): Likewise.
+ * ra-debug.c (dump_igraph, dump_graph_cost,
+ dump_static_insn_cost): Likewise.
+ * ra-rewrite.c (dump_cost): Likewise.
+ * sdbout.c (PUT_SDB_INT_VAL, PUT_SDB_SIZE): Likewise.
+ * sreal.c (dump_sreal): Likewise.
+ * unroll.c (unroll_loop, precondition_loop_p): Likewise.
+ * varasm.c (assemble_vtable_entry): Likewise.
+
* avr.c (avr_output_function_prologue,
avr_output_function_epilogue, print_operand): Fix format specifier
warnings.
diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index c3ef5a3..88eaa2c 100644
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -648,9 +648,8 @@ test_for_iteration (desc, iter)
if (rtl_dump_file)
{
- fprintf (rtl_dump_file, "; Conditional to continue loop at ");
- fprintf (rtl_dump_file, HOST_WIDE_INT_PRINT_UNSIGNED, iter);
- fprintf (rtl_dump_file, "th iteration: ");
+ fprintf (rtl_dump_file, "; Conditional to continue loop at "
+ HOST_WIDE_INT_PRINT_UNSIGNED "th iteration: ", iter);
print_simple_rtl (rtl_dump_file, exp);
fprintf (rtl_dump_file, "\n");
}
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 403c7fe..217d447 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * ptree.c (cxx_print_type, cxx_print_xnode): Use string
+ concatentation on HOST_WIDE_INT_PRINT_* format specifier to
+ collapse multiple function calls into one.
+ * tree.c (debug_binfo): Likewise.
+
2003-05-15 Jason Merrill <jason@redhat.com>
PR c++/5388
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index aefc961..900e8b0 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -73,12 +73,10 @@ cxx_print_type (FILE *file, tree node, int indent)
case TEMPLATE_TEMPLATE_PARM:
case BOUND_TEMPLATE_TEMPLATE_PARM:
indent_to (file, indent + 3);
- fputs ("index ", file);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_TYPE_IDX (node));
- fputs (" level ", file);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_TYPE_LEVEL (node));
- fputs (" orig_level ", file);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_TYPE_ORIG_LEVEL (node));
+ fprintf (file, "index " HOST_WIDE_INT_PRINT_DEC " level "
+ HOST_WIDE_INT_PRINT_DEC " orig_level " HOST_WIDE_INT_PRINT_DEC,
+ TEMPLATE_TYPE_IDX (node), TEMPLATE_TYPE_LEVEL (node),
+ TEMPLATE_TYPE_ORIG_LEVEL (node));
return;
case FUNCTION_TYPE:
@@ -185,12 +183,10 @@ cxx_print_xnode (FILE *file, tree node, int indent)
break;
case TEMPLATE_PARM_INDEX:
indent_to (file, indent + 3);
- fputs ("index ", file);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_PARM_IDX (node));
- fputs (" level ", file);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_PARM_LEVEL (node));
- fputs (" orig_level ", file);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC, TEMPLATE_PARM_ORIG_LEVEL (node));
+ fprintf (file, "index " HOST_WIDE_INT_PRINT_DEC " level "
+ HOST_WIDE_INT_PRINT_DEC " orig_level " HOST_WIDE_INT_PRINT_DEC,
+ TEMPLATE_PARM_IDX (node), TEMPLATE_PARM_LEVEL (node),
+ TEMPLATE_PARM_ORIG_LEVEL (node));
break;
default:
break;
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 0566a09..c333612 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -984,11 +984,10 @@ debug_binfo (elem)
HOST_WIDE_INT n;
tree virtuals;
- fprintf (stderr, "type \"%s\", offset = ",
- TYPE_NAME_STRING (BINFO_TYPE (elem)));
- fprintf (stderr, HOST_WIDE_INT_PRINT_DEC,
+ fprintf (stderr, "type \"%s\", offset = " HOST_WIDE_INT_PRINT_DEC
+ "\nvtable type:\n",
+ TYPE_NAME_STRING (BINFO_TYPE (elem)),
TREE_INT_CST_LOW (BINFO_OFFSET (elem)));
- fprintf (stderr, "\nvtable type:\n");
debug_tree (BINFO_TYPE (elem));
if (BINFO_VTABLE (elem))
fprintf (stderr, "vtable decl \"%s\"\n",
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index dc89829..15d2756 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -2253,10 +2253,9 @@ dbxout_symbol (decl, local)
#ifdef DBX_OUTPUT_CONSTANT_SYMBOL
DBX_OUTPUT_CONSTANT_SYMBOL (asmfile, name, ival);
#else
- fprintf (asmfile, "%s\"%s:c=i", ASM_STABS_OP, name);
-
- fprintf (asmfile, HOST_WIDE_INT_PRINT_DEC, ival);
- fprintf (asmfile, "\",0x%x,0,0,0\n", N_LSYM);
+ fprintf (asmfile, "%s\"%s:c=i" HOST_WIDE_INT_PRINT_DEC
+ "\",0x%x,0,0,0\n",
+ ASM_STABS_OP, name, ival, N_LSYM);
#endif
return 1;
}
diff --git a/gcc/defaults.h b/gcc/defaults.h
index 24ee0bc..f0f38a5 100644
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -213,9 +213,7 @@ do { fputs (integer_asm_op (POINTER_SIZE / UNITS_PER_WORD, TRUE), FILE); \
HOST_WIDE_INT size_ = (SIZE); \
fputs (SIZE_ASM_OP, STREAM); \
assemble_name (STREAM, NAME); \
- fputs (", ", STREAM); \
- fprintf (STREAM, HOST_WIDE_INT_PRINT_DEC, size_); \
- putc ('\n', STREAM); \
+ fprintf (STREAM, ", " HOST_WIDE_INT_PRINT_DEC "\n", size_); \
} \
while (0)
diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index 396c2cd..00a7b41 100644
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -514,8 +514,7 @@ dw2_asm_output_data_uleb128 VPARAMS ((unsigned HOST_WIDE_INT value,
VA_FIXEDARG (ap, const char *, comment);
#ifdef HAVE_AS_LEB128
- fputs ("\t.uleb128 ", asm_out_file);
- fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, value);
+ fprintf (asm_out_file, "\t.uleb128 " HOST_WIDE_INT_PRINT_HEX , value);
if (flag_debug_asm && comment)
{
@@ -550,8 +549,8 @@ dw2_asm_output_data_uleb128 VPARAMS ((unsigned HOST_WIDE_INT value,
if (flag_debug_asm)
{
- fprintf (asm_out_file, "\t%s uleb128 ", ASM_COMMENT_START);
- fprintf (asm_out_file, HOST_WIDE_INT_PRINT_HEX, value);
+ fprintf (asm_out_file, "\t%s uleb128 " HOST_WIDE_INT_PRINT_HEX,
+ ASM_COMMENT_START, value);
if (comment)
{
fputs ("; ", asm_out_file);
@@ -576,8 +575,7 @@ dw2_asm_output_data_sleb128 VPARAMS ((HOST_WIDE_INT value,
VA_FIXEDARG (ap, const char *, comment);
#ifdef HAVE_AS_LEB128
- fputs ("\t.sleb128 ", asm_out_file);
- fprintf (asm_out_file, HOST_WIDE_INT_PRINT_DEC, value);
+ fprintf (asm_out_file, "\t.sleb128 " HOST_WIDE_INT_PRINT_DEC, value);
if (flag_debug_asm && comment)
{
@@ -615,8 +613,8 @@ dw2_asm_output_data_sleb128 VPARAMS ((HOST_WIDE_INT value,
if (flag_debug_asm)
{
- fprintf (asm_out_file, "\t%s sleb128 ", ASM_COMMENT_START);
- fprintf (asm_out_file, HOST_WIDE_INT_PRINT_DEC, value);
+ fprintf (asm_out_file, "\t%s sleb128 " HOST_WIDE_INT_PRINT_DEC,
+ ASM_COMMENT_START, value);
if (comment)
{
fputs ("; ", asm_out_file);
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index baf8c7f..e1dc9b2 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -2786,12 +2786,10 @@ debug_decision_2 (test)
fprintf (stderr, "elt1_i=%d", (int) test->u.intval);
break;
case DT_elt_zero_wide:
- fprintf (stderr, "elt0_w=");
- fprintf (stderr, HOST_WIDE_INT_PRINT_DEC, test->u.intval);
+ fprintf (stderr, "elt0_w=" HOST_WIDE_INT_PRINT_DEC, test->u.intval);
break;
case DT_elt_zero_wide_safe:
- fprintf (stderr, "elt0_ws=");
- fprintf (stderr, HOST_WIDE_INT_PRINT_DEC, test->u.intval);
+ fprintf (stderr, "elt0_ws=" HOST_WIDE_INT_PRINT_DEC, test->u.intval);
break;
case DT_veclen_ge:
fprintf (stderr, "veclen>=%d", test->u.veclen);
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 679636f..066601b 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * parse.y (print_int_node): Use string concatentation on
+ HOST_WIDE_INT_PRINT_* format specifier to collapse multiple
+ function calls into one.
+
2003-05-13 Zack Weinberg <zack@codesourcery.com>
* jcf-parse.c, jcf-write.c, lex.c: Replace all calls to
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 6dd9174..62b796f 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -12569,11 +12569,8 @@ print_int_node (tree node)
TREE_INT_CST_LOW (node));
else if (TREE_INT_CST_HIGH (node) == -1
&& TREE_INT_CST_LOW (node) != 0)
- {
- buffer [0] = '-';
- sprintf (&buffer [1], HOST_WIDE_INT_PRINT_UNSIGNED,
- -TREE_INT_CST_LOW (node));
- }
+ sprintf (buffer, "-" HOST_WIDE_INT_PRINT_UNSIGNED,
+ -TREE_INT_CST_LOW (node));
else
sprintf (buffer, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
TREE_INT_CST_HIGH (node), TREE_INT_CST_LOW (node));
diff --git a/gcc/loop.c b/gcc/loop.c
index c161bc8..e5ae479 100644
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -4197,11 +4197,9 @@ emit_prefetch_instructions (loop)
" density: %d%%; bytes_accessed: %u; total_bytes: %u\n",
(int) (info[i].bytes_accessed * 100 / info[i].stride),
info[i].bytes_accessed, info[i].total_bytes);
- fprintf (loop_dump_stream, " index: ");
- fprintf (loop_dump_stream, HOST_WIDE_INT_PRINT_DEC, info[i].index);
- fprintf (loop_dump_stream, "; stride: ");
- fprintf (loop_dump_stream, HOST_WIDE_INT_PRINT_DEC, info[i].stride);
- fprintf (loop_dump_stream, "; address: ");
+ fprintf (loop_dump_stream, " index: " HOST_WIDE_INT_PRINT_DEC
+ "; stride: " HOST_WIDE_INT_PRINT_DEC "; address: ",
+ info[i].index, info[i].stride);
print_rtl (loop_dump_stream, info[i].base_address);
fprintf (loop_dump_stream, "\n");
}
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 4c159f1..3002ccb 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -374,11 +374,8 @@ print_rtx (in_rtx)
fprintf (outfile, " ");
fprintf (outfile, HOST_WIDE_INT_PRINT_DEC, XWINT (in_rtx, i));
if (! flag_simple)
- {
- fprintf (outfile, " [");
- fprintf (outfile, HOST_WIDE_INT_PRINT_HEX, XWINT (in_rtx, i));
- fprintf (outfile, "]");
- }
+ fprintf (outfile, " [" HOST_WIDE_INT_PRINT_HEX "]",
+ XWINT (in_rtx, i));
break;
case 'i':
@@ -431,11 +428,8 @@ print_rtx (in_rtx)
print_mem_expr (outfile, REG_EXPR (in_rtx));
if (REG_OFFSET (in_rtx))
- {
- fputc ('+', outfile);
- fprintf (outfile, HOST_WIDE_INT_PRINT_DEC,
- REG_OFFSET (in_rtx));
- }
+ fprintf (outfile, "+" HOST_WIDE_INT_PRINT_DEC,
+ REG_OFFSET (in_rtx));
fputs (" ]", outfile);
}
@@ -525,25 +519,18 @@ print_rtx (in_rtx)
{
#ifndef GENERATOR_FILE
case MEM:
- fputs (" [", outfile);
- fprintf (outfile, HOST_WIDE_INT_PRINT_DEC, MEM_ALIAS_SET (in_rtx));
+ fprintf (outfile, " [" HOST_WIDE_INT_PRINT_DEC, MEM_ALIAS_SET (in_rtx));
if (MEM_EXPR (in_rtx))
print_mem_expr (outfile, MEM_EXPR (in_rtx));
if (MEM_OFFSET (in_rtx))
- {
- fputc ('+', outfile);
- fprintf (outfile, HOST_WIDE_INT_PRINT_DEC,
- INTVAL (MEM_OFFSET (in_rtx)));
- }
+ fprintf (outfile, "+" HOST_WIDE_INT_PRINT_DEC,
+ INTVAL (MEM_OFFSET (in_rtx)));
if (MEM_SIZE (in_rtx))
- {
- fputs (" S", outfile);
- fprintf (outfile, HOST_WIDE_INT_PRINT_DEC,
- INTVAL (MEM_SIZE (in_rtx)));
- }
+ fprintf (outfile, " S" HOST_WIDE_INT_PRINT_DEC,
+ INTVAL (MEM_SIZE (in_rtx)));
if (MEM_ALIGN (in_rtx) != 1)
fprintf (outfile, " A%u", MEM_ALIGN (in_rtx));
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index b06de11..606e07a 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -111,11 +111,8 @@ print_node_brief (file, prefix, node, indent)
fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED, TREE_INT_CST_LOW (node));
else if (TREE_INT_CST_HIGH (node) == -1
&& TREE_INT_CST_LOW (node) != 0)
- {
- fprintf (file, "-");
- fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED,
- -TREE_INT_CST_LOW (node));
- }
+ fprintf (file, "-" HOST_WIDE_INT_PRINT_UNSIGNED,
+ -TREE_INT_CST_LOW (node));
else
fprintf (file, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
TREE_INT_CST_HIGH (node), TREE_INT_CST_LOW (node));
@@ -400,11 +397,8 @@ print_node (file, prefix, node, indent)
fprintf (file, " align %d", DECL_ALIGN (node));
if (TREE_CODE (node) == FIELD_DECL)
- {
- fprintf (file, " offset_align ");
- fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED,
- DECL_OFFSET_ALIGN (node));
- }
+ fprintf (file, " offset_align " HOST_WIDE_INT_PRINT_UNSIGNED,
+ DECL_OFFSET_ALIGN (node));
}
else if (DECL_BUILT_IN (node))
{
@@ -417,11 +411,8 @@ print_node (file, prefix, node, indent)
}
if (DECL_POINTER_ALIAS_SET_KNOWN_P (node))
- {
- fprintf (file, " alias set ");
- fprintf (file, HOST_WIDE_INT_PRINT_DEC,
- DECL_POINTER_ALIAS_SET (node));
- }
+ fprintf (file, " alias set " HOST_WIDE_INT_PRINT_DEC,
+ DECL_POINTER_ALIAS_SET (node));
if (TREE_CODE (node) == FIELD_DECL)
{
@@ -538,10 +529,9 @@ print_node (file, prefix, node, indent)
if (TYPE_USER_ALIGN (node))
fprintf (file, " user");
- fprintf (file, " align %d", TYPE_ALIGN (node));
- fprintf (file, " symtab %d", TYPE_SYMTAB_ADDRESS (node));
- fprintf (file, " alias set ");
- fprintf (file, HOST_WIDE_INT_PRINT_DEC, TYPE_ALIAS_SET (node));
+ fprintf (file, " align %d symtab %d alias set " HOST_WIDE_INT_PRINT_DEC,
+ TYPE_ALIGN (node), TYPE_SYMTAB_ADDRESS (node),
+ TYPE_ALIAS_SET (node));
print_node (file, "attributes", TYPE_ATTRIBUTES (node), indent + 4);
@@ -662,11 +652,8 @@ print_node (file, prefix, node, indent)
TREE_INT_CST_LOW (node));
else if (TREE_INT_CST_HIGH (node) == -1
&& TREE_INT_CST_LOW (node) != 0)
- {
- fprintf (file, "-");
- fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED,
- -TREE_INT_CST_LOW (node));
- }
+ fprintf (file, "-" HOST_WIDE_INT_PRINT_UNSIGNED,
+ -TREE_INT_CST_LOW (node));
else
fprintf (file, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
TREE_INT_CST_HIGH (node), TREE_INT_CST_LOW (node));
diff --git a/gcc/ra-debug.c b/gcc/ra-debug.c
index 5f1a6ae..b84bf61 100644
--- a/gcc/ra-debug.c
+++ b/gcc/ra-debug.c
@@ -714,10 +714,10 @@ dump_igraph (df)
ra_debug_msg (DUMP_WEBS, " sub %d", SUBREG_BYTE (web->orig_x));
ra_debug_msg (DUMP_WEBS, " par %d", find_web_for_subweb (web)->id);
}
- ra_debug_msg (DUMP_WEBS, " +%d (span %d, cost ",
- web->add_hardregs, web->span_deaths);
- ra_debug_msg (DUMP_WEBS, HOST_WIDE_INT_PRINT_DEC, web->spill_cost);
- ra_debug_msg (DUMP_WEBS, ") (%s)", reg_class_names[web->regclass]);
+ ra_debug_msg (DUMP_WEBS, " +%d (span %d, cost "
+ HOST_WIDE_INT_PRINT_DEC ") (%s)",
+ web->add_hardregs, web->span_deaths, web->spill_cost,
+ reg_class_names[web->regclass]);
if (web->spill_temp == 1)
ra_debug_msg (DUMP_WEBS, " (spilltemp)");
else if (web->spill_temp == 2)
@@ -870,9 +870,9 @@ dump_graph_cost (level, msg)
if (alias (web)->type == SPILLED)
cost += web->orig_spill_cost;
}
- ra_debug_msg (level, " spill cost of graph (%s) = ", msg ? msg : "");
- ra_debug_msg (level, HOST_WIDE_INT_PRINT_UNSIGNED, cost);
- ra_debug_msg (level, "\n");
+ ra_debug_msg (level, " spill cost of graph (%s) = "
+ HOST_WIDE_INT_PRINT_UNSIGNED "\n",
+ msg ? msg : "", cost);
}
/* Dump the color assignment per web, the coalesced and spilled webs. */
@@ -985,21 +985,21 @@ dump_static_insn_cost (file, message, prefix)
if (!prefix)
prefix = "";
fprintf (file, "static insn cost %s\n", message ? message : "");
- fprintf (file, " %soverall:\tnum=%6d\tcost=", prefix, overall.count);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC_SPACE, 8, overall.cost);
- fprintf (file, "\n");
- fprintf (file, " %sloads:\tnum=%6d\tcost=", prefix, load.count);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC_SPACE, 8, load.cost);
- fprintf (file, "\n");
- fprintf (file, " %sstores:\tnum=%6d\tcost=", prefix, store.count);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC_SPACE, 8, store.cost);
- fprintf (file, "\n");
- fprintf (file, " %sregcopy:\tnum=%6d\tcost=", prefix, regcopy.count);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC_SPACE, 8, regcopy.cost);
- fprintf (file, "\n");
- fprintf (file, " %sselfcpy:\tnum=%6d\tcost=", prefix, selfcopy.count);
- fprintf (file, HOST_WIDE_INT_PRINT_DEC_SPACE, 8, selfcopy.cost);
- fprintf (file, "\n");
+ fprintf (file, " %soverall:\tnum=%6d\tcost="
+ HOST_WIDE_INT_PRINT_DEC_SPACE "\n",
+ prefix, overall.count, 8, overall.cost);
+ fprintf (file, " %sloads:\tnum=%6d\tcost="
+ HOST_WIDE_INT_PRINT_DEC_SPACE "\n",
+ prefix, load.count, 8, load.cost);
+ fprintf (file, " %sstores:\tnum=%6d\tcost="
+ HOST_WIDE_INT_PRINT_DEC_SPACE "\n",
+ prefix, store.count, 8, store.cost);
+ fprintf (file, " %sregcopy:\tnum=%6d\tcost="
+ HOST_WIDE_INT_PRINT_DEC_SPACE "\n",
+ prefix, regcopy.count, 8, regcopy.cost);
+ fprintf (file, " %sselfcpy:\tnum=%6d\tcost="
+ HOST_WIDE_INT_PRINT_DEC_SPACE "\n",
+ prefix, selfcopy.count, 8, selfcopy.cost);
}
/* Returns nonzero, if WEB1 and WEB2 have some possible
diff --git a/gcc/ra-rewrite.c b/gcc/ra-rewrite.c
index 5cb1bb9..df498ab 100644
--- a/gcc/ra-rewrite.c
+++ b/gcc/ra-rewrite.c
@@ -1954,17 +1954,17 @@ dump_cost (level)
unsigned int level;
{
ra_debug_msg (level, "Instructions for spilling\n added:\n");
- ra_debug_msg (level, " loads =%d cost=", emitted_spill_loads);
- ra_debug_msg (level, HOST_WIDE_INT_PRINT_UNSIGNED, spill_load_cost);
- ra_debug_msg (level, "\n stores=%d cost=", emitted_spill_stores);
- ra_debug_msg (level, HOST_WIDE_INT_PRINT_UNSIGNED, spill_store_cost);
- ra_debug_msg (level, "\n remat =%d cost=", emitted_remat);
- ra_debug_msg (level, HOST_WIDE_INT_PRINT_UNSIGNED, spill_remat_cost);
- ra_debug_msg (level, "\n removed:\n moves =%d cost=", deleted_move_insns);
- ra_debug_msg (level, HOST_WIDE_INT_PRINT_UNSIGNED, deleted_move_cost);
- ra_debug_msg (level, "\n others=%d cost=", deleted_def_insns);
- ra_debug_msg (level, HOST_WIDE_INT_PRINT_UNSIGNED, deleted_def_cost);
- ra_debug_msg (level, "\n");
+ ra_debug_msg (level, " loads =%d cost=" HOST_WIDE_INT_PRINT_UNSIGNED "\n",
+ emitted_spill_loads, spill_load_cost);
+ ra_debug_msg (level, " stores=%d cost=" HOST_WIDE_INT_PRINT_UNSIGNED "\n",
+ emitted_spill_stores, spill_store_cost);
+ ra_debug_msg (level, " remat =%d cost=" HOST_WIDE_INT_PRINT_UNSIGNED "\n",
+ emitted_remat, spill_remat_cost);
+ ra_debug_msg (level, " removed:\n moves =%d cost="
+ HOST_WIDE_INT_PRINT_UNSIGNED "\n",
+ deleted_move_insns, deleted_move_cost);
+ ra_debug_msg (level, " others=%d cost=" HOST_WIDE_INT_PRINT_UNSIGNED "\n",
+ deleted_def_insns, deleted_def_cost);
}
/* Initialization of the rewrite phase. */
diff --git a/gcc/sdbout.c b/gcc/sdbout.c
index aaba360..9ad9f42 100644
--- a/gcc/sdbout.c
+++ b/gcc/sdbout.c
@@ -155,9 +155,8 @@ static void sdbout_global_decl PARAMS ((tree));
#ifndef PUT_SDB_INT_VAL
#define PUT_SDB_INT_VAL(a) \
do { \
- fputs ("\t.val\t", asm_out_file); \
- fprintf (asm_out_file, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) (a)); \
- fprintf (asm_out_file, "%s", SDB_DELIM); \
+ fprintf (asm_out_file, "\t.val\t" HOST_WIDE_INT_PRINT_DEC "%s", \
+ (HOST_WIDE_INT) (a), SDB_DELIM); \
} while (0)
#endif
@@ -191,9 +190,8 @@ do { fprintf (asm_out_file, "\t.def\t"); \
#ifndef PUT_SDB_SIZE
#define PUT_SDB_SIZE(a) \
do { \
- fputs ("\t.size\t", asm_out_file); \
- fprintf (asm_out_file, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) (a)); \
- fprintf (asm_out_file, "%s", SDB_DELIM); \
+ fprintf (asm_out_file, "\t.size\t" HOST_WIDE_INT_PRINT_DEC "%s", \
+ (HOST_WIDE_INT) (a), SDB_DELIM); \
} while(0)
#endif
diff --git a/gcc/sreal.c b/gcc/sreal.c
index 54648ea..0468a96 100644
--- a/gcc/sreal.c
+++ b/gcc/sreal.c
@@ -69,15 +69,11 @@ dump_sreal (file, x)
sreal *x;
{
#if SREAL_PART_BITS < 32
- fprintf (file, "((");
- fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED, x->sig_hi);
- fprintf (file, " * 2^16 + ");
- fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED, x->sig_lo);
- fprintf (file, ") * 2^%d)", x->exp);
+ fprintf (file, "((" HOST_WIDE_INT_PRINT_UNSIGNED " * 2^16 + "
+ HOST_WIDE_INT_PRINT_UNSIGNED ") * 2^%d)",
+ x->sig_hi, x->sig_lo, x->exp);
#else
- fprintf (file, "(");
- fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED, x->sig);
- fprintf (file, " * 2^%d)", x->exp);
+ fprintf (file, "(" HOST_WIDE_INT_PRINT_UNSIGNED " * 2^%d)", x->sig, x->exp);
#endif
}
diff --git a/gcc/unroll.c b/gcc/unroll.c
index 9db9975..396ec42 100644
--- a/gcc/unroll.c
+++ b/gcc/unroll.c
@@ -285,12 +285,8 @@ unroll_loop (loop, insn_count, strength_reduce_p)
loop_info->n_iterations = 0;
if (loop_dump_stream && loop_info->n_iterations > 0)
- {
- fputs ("Loop unrolling: ", loop_dump_stream);
- fprintf (loop_dump_stream, HOST_WIDE_INT_PRINT_DEC,
- loop_info->n_iterations);
- fputs (" iterations.\n", loop_dump_stream);
- }
+ fprintf (loop_dump_stream, "Loop unrolling: " HOST_WIDE_INT_PRINT_DEC
+ " iterations.\n", loop_info->n_iterations);
/* Find and save a pointer to the last nonnote insn in the loop. */
@@ -1416,13 +1412,10 @@ precondition_loop_p (loop, initial_value, final_value, increment, mode)
*mode = word_mode;
if (loop_dump_stream)
- {
- fputs ("Preconditioning: Success, number of iterations known, ",
- loop_dump_stream);
- fprintf (loop_dump_stream, HOST_WIDE_INT_PRINT_DEC,
- loop_info->n_iterations);
- fputs (".\n", loop_dump_stream);
- }
+ fprintf (loop_dump_stream,
+ "Preconditioning: Success, number of iterations known, "
+ HOST_WIDE_INT_PRINT_DEC ".\n",
+ loop_info->n_iterations);
return 1;
}
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 6bd8d73..0e9014aa 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -4825,9 +4825,7 @@ assemble_vtable_entry (symbol, offset)
{
fputs ("\t.vtable_entry ", asm_out_file);
output_addr_const (asm_out_file, symbol);
- fputs (", ", asm_out_file);
- fprintf (asm_out_file, HOST_WIDE_INT_PRINT_DEC, offset);
- fputc ('\n', asm_out_file);
+ fprintf (asm_out_file, ", " HOST_WIDE_INT_PRINT_DEC "\n", offset);
}
/* Used for vtable gc in GNU binutils. Record the class hierarchy by noting