diff options
author | kazu <kazu@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-05-20 18:06:55 +0000 |
---|---|---|
committer | kazu <kazu@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-05-20 18:06:55 +0000 |
commit | 195731ad171662442bca2721616e291e4fce1488 (patch) | |
tree | 6f48ee558ae32b2a271ec40182fded8214a3342f | |
parent | 104bbbeb1d2f6e1d81ed5b6ad56056208ca64767 (diff) | |
download | gcc-195731ad171662442bca2721616e291e4fce1488.tar.gz |
* params.c: Fix formatting.
* params.h: Likewise.
* predict.c: Likewise.
* prefix.c: Likewise.
* print-rtl.c: Likewise.
* print-tree.c: Likewise.
* profile.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@53670 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/ChangeLog | 10 | ||||
-rw-r--r-- | gcc/params.c | 9 | ||||
-rw-r--r-- | gcc/params.h | 6 | ||||
-rw-r--r-- | gcc/predict.c | 12 | ||||
-rw-r--r-- | gcc/prefix.c | 12 | ||||
-rw-r--r-- | gcc/print-rtl.c | 44 | ||||
-rw-r--r-- | gcc/print-tree.c | 6 | ||||
-rw-r--r-- | gcc/profile.c | 44 |
8 files changed, 75 insertions, 68 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cfa472af112..dc31e66ff0b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2002-05-20 Kazu Hirata <kazu@cs.umass.edu> + + * params.c: Fix formatting. + * params.h: Likewise. + * predict.c: Likewise. + * prefix.c: Likewise. + * print-rtl.c: Likewise. + * print-tree.c: Likewise. + * profile.c: Likewise. + 2002-05-20 H.J. Lu (hjl@gnu.org) * gcc/config/mips/linux.h (SDB_DEBUGGING_INFO): Undefine. diff --git a/gcc/params.c b/gcc/params.c index b32f9b625d0..72c67bebf3b 100644 --- a/gcc/params.c +++ b/gcc/params.c @@ -37,14 +37,14 @@ static size_t num_compiler_params; /* Add the N PARAMS to the current list of compiler parameters. */ -void +void add_params (params, n) const param_info params[]; size_t n; { /* Allocate enough space for the new parameters. */ - compiler_params = - ((param_info *) + compiler_params = + ((param_info *) xrealloc (compiler_params, (num_compiler_params + n) * sizeof (param_info))); /* Copy them into the table. */ @@ -79,6 +79,3 @@ set_param_value (name, value) /* If we didn't find this parameter, issue an error message. */ error ("invalid parameter `%s'", name); } - - - diff --git a/gcc/params.h b/gcc/params.h index c4474e418ee..27021aa7c7d 100644 --- a/gcc/params.h +++ b/gcc/params.h @@ -59,7 +59,7 @@ extern param_info *compiler_params; /* Add the N PARAMS to the current list of compiler parameters. */ -extern void add_params +extern void add_params PARAMS ((const param_info params[], size_t n)); /* Set the VALUE associated with the parameter given by NAME. */ @@ -75,14 +75,14 @@ typedef enum compiler_param #define DEFPARAM(enumerator, option, msgid, default) \ enumerator, #include "params.def" -#undef DEFPARAM +#undef DEFPARAM LAST_PARAM } compiler_param; /* The value of the parameter given by ENUM. */ #define PARAM_VALUE(ENUM) \ (compiler_params[(int) ENUM].value) - + /* Macros for the various parameters. */ #define MAX_INLINE_INSNS_SINGLE \ PARAM_VALUE (PARAM_MAX_INLINE_INSNS_SINGLE) diff --git a/gcc/predict.c b/gcc/predict.c index f457817956d..b0be982761d 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -74,9 +74,9 @@ static void propagate_freq PARAMS ((basic_block)); static void estimate_bb_frequencies PARAMS ((struct loops *)); static void counts_to_freqs PARAMS ((void)); static void process_note_predictions PARAMS ((basic_block, int *, int *, - sbitmap *)); + sbitmap *)); static void process_note_prediction PARAMS ((basic_block, int *, int *, - sbitmap *, int, int)); + sbitmap *, int, int)); static bool last_basic_block_p PARAMS ((basic_block)); static void compute_function_frequency PARAMS ((void)); static void choose_function_section PARAMS ((void)); @@ -375,10 +375,10 @@ combine_predictions_for_insn (insn, bb) dump_prediction (predictor, probability, bb, !first_match || best_predictor == predictor); - *pnote = XEXP (*pnote, 1); + *pnote = XEXP (*pnote, 1); } else - pnote = &XEXP (*pnote, 1); + pnote = &XEXP (*pnote, 1); } if (!prob_note) @@ -705,7 +705,7 @@ last_basic_block_p (bb) should be index of basic block in that we need to alter branch predictions (i.e. the first of our dominators such that we do not post-dominate it) (but we fill this information on demand, so -1 may be there in case this - was not needed yet). */ + was not needed yet). */ static void process_note_prediction (bb, heads, dominators, post_dominators, pred, flags) @@ -1117,7 +1117,7 @@ expensive_function_p (threshold) is available and function has not been executed at all. */ if (ENTRY_BLOCK_PTR->frequency == 0) return true; - + /* Maximally BB_FREQ_MAX^2 so overflow won't happen. */ limit = ENTRY_BLOCK_PTR->frequency * threshold; for (i = 0; i < n_basic_blocks; i++) diff --git a/gcc/prefix.c b/gcc/prefix.c index 88906731bfd..b7b162aac49 100644 --- a/gcc/prefix.c +++ b/gcc/prefix.c @@ -42,7 +42,7 @@ Boston, MA 02111-1307, USA. */ be considered a "key" and looked up as follows: -- If this is a Win32 OS, then the Registry will be examined for - an entry of "key" in + an entry of "key" in HKEY_LOCAL_MACHINE\SOFTWARE\Free Software Foundation\<KEY> @@ -58,7 +58,7 @@ Boston, MA 02111-1307, USA. */ as an environment variable, whose value will be returned. Once all this is done, any '/' will be converted to DIR_SEPARATOR, - if they are different. + if they are different. NOTE: using resolve_keyed_path under Win32 requires linking with advapi32.dll. */ @@ -149,10 +149,10 @@ lookup_key (key) KEY_READ, ®_key); if (res != ERROR_SUCCESS) - { - reg_key = (HKEY) INVALID_HANDLE_VALUE; - return 0; - } + { + reg_key = (HKEY) INVALID_HANDLE_VALUE; + return 0; + } } size = 32; diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c index 8cd339ab989..823ffa0c513 100644 --- a/gcc/print-rtl.c +++ b/gcc/print-rtl.c @@ -85,7 +85,7 @@ print_mem_expr (outfile, expr) if (TREE_CODE (expr) == COMPONENT_REF) { if (TREE_OPERAND (expr, 0)) - print_mem_expr (outfile, TREE_OPERAND (expr, 0)); + print_mem_expr (outfile, TREE_OPERAND (expr, 0)); else fputs (" <variable>", outfile); fprintf (outfile, ".%s", @@ -151,7 +151,7 @@ print_rtx (in_rtx) fputc ('(', outfile); else fprintf (outfile, "(%s", GET_RTX_NAME (GET_CODE (in_rtx))); - + if (! flag_simple) { if (RTX_FLAG (in_rtx, in_struct)) @@ -159,26 +159,26 @@ print_rtx (in_rtx) if (RTX_FLAG (in_rtx, volatil)) fputs ("/v", outfile); - + if (RTX_FLAG (in_rtx, unchanging)) fputs ("/u", outfile); - + if (RTX_FLAG (in_rtx, integrated)) fputs ("/i", outfile); - + if (RTX_FLAG (in_rtx, frame_related)) fputs ("/f", outfile); - + if (RTX_FLAG (in_rtx, jump)) fputs ("/j", outfile); - + if (RTX_FLAG (in_rtx, call)) fputs ("/c", outfile); if (GET_MODE (in_rtx) != VOIDmode) { /* Print REG_NOTE names for EXPR_LIST and INSN_LIST. */ - if (GET_CODE (in_rtx) == EXPR_LIST + if (GET_CODE (in_rtx) == EXPR_LIST || GET_CODE (in_rtx) == INSN_LIST) fprintf (outfile, ":%s", GET_REG_NOTE_NAME (GET_MODE (in_rtx))); @@ -246,7 +246,7 @@ print_rtx (in_rtx) if (flag_dump_unnumbered) fprintf (outfile, "#"); else - fprintf (outfile, HOST_PTR_PRINTF, + fprintf (outfile, HOST_PTR_PRINTF, (char *) NOTE_BLOCK (in_rtx)); sawclose = 1; break; @@ -284,15 +284,15 @@ print_rtx (in_rtx) fprintf (outfile, " \"\""); break; - case NOTE_INSN_PREDICTION: - if (NOTE_PREDICTION (in_rtx)) - fprintf (outfile, " [ %d %d ] ", - (int)NOTE_PREDICTION_ALG (in_rtx), - (int) NOTE_PREDICTION_FLAGS (in_rtx)); - else - fprintf (outfile, " [ ERROR ]"); - break; - + case NOTE_INSN_PREDICTION: + if (NOTE_PREDICTION (in_rtx)) + fprintf (outfile, " [ %d %d ] ", + (int)NOTE_PREDICTION_ALG (in_rtx), + (int) NOTE_PREDICTION_FLAGS (in_rtx)); + else + fprintf (outfile, " [ ERROR ]"); + break; + default: { const char * const str = X0STR (in_rtx, i); @@ -329,7 +329,7 @@ print_rtx (in_rtx) if (sawclose) { fprintf (outfile, "\n%s%*s", - print_rtx_head, indent * 2, ""); + print_rtx_head, indent * 2, ""); sawclose = 0; } fputs ("[ ", outfile); @@ -531,7 +531,7 @@ print_rtx (in_rtx) case CODE_LABEL: fprintf (outfile, " [%d uses]", LABEL_NUSES (in_rtx)); if (LABEL_ALTERNATE_NAME (in_rtx)) - fprintf (outfile, " [alternate name: %s]", + fprintf (outfile, " [alternate name: %s]", LABEL_ALTERNATE_NAME (in_rtx)); break; @@ -731,14 +731,14 @@ print_rtl (outf, rtx_first) if (! flag_dump_unnumbered || GET_CODE (tmp_rtx) != NOTE || NOTE_LINE_NUMBER (tmp_rtx) < 0) { - fputs (print_rtx_head, outfile); + fputs (print_rtx_head, outfile); print_rtx (tmp_rtx); fprintf (outfile, "\n"); } break; default: - fputs (print_rtx_head, outfile); + fputs (print_rtx_head, outfile); print_rtx (rtx_first); } } diff --git a/gcc/print-tree.c b/gcc/print-tree.c index f5c7d88c1f6..40ee816efb2 100644 --- a/gcc/print-tree.c +++ b/gcc/print-tree.c @@ -384,7 +384,7 @@ print_node (file, prefix, node, indent) print_node (file, "size", DECL_SIZE (node), indent + 4); print_node (file, "unit size", DECL_SIZE_UNIT (node), indent + 4); - + if (TREE_CODE (node) != FUNCTION_DECL || DECL_INLINE (node) || DECL_BUILT_IN (node)) indent_to (file, indent + 3); @@ -415,7 +415,7 @@ 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, + fprintf (file, HOST_WIDE_INT_PRINT_DEC, DECL_POINTER_ALIAS_SET (node)); } @@ -633,7 +633,7 @@ print_node (file, prefix, node, indent) if (TREE_CODE (node) == EXPR_WITH_FILE_LOCATION) { indent_to (file, indent+4); - fprintf (file, "%s:%d:%d", + fprintf (file, "%s:%d:%d", (EXPR_WFL_FILENAME_NODE (node ) ? EXPR_WFL_FILENAME (node) : "(no file info)"), EXPR_WFL_LINENO (node), EXPR_WFL_COLNO (node)); diff --git a/gcc/profile.c b/gcc/profile.c index 60159a3e322..5929a9138fc 100644 --- a/gcc/profile.c +++ b/gcc/profile.c @@ -209,7 +209,7 @@ output_gcov_string (string, delimiter) } -/* Computes hybrid profile for all matching entries in da_file. +/* Computes hybrid profile for all matching entries in da_file. Sets max_counter_in_program as a side effect. */ static gcov_type * @@ -244,7 +244,7 @@ get_exec_counts () } } - /* now read and combine all matching profiles. */ + /* now read and combine all matching profiles. */ profile = xmalloc (sizeof (gcov_type) * num_edges); rewind (da_file); @@ -698,7 +698,7 @@ compute_checksum () long chsum = 0; int i; - + for (i = 0; i < n_basic_blocks ; i++) { basic_block bb = BASIC_BLOCK (i); @@ -741,9 +741,9 @@ branch_prob () profile_info.current_function_cfg_checksum = compute_checksum (); if (rtl_dump_file) - fprintf (rtl_dump_file, "CFG checksum is %ld\n", + fprintf (rtl_dump_file, "CFG checksum is %ld\n", profile_info.current_function_cfg_checksum); - + /* Start of a function. */ if (flag_test_coverage) output_gcov_string (current_function_name, (long) -2); @@ -820,14 +820,14 @@ branch_prob () if (rtl_dump_file) fprintf (rtl_dump_file, "Adding fake exit edge to bb %i\n", bb->index); - make_edge (bb, EXIT_BLOCK_PTR, EDGE_FAKE); + make_edge (bb, EXIT_BLOCK_PTR, EDGE_FAKE); } if (need_entry_edge && !have_entry_edge) { if (rtl_dump_file) fprintf (rtl_dump_file, "Adding fake entry edge to bb %i\n", bb->index); - make_edge (ENTRY_BLOCK_PTR, bb, EDGE_FAKE); + make_edge (ENTRY_BLOCK_PTR, bb, EDGE_FAKE); } } @@ -844,10 +844,10 @@ branch_prob () /* Mark edges we've replaced by fake edges above as ignored. */ if ((e->flags & (EDGE_ABNORMAL | EDGE_ABNORMAL_CALL)) && e->src != ENTRY_BLOCK_PTR && e->dest != EXIT_BLOCK_PTR) - { + { EDGE_INFO (e)->ignore = 1; ignored_edges++; - } + } } #ifdef ENABLE_CHECKING @@ -860,10 +860,10 @@ branch_prob () { int i = 0; for (i = 0 ; i < n_basic_blocks; i++) - { + { basic_block bb = BASIC_BLOCK (i); rtx insn = bb->head; - static int ignore_next_note = 0; + static int ignore_next_note = 0; /* We are looking for line number notes. Search backward before basic block to find correct ones. */ @@ -916,7 +916,7 @@ branch_prob () } insn = NEXT_INSN (insn); } - } + } __write_long (0, bb_file, 4); } @@ -933,10 +933,10 @@ branch_prob () edge e = INDEX_EDGE (el, i); struct edge_info *inf = EDGE_INFO (e); if ((e->flags & EDGE_FAKE) && !inf->ignore && !inf->on_tree) - { - inf->ignore = 1; - ignored_edges++; - } + { + inf->ignore = 1; + ignored_edges++; + } } total_num_blocks += n_basic_blocks + 2; @@ -965,7 +965,7 @@ branch_prob () /* write checksum. */ __write_long (profile_info.current_function_cfg_checksum, bbg_file, 4); - + /* The plus 2 stands for entry and exit block. */ __write_long (n_basic_blocks + 2, bbg_file, 4); __write_long (num_edges - ignored_edges + 1, bbg_file, 4); @@ -1099,14 +1099,14 @@ find_spanning_tree (el) { edge e = INDEX_EDGE (el, i); if (((e->flags & (EDGE_ABNORMAL | EDGE_ABNORMAL_CALL | EDGE_FAKE)) - || e->dest == EXIT_BLOCK_PTR - ) + || e->dest == EXIT_BLOCK_PTR + ) && !EDGE_INFO (e)->ignore && (find_group (e->src) != find_group (e->dest))) { if (rtl_dump_file) fprintf (rtl_dump_file, "Abnormal edge %d to %d put to tree\n", - e->src->index, e->dest->index); + e->src->index, e->dest->index); EDGE_INFO (e)->on_tree = 1; union_groups (e->src, e->dest); } @@ -1122,7 +1122,7 @@ find_spanning_tree (el) { if (rtl_dump_file) fprintf (rtl_dump_file, "Critical edge %d to %d put to tree\n", - e->src->index, e->dest->index); + e->src->index, e->dest->index); EDGE_INFO (e)->on_tree = 1; union_groups (e->src, e->dest); } @@ -1137,7 +1137,7 @@ find_spanning_tree (el) { if (rtl_dump_file) fprintf (rtl_dump_file, "Normal edge %d to %d put to tree\n", - e->src->index, e->dest->index); + e->src->index, e->dest->index); EDGE_INFO (e)->on_tree = 1; union_groups (e->src, e->dest); } |