builtins.c (expand_builtin_mathfn_3): Correct coding style.

	* builtins.c (expand_builtin_mathfn_3): Correct coding style.
	* ddg.c (print_ddg_edge): Likewise.
	* dwarf2out.c (prune_unused_types_walk): Likewise.
	* ifcvt.c (noce_try_cmove_arith): Likewise.
	* langhooks.c (add_builtin_function): Likewise.
	* reg-stack.c (subst_stack_regs_pat): Likewise.
	* tree.c (expanded_location): Likewise.
	* tree-dump.c (dequeue_and_dump): Likewise.

From-SVN: r118187

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91a71e10b46b202f1c6b527b2d697ec32a2db6cc..0c63a5501f0aac971a0c09f7c8417b4e0418914f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-30  Roger Sayle  <roger@eyesopen.com>
+
+       * builtins.c (expand_builtin_mathfn_3): Correct coding style.
+       * ddg.c (print_ddg_edge): Likewise.
+       * dwarf2out.c (prune_unused_types_walk): Likewise.
+       * ifcvt.c (noce_try_cmove_arith): Likewise.
+       * langhooks.c (add_builtin_function): Likewise.
+       * reg-stack.c (subst_stack_regs_pat): Likewise.
+       * tree.c (expanded_location): Likewise.
+       * tree-dump.c (dequeue_and_dump): Likewise.
+
 2006-10-30  David Daney  <ddaney@avtrex.com>
 
        * config/mips/linux.h (NO_SHARED_SPECS): Correct syntax error.

diff --git a/gcc/builtins.c b/gcc/builtins.c
index b3e82d5d187ac5a00e295037e8edd176acd520d2..3a71e0462db8f9034fd0681544eee0124d586c43 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -2089,7 +2089,7 @@ expand_builtin_mathfn_3 (tree exp, rtx target, rtx subtarget)
 
   /* Check if sincos insn is available, otherwise fallback
      to sin or cos insn.  */
-  if (builtin_optab->handlers[(int) mode].insn_code == CODE_FOR_nothing) {
+  if (builtin_optab->handlers[(int) mode].insn_code == CODE_FOR_nothing)
     switch (DECL_FUNCTION_CODE (fndecl))
       {
       CASE_FLT_FN (BUILT_IN_SIN):
@@ -2099,7 +2099,6 @@ expand_builtin_mathfn_3 (tree exp, rtx target, rtx subtarget)
       default:
        gcc_unreachable ();
       }
-  }
 
   /* Before working hard, check whether the instruction is available.  */
   if (builtin_optab->handlers[(int) mode].insn_code != CODE_FOR_nothing)

diff --git a/gcc/ddg.c b/gcc/ddg.c
index c59ee6ea8f19009e18b5f58384a5ab7a1fe3ce86..3952666a71a5cd8169c639a05330423147f1c322 100644 (file)
--- a/gcc/ddg.c
+++ b/gcc/ddg.c
@@ -549,7 +549,8 @@ print_ddg_edge (FILE *file, ddg_edge_ptr e)
 {
   char dep_c;
 
-  switch (e->type) {
+  switch (e->type)
+    {
     case OUTPUT_DEP :
       dep_c = 'O';
       break;
@@ -558,7 +559,7 @@ print_ddg_edge (FILE *file, ddg_edge_ptr e)
       break;
     default:
       dep_c = 'T';
-  }
+    }
 
   fprintf (file, " [%d -(%c,%d,%d)-> %d] ", INSN_UID (e->src->insn),
           dep_c, e->latency, e->distance, INSN_UID (e->dest->insn));

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 0ba0220d958c7fc8de158e45e07ab27fe258afa8..13c0e2b2794cd3c547900556efcb3c7a17d84cf2 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -14045,35 +14045,36 @@ prune_unused_types_walk (dw_die_ref die)
   if (die->die_mark)
     return;
 
-  switch (die->die_tag) {
-  case DW_TAG_const_type:
-  case DW_TAG_packed_type:
-  case DW_TAG_pointer_type:
-  case DW_TAG_reference_type:
-  case DW_TAG_volatile_type:
-  case DW_TAG_typedef:
-  case DW_TAG_array_type:
-  case DW_TAG_structure_type:
-  case DW_TAG_union_type:
-  case DW_TAG_class_type:
-  case DW_TAG_friend:
-  case DW_TAG_variant_part:
-  case DW_TAG_enumeration_type:
-  case DW_TAG_subroutine_type:
-  case DW_TAG_string_type:
-  case DW_TAG_set_type:
-  case DW_TAG_subrange_type:
-  case DW_TAG_ptr_to_member_type:
-  case DW_TAG_file_type:
-    if (die->die_perennial_p)
-      break;
+  switch (die->die_tag)
+    {
+    case DW_TAG_const_type:
+    case DW_TAG_packed_type:
+    case DW_TAG_pointer_type:
+    case DW_TAG_reference_type:
+    case DW_TAG_volatile_type:
+    case DW_TAG_typedef:
+    case DW_TAG_array_type:
+    case DW_TAG_structure_type:
+    case DW_TAG_union_type:
+    case DW_TAG_class_type:
+    case DW_TAG_friend:
+    case DW_TAG_variant_part:
+    case DW_TAG_enumeration_type:
+    case DW_TAG_subroutine_type:
+    case DW_TAG_string_type:
+    case DW_TAG_set_type:
+    case DW_TAG_subrange_type:
+    case DW_TAG_ptr_to_member_type:
+    case DW_TAG_file_type:
+      if (die->die_perennial_p)
+       break;
 
-    /* It's a type node --- don't mark it.  */
-    return;
+      /* It's a type node --- don't mark it.  */
+      return;
 
-  default:
-    /* Mark everything else.  */
-    break;
+    default:
+      /* Mark everything else.  */
+      break;
   }
 
   die->die_mark = 1;

diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 8609823b33b38838bd9aab0f2af936c912016737..4d7341cec887e0b24f44e2d575a339143150c95d 100644 (file)
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -1329,16 +1329,15 @@ noce_try_cmove_arith (struct noce_if_info *if_info)
        return FALSE;
     }
   else
+    insn_cost = 0;
+
+  if (insn_b)
     {
-      insn_cost = 0;
+      insn_cost += insn_rtx_cost (PATTERN (insn_b));
+      if (insn_cost == 0 || insn_cost > COSTS_N_INSNS (BRANCH_COST))
+        return FALSE;
     }
 
-  if (insn_b) {
-    insn_cost += insn_rtx_cost (PATTERN (insn_b));
-    if (insn_cost == 0 || insn_cost > COSTS_N_INSNS (BRANCH_COST))
-      return FALSE;
-  }
-
   /* Possibly rearrange operands to make things come out more natural.  */
   if (reversed_comparison_code (if_info->cond, if_info->jump) != UNKNOWN)
     {

diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 4f61d1175b1ea0dd73985358a74e2d84e4642fb5..7fca436e89dbaf0c4d3372e8b074cc23427b7010 100644 (file)
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -605,10 +605,11 @@ add_builtin_function (const char *name,
   DECL_BUILT_IN_CLASS (decl) = cl;
   DECL_FUNCTION_CODE (decl)  = function_code;
 
-  if (library_name) {
-    tree libname = get_identifier (library_name);
-    SET_DECL_ASSEMBLER_NAME (decl, libname);
-  }
+  if (library_name)
+    {
+      tree libname = get_identifier (library_name);
+      SET_DECL_ASSEMBLER_NAME (decl, libname);
+    }
 
   /* Possibly apply some default attributes to this built-in function.  */
   if (attrs)

diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index fc742bdce6080d876d02ac36fdf638372cfc0d88..0b8b1565e0c6c5445fe7317f3c1713c7e609beae 100644 (file)
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -1702,11 +1702,12 @@ subst_stack_regs_pat (rtx insn, stack regstack, rtx pat)
 
                /* Push the result back onto stack. Empty stack slot
                   will be filled in second part of insn.  */
-               if (STACK_REG_P (*dest)) {
-                 regstack->reg[regstack->top] = REGNO (*dest);
-                 SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
-                 replace_reg (dest, FIRST_STACK_REG);
-               }
+               if (STACK_REG_P (*dest))
+                 {
+                   regstack->reg[regstack->top] = REGNO (*dest);
+                   SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
+                   replace_reg (dest, FIRST_STACK_REG);
+                 }
 
                replace_reg (src1, FIRST_STACK_REG);
                replace_reg (src2, FIRST_STACK_REG + 1);
@@ -1733,11 +1734,12 @@ subst_stack_regs_pat (rtx insn, stack regstack, rtx pat)
 
                /* Push the result back onto stack. Fill empty slot from
                   first part of insn and fix top of stack pointer.  */
-               if (STACK_REG_P (*dest)) {
-                 regstack->reg[regstack->top - 1] = REGNO (*dest);
-                 SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
-                 replace_reg (dest, FIRST_STACK_REG + 1);
-               }
+               if (STACK_REG_P (*dest))
+                 {
+                   regstack->reg[regstack->top - 1] = REGNO (*dest);
+                   SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
+                   replace_reg (dest, FIRST_STACK_REG + 1);
+                 }
 
                replace_reg (src1, FIRST_STACK_REG);
                replace_reg (src2, FIRST_STACK_REG + 1);
@@ -1760,11 +1762,12 @@ subst_stack_regs_pat (rtx insn, stack regstack, rtx pat)
 
                /* Push the result back onto stack. Empty stack slot
                   will be filled in second part of insn.  */
-               if (STACK_REG_P (*dest)) {
-                 regstack->reg[regstack->top + 1] = REGNO (*dest);
-                 SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
-                 replace_reg (dest, FIRST_STACK_REG);
-               }
+               if (STACK_REG_P (*dest))
+                 {
+                   regstack->reg[regstack->top + 1] = REGNO (*dest);
+                   SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
+                   replace_reg (dest, FIRST_STACK_REG);
+                 }
 
                replace_reg (src1, FIRST_STACK_REG);
                break;
@@ -1786,13 +1789,14 @@ subst_stack_regs_pat (rtx insn, stack regstack, rtx pat)
 
                /* Push the result back onto stack. Fill empty slot from
                   first part of insn and fix top of stack pointer.  */
-               if (STACK_REG_P (*dest)) {
-                 regstack->reg[regstack->top] = REGNO (*dest);
-                 SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
-                 replace_reg (dest, FIRST_STACK_REG + 1);
+               if (STACK_REG_P (*dest))
+                 {
+                   regstack->reg[regstack->top] = REGNO (*dest);
+                   SET_HARD_REG_BIT (regstack->reg_set, REGNO (*dest));
+                   replace_reg (dest, FIRST_STACK_REG + 1);
 
-                 regstack->top++;
-               }
+                   regstack->top++;
+                 }
 
                replace_reg (src1, FIRST_STACK_REG);
                break;

diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c
index d97dc83af13f4c49dafdd242d28f7a057a4ea643..db315c8229f67c48cf6817994912c9e3796ad5fd 100644 (file)
--- a/gcc/tree-dump.c
+++ b/gcc/tree-dump.c
@@ -650,12 +650,12 @@ dequeue_and_dump (dump_info_p di)
 
     case CASE_LABEL_EXPR:
       dump_child ("name", CASE_LABEL (t));
-      if (CASE_LOW (t)) {
-        dump_child ("low ", CASE_LOW (t));
-       if (CASE_HIGH (t)) {
-         dump_child ("high", CASE_HIGH (t));
+      if (CASE_LOW (t))
+       {
+         dump_child ("low ", CASE_LOW (t));
+         if (CASE_HIGH (t))
+           dump_child ("high", CASE_HIGH (t));
        }
-      }
       break;
     case LABEL_EXPR:
       dump_child ("name", TREE_OPERAND (t,0));

diff --git a/gcc/tree.c b/gcc/tree.c
index d0c56c40dd22a8faf977eb774713855137822aac..4ee65f0e1b2ed7f8cd6a38851f0eaa73037b6532 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -3220,7 +3220,12 @@ expanded_location
 expand_location (source_location loc)
 {
   expanded_location xloc;
-  if (loc == 0) { xloc.file = NULL; xloc.line = 0;  xloc.column = 0; }
+  if (loc == 0)
+    {
+      xloc.file = NULL;
+      xloc.line = 0;
+      xloc.column = 0;
+    }
   else
     {
       const struct line_map *map = linemap_lookup (&line_table, loc);