This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Committed] Some minor coding style clean-ups


Inspired by Steven Bosscher's recent coding style catch at
http://gcc.gnu.org/ml/gcc-patches/2006-10/msg01458.html  I decided
to do a quick audit of the gcc/ directory for instances of "){" and
") {" which would often indicate a failure to follow the preferred
GNU coding and indentation style.  The small patch below fixes the
few middle-end examples that showed up.

None of these changes should conflict with the major pending middle-end
branch merges; dataflow, autovect, CSE, tuples, stringops or LTO tree
clean-up. (fingers crossed).


The following patch was tested on x86_64-unknown-linux-gnu with a
full "make bootstrap", all default languages, and regression tested
with a top-level "make -k check" with no new failures.

Committed to mainline as revision 118187.



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.


Index: builtins.c
===================================================================
*** builtins.c	(revision 118098)
--- builtins.c	(working copy)
*************** expand_builtin_mathfn_3 (tree exp, rtx t
*** 2084,2090 ****

    /* Check if sincos insn is available, otherwise fallback
       to sin or cos insn.  */
!   if (builtin_optab->handlers[(int) mode].insn_code == CODE_FOR_nothing) {
      switch (DECL_FUNCTION_CODE (fndecl))
        {
        CASE_FLT_FN (BUILT_IN_SIN):
--- 2084,2090 ----

    /* Check if sincos insn is available, otherwise fallback
       to sin or cos insn.  */
!   if (builtin_optab->handlers[(int) mode].insn_code == CODE_FOR_nothing)
      switch (DECL_FUNCTION_CODE (fndecl))
        {
        CASE_FLT_FN (BUILT_IN_SIN):
*************** expand_builtin_mathfn_3 (tree exp, rtx t
*** 2094,2100 ****
        default:
  	gcc_unreachable ();
        }
-   }

    /* Before working hard, check whether the instruction is available.  */
    if (builtin_optab->handlers[(int) mode].insn_code != CODE_FOR_nothing)
--- 2094,2099 ----
Index: ddg.c
===================================================================
*** ddg.c	(revision 118098)
--- ddg.c	(working copy)
*************** print_ddg_edge (FILE *file, ddg_edge_ptr
*** 549,555 ****
  {
    char dep_c;

!   switch (e->type) {
      case OUTPUT_DEP :
        dep_c = 'O';
        break;
--- 549,556 ----
  {
    char dep_c;

!   switch (e->type)
!     {
      case OUTPUT_DEP :
        dep_c = 'O';
        break;
*************** print_ddg_edge (FILE *file, ddg_edge_ptr
*** 558,564 ****
        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));
--- 559,565 ----
        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));
Index: dwarf2out.c
===================================================================
*** dwarf2out.c	(revision 118098)
--- dwarf2out.c	(working copy)
*************** prune_unused_types_walk (dw_die_ref die)
*** 14046,14080 ****
    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;

!     /* It's a type node --- don't mark it.  */
!     return;

!   default:
!     /* Mark everything else.  */
!     break;
    }

    die->die_mark = 1;
--- 14046,14081 ----
    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;

!       /* It's a type node --- don't mark it.  */
!       return;

!     default:
!       /* Mark everything else.  */
!       break;
    }

    die->die_mark = 1;
Index: ifcvt.c
===================================================================
*** ifcvt.c	(revision 118098)
--- ifcvt.c	(working copy)
*************** noce_try_cmove_arith (struct noce_if_inf
*** 1329,1344 ****
  	return FALSE;
      }
    else
      {
!       insn_cost = 0;
      }

-   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)
      {
--- 1329,1343 ----
  	return FALSE;
      }
    else
+     insn_cost = 0;
+
+   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)
      {
Index: langhooks.c
===================================================================
*** langhooks.c	(revision 118098)
--- langhooks.c	(working copy)
*************** add_builtin_function (const char *name,
*** 605,614 ****
    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);
!   }

    /* Possibly apply some default attributes to this built-in function.  */
    if (attrs)
--- 605,615 ----
    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);
!     }

    /* Possibly apply some default attributes to this built-in function.  */
    if (attrs)
Index: reg-stack.c
===================================================================
*** reg-stack.c	(revision 118098)
--- reg-stack.c	(working copy)
*************** subst_stack_regs_pat (rtx insn, stack re
*** 1702,1712 ****

  		/* 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);
! 		}

  		replace_reg (src1, FIRST_STACK_REG);
  		replace_reg (src2, FIRST_STACK_REG + 1);
--- 1702,1713 ----

  		/* 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);
! 		  }

  		replace_reg (src1, FIRST_STACK_REG);
  		replace_reg (src2, FIRST_STACK_REG + 1);
*************** subst_stack_regs_pat (rtx insn, stack re
*** 1733,1743 ****

  		/* 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);
! 		}

  		replace_reg (src1, FIRST_STACK_REG);
  		replace_reg (src2, FIRST_STACK_REG + 1);
--- 1734,1745 ----

  		/* 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);
! 		  }

  		replace_reg (src1, FIRST_STACK_REG);
  		replace_reg (src2, FIRST_STACK_REG + 1);
*************** subst_stack_regs_pat (rtx insn, stack re
*** 1760,1770 ****

  		/* 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);
! 		}

  		replace_reg (src1, FIRST_STACK_REG);
  		break;
--- 1762,1773 ----

  		/* 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);
! 		  }

  		replace_reg (src1, FIRST_STACK_REG);
  		break;
*************** subst_stack_regs_pat (rtx insn, stack re
*** 1786,1798 ****

  		/* 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);

! 		  regstack->top++;
! 		}

  		replace_reg (src1, FIRST_STACK_REG);
  		break;
--- 1789,1802 ----

  		/* 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);

! 		    regstack->top++;
! 		  }

  		replace_reg (src1, FIRST_STACK_REG);
  		break;
Index: tree.c
===================================================================
*** tree.c	(revision 118098)
--- tree.c	(working copy)
*************** expanded_location
*** 3220,3226 ****
  expand_location (source_location loc)
  {
    expanded_location xloc;
!   if (loc == 0) { xloc.file = NULL; xloc.line = 0;  xloc.column = 0; }
    else
      {
        const struct line_map *map = linemap_lookup (&line_table, loc);
--- 3220,3231 ----
  expand_location (source_location loc)
  {
    expanded_location xloc;
!   if (loc == 0)
!     {
!       xloc.file = NULL;
!       xloc.line = 0;
!       xloc.column = 0;
!     }
    else
      {
        const struct line_map *map = linemap_lookup (&line_table, loc);
Index: tree-dump.c
===================================================================
*** tree-dump.c	(revision 118098)
--- tree-dump.c	(working copy)
*************** dequeue_and_dump (dump_info_p di)
*** 650,661 ****

      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));
  	}
-       }
        break;
      case LABEL_EXPR:
        dump_child ("name", TREE_OPERAND (t,0));
--- 650,661 ----

      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));
  	}
        break;
      case LABEL_EXPR:
        dump_child ("name", TREE_OPERAND (t,0));


Roger
--


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]