MSP430: Fix whitespace errors and incorrect indentation in config/msp430/*.{c,h} files

2019-08-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	MSP430: Fix whitespace errors and incorrect indentation in
	config/msp430/*.{c,h} files

	* config/msp430/driver-msp430.c (msp430_select_cpu): Fix indentation.
	(msp430_select_hwmult_lib): Likewise.
	* config/msp430/msp430-devices.c (parse_devices_csv_1): Likewise.
	(msp430_extract_mcu_data): Likewise.
	(struct t_msp430_mcu_data): Likewise.
	* config/msp430/msp430.c (struct machine_function): Remove whitespace
	before left square bracket.
	(msp430_option_override): Fix indentation.
	(msp430_hard_regno_nregs_with_padding): Likewise.
	(msp430_initial_elimination_offset): Likewise.
	(msp430_special_register_convention_p): Remove whitespace before left
	square bracket and after exclamation mark.
	(msp430_evaluate_arg): Likewise.
	(msp430_callee_copies): Fix indentation.
	(msp430_gimplify_va_arg_expr): Likewise.
	(msp430_function_arg_advance): Remove whitespace before left square
	bracket.
	(reg_ok_for_addr): Likewise.
	(msp430_preserve_reg_p): Likewise.
	(msp430_compute_frame_info): Likewise.
	(msp430_asm_output_addr_const_extra): Add space between function name
	and open parenthesis.
	(has_section_name): Fix indentation.
	(msp430_attr): Remove trailing whitespace.
	(msp430_section_attr): Likewise.
	(msp430_data_attr): Likewise.
	(struct msp430_attribute_table): Fix comment and whitespace.
	(msp430_start_function): Remove whitespace before left square bracket.
	Add space between function name and open parenthesis.
	(msp430_select_section): Remove trailing whitespace.
	(msp430_section_type_flags): Remove trailing whitespace.
	(msp430_unique_section): Remove space before closing parenthesis.
	(msp430_output_aligned_decl_common): Change 8 spaces to a tab.
	(msp430_builtins): Remove whitespace before left square bracket.
	(msp430_init_builtins):	Fix indentation.
	(msp430_expand_prologue): Remove whitespace before left square bracket.
	Remove space before closing parenthesis.
	(msp430_expand_epilogue): Remove whitespace before left square bracket.
	(msp430_split_movsi): Remove space before closing parenthesis.
	(helper_function_name_mappings): Fix indentation.
	(msp430_use_f5_series_hwmult): Fix whitespace.
	(use_32bit_hwmult): Likewise.
	(msp430_no_hwmult): Likewise.
	(msp430_output_labelref): Remove whitespace before left square bracket.
	(msp430_print_operand_raw): Likewise.
	(msp430_print_operand_addr): Likewise.
	(msp430_print_operand): Add two spaces after '.' in comment.
	Fix trailing whitespace.
	(msp430x_extendhisi): Fix indentation.
	* config/msp430/msp430.h (TARGET_CPU_CPP_BUILTINS): Change 8 spaces to
	tab.
	(PC_REGNUM): Likewise.
	(STACK_POINTER_REGNUM): Likewise.
	(CC_REGNUM): Likewise.

From-SVN: r274536

gcc/ChangeLog

+2019-08-15  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	MSP430: Fix whitespace errors and incorrect indentation in
+	config/msp430/*.{c,h} files
+
+	* config/msp430/driver-msp430.c (msp430_select_cpu): Fix indentation.
+	(msp430_select_hwmult_lib): Likewise.
+	* config/msp430/msp430-devices.c (parse_devices_csv_1): Likewise.
+	(msp430_extract_mcu_data): Likewise.
+	(struct t_msp430_mcu_data): Likewise.
+	* config/msp430/msp430.c (struct machine_function): Remove whitespace
+	before left square bracket.
+	(msp430_option_override): Fix indentation.
+	(msp430_hard_regno_nregs_with_padding): Likewise.
+	(msp430_initial_elimination_offset): Likewise.
+	(msp430_special_register_convention_p): Remove whitespace before left
+	square bracket and after exclamation mark.
+	(msp430_evaluate_arg): Likewise.
+	(msp430_callee_copies): Fix indentation.
+	(msp430_gimplify_va_arg_expr): Likewise.
+	(msp430_function_arg_advance): Remove whitespace before left square
+	bracket.
+	(reg_ok_for_addr): Likewise.
+	(msp430_preserve_reg_p): Likewise.
+	(msp430_compute_frame_info): Likewise.
+	(msp430_asm_output_addr_const_extra): Add space between function name
+	and open parenthesis.
+	(has_section_name): Fix indentation.
+	(msp430_attr): Remove trailing whitespace.
+	(msp430_section_attr): Likewise.
+	(msp430_data_attr): Likewise.
+	(struct msp430_attribute_table): Fix comment and whitespace.
+	(msp430_start_function): Remove whitespace before left square bracket.
+	Add space between function name and open parenthesis.
+	(msp430_select_section): Remove trailing whitespace.
+	(msp430_section_type_flags): Remove trailing whitespace.
+	(msp430_unique_section): Remove space before closing parenthesis.
+	(msp430_output_aligned_decl_common): Change 8 spaces to a tab.
+	(msp430_builtins): Remove whitespace before left square bracket.
+	(msp430_init_builtins):	Fix indentation.
+	(msp430_expand_prologue): Remove whitespace before left square bracket.
+	Remove space before closing parenthesis.
+	(msp430_expand_epilogue): Remove whitespace before left square bracket.
+	(msp430_split_movsi): Remove space before closing parenthesis.
+	(helper_function_name_mappings): Fix indentation.
+	(msp430_use_f5_series_hwmult): Fix whitespace.
+	(use_32bit_hwmult): Likewise.
+	(msp430_no_hwmult): Likewise.
+	(msp430_output_labelref): Remove whitespace before left square bracket.
+	(msp430_print_operand_raw): Likewise.
+	(msp430_print_operand_addr): Likewise.
+	(msp430_print_operand): Add two spaces after '.' in comment.
+	Fix trailing whitespace.
+	(msp430x_extendhisi): Fix indentation.
+	* config/msp430/msp430.h (TARGET_CPU_CPP_BUILTINS): Change 8 spaces to
+	tab.
+	(PC_REGNUM): Likewise.
+	(STACK_POINTER_REGNUM): Likewise.
+	(CC_REGNUM): Likewise.
+
 2019-08-15  Richard Biener  <rguenther@suse.de>
 
 	PR target/91454

gcc/config/msp430/driver-msp430.c

@@ -103,7 +103,7 @@ msp430_select_hwmult_lib (int argc ATTRIBUTE_UNUSED, const char ** argv ATTRIBUT
 	    {
 	      const char * name;
 	      const char * lib;
-	} hwmult_options [] =
+	    } hwmult_options[] =
 	    {
 	      { "none", "-lmul_none" },
 	      { "auto", "-lmul_AUTO" }, /* Should not see this one... */

gcc/config/msp430/msp430-devices.c

@@ -362,7 +362,7 @@ msp430_extract_mcu_data (const char * mcu_name)
    devices.csv file released by TI in September 2016.  */
 
 struct t_msp430_mcu_data hard_msp430_mcu_data[605] =
-{
+  {
     { "cc430f5123",2,8 },
     { "cc430f5125",2,8 },
     { "cc430f5133",2,8 },
@@ -968,4 +968,4 @@ struct t_msp430_mcu_data hard_msp430_mcu_data[605] =
     { "rf430frl153h_rom",0,0 },
     { "rf430frl154h",0,0 },
     { "rf430frl154h_rom",0,0 }
-};
+  };

gcc/config/msp430/msp430.c

@@ -64,7 +64,7 @@ struct GTY(()) machine_function
   /* If set, the rest of the fields have been computed.  */
   int computed;
   /* Which registers need to be saved in the pro/epilogue.  */
-  int need_to_save [FIRST_PSEUDO_REGISTER];
+  int need_to_save[FIRST_PSEUDO_REGISTER];
 
   /* These fields describe the frame layout...  */
   /* arg pointer */
@@ -531,7 +531,7 @@ msp430_addr_space_convert (rtx op, tree from_type, tree to_type)
 
 /* For each function, we list the gcc version and the TI version on
    each line, where we're converting the function names.  */
-static char const * const special_convention_function_names [] =
+static char const * const special_convention_function_names[] =
 {
   "__muldi3", "__mspabi_mpyll",
   "__udivdi3", "__mspabi_divull",
@@ -556,8 +556,8 @@ msp430_special_register_convention_p (const char *name)
 {
   int i;
 
-  for (i = 0; special_convention_function_names [i]; i++)
-    if (! strcmp (name, special_convention_function_names [i]))
+  for (i = 0; special_convention_function_names[i]; i++)
+    if (!strcmp (name, special_convention_function_names[i]))
       return true;
 
   return false;
@@ -653,7 +653,7 @@ msp430_evaluate_arg (cumulative_args_t cap,
     {
     case 1:
       for (i = 0; i < 4; i++)
-	if (! ca->reg_used [i])
+	if (!ca->reg_used[i])
 	  {
 	    ca->reg_count = 1;
 	    ca->start_reg = CA_FIRST_REG + i;
@@ -662,13 +662,13 @@ msp430_evaluate_arg (cumulative_args_t cap,
       break;
     case 2:
       for (i = 0; i < 3; i++)
-	if (! ca->reg_used [i] && ! ca->reg_used [i + 1])
+	if (!ca->reg_used[i] && !ca->reg_used[i + 1])
 	  {
 	    ca->reg_count = 2;
 	    ca->start_reg = CA_FIRST_REG + i;
 	    return;
 	  }
-      if (! ca->reg_used [3] && ca->can_split)
+      if (!ca->reg_used[3] && ca->can_split)
 	{
 	  ca->reg_count = 1;
 	  ca->mem_count = 2;
@@ -679,10 +679,10 @@ msp430_evaluate_arg (cumulative_args_t cap,
     case 3:
     case 4:
       ca->can_split = 0;
-      if (! ca->reg_used [0]
-	  && ! ca->reg_used [1]
-	  && ! ca->reg_used [2]
-	  && ! ca->reg_used [3])
+      if (!ca->reg_used[0]
+	  && !ca->reg_used[1]
+	  && !ca->reg_used[2]
+	  && !ca->reg_used[3])
 	{
 	  ca->reg_count = 4;
 	  ca->start_reg = CA_FIRST_REG;
@@ -781,7 +781,7 @@ msp430_function_arg_advance (cumulative_args_t cap,
 
   if (ca->start_reg >= CA_FIRST_REG)
     for (i = 0; i < ca->reg_count; i ++)
-      ca->reg_used [i + ca->start_reg - CA_FIRST_REG] = 1;
+      ca->reg_used[i + ca->start_reg - CA_FIRST_REG] = 1;
 
   ca->special_p = 0;
 }
@@ -942,7 +942,7 @@ reg_ok_for_addr (rtx r, bool strict)
   int rn = REGNO (r);
 
   if (strict && rn >= FIRST_PSEUDO_REGISTER)
-    rn = reg_renumber [rn];
+    rn = reg_renumber[rn];
   if (strict && 0 <= rn && rn < FIRST_PSEUDO_REGISTER)
     return true;
   if (!strict)
@@ -1036,7 +1036,7 @@ msp430_asm_integer (rtx x, unsigned int size, int aligned_p)
 static bool
 msp430_asm_output_addr_const_extra (FILE *file ATTRIBUTE_UNUSED, rtx x)
 {
-  debug_rtx(x);
+  debug_rtx (x);
   return false;
 }
 
@@ -1146,7 +1146,7 @@ msp430_preserve_reg_p (int regno)
     return true;
 
   /* Shouldn't be more than the above, but just in case...  */
-  if (fixed_regs [regno])
+  if (fixed_regs[regno])
     return false;
 
   /* For interrupt functions we must save and restore the used regs that
@@ -1163,7 +1163,7 @@ msp430_preserve_reg_p (int regno)
 	return true;
     }
 
-  if (!call_used_regs [regno]
+  if (!call_used_regs[regno]
       && df_regs_ever_live_p (regno))
     return true;
 
@@ -1185,11 +1185,11 @@ msp430_compute_frame_info (void)
   for (i = 0; i < ARG_POINTER_REGNUM; i ++)
     if (msp430_preserve_reg_p (i))
       {
-	cfun->machine->need_to_save [i] = 1;
+	cfun->machine->need_to_save[i] = 1;
 	cfun->machine->framesize_regs += (TARGET_LARGE ? 4 : 2);
       }
     else
-      cfun->machine->need_to_save [i] = 0;
+      cfun->machine->need_to_save[i] = 0;
 
   if ((cfun->machine->framesize_locals + cfun->machine->framesize_outgoing) & 1)
     cfun->machine->framesize_locals ++;
@@ -1504,10 +1504,9 @@ msp430_data_attr (tree * node,
 
 /* Table of MSP430-specific attributes.  */
 const struct attribute_spec msp430_attribute_table[] =
-{
-  /* Name        min_num_args     type_req,             handler
-		      max_num_args,     fn_type_req		exclude
-                          decl_req               affects_type_identity.  */
+  {
+    /* { name, min_num_args, max_num_args, decl_req, type_req, fn_type_req,
+	 affects_type_identity, handler, exclude } */
     { ATTR_INTR,	0, 1, true,  false, false, false, msp430_attr, NULL },
     { ATTR_NAKED,       0, 0, true,  false, false, false, msp430_attr, NULL },
     { ATTR_REENT,       0, 0, true,  false, false, false, msp430_attr, NULL },
@@ -1525,7 +1524,7 @@ const struct attribute_spec msp430_attribute_table[] =
       NULL },
 
     { NULL,		0, 0, false, false, false, false, NULL,  NULL }
-};
+  };
 
 #undef  TARGET_ASM_FUNCTION_PROLOGUE
 #define TARGET_ASM_FUNCTION_PROLOGUE	msp430_start_function
@@ -1563,9 +1562,9 @@ msp430_start_function (FILE *outfile)
   n = 0;
   fprintf (outfile, "; saved regs:");
   for (r = 0; r < ARG_POINTER_REGNUM; r++)
-    if (cfun->machine->need_to_save [r])
+    if (cfun->machine->need_to_save[r])
       {
-	fprintf (outfile, " %s", reg_names [r]);
+	fprintf (outfile, " %s", reg_names[r]);
 	n = 1;
       }
   if (n == 0)
@@ -1644,7 +1643,7 @@ msp430_start_function (FILE *file, const char *name, tree decl)
     }
 
   switch_to_section (function_section (decl));
-  ASM_OUTPUT_TYPE_DIRECTIVE(file, name, "function");
+  ASM_OUTPUT_TYPE_DIRECTIVE (file, name, "function");
   ASM_OUTPUT_FUNCTION_LABEL (file, name, decl);
 }
 
@@ -1856,8 +1855,7 @@ msp430_unique_section (tree decl, int reloc)
       || TREE_CODE (decl) == INTEGER_CST
       || TREE_CODE (decl) == VECTOR_CST
       || TREE_CODE (decl) == COMPLEX_CST
-      || (prefix = gen_prefix (decl)) == NULL
-      )
+      || (prefix = gen_prefix (decl)) == NULL)
     return;
 
   const char * dec_name = DECL_SECTION_NAME (decl);
@@ -1933,7 +1931,7 @@ enum msp430_builtin
   MSP430_BUILTIN_max
 };
 
-static GTY(()) tree msp430_builtins [(int) MSP430_BUILTIN_max];
+static GTY(()) tree msp430_builtins[(int) MSP430_BUILTIN_max];
 
 static void
 msp430_init_builtins (void)
@@ -2184,7 +2182,7 @@ msp430_expand_prologue (void)
     }
 
   for (i = 15; i >= 4; i--)
-    if (cfun->machine->need_to_save [i])
+    if (cfun->machine->need_to_save[i])
       {
 	int seq, count;
 	rtx note;
@@ -2223,7 +2221,7 @@ msp430_expand_prologue (void)
 
 		XVECEXP (note, 0, j + 1) =
 		  F (gen_rtx_SET (gen_rtx_MEM (Pmode, addr),
-				  gen_rtx_REG (Pmode, i - j)) );
+				  gen_rtx_REG (Pmode, i - j)));
 	      }
 
 	    add_reg_note (p, REG_FRAME_RELATED_EXPR, note);
@@ -2258,16 +2256,16 @@ msp430_expand_epilogue (int is_eh)
       return;
     }
 
-  if (cfun->machine->need_to_save [10])
+  if (cfun->machine->need_to_save[10])
     {
       /* Check for a helper function.  */
       helper_n = 7; /* For when the loop below never sees a match.  */
       for (i = 9; i >= 4; i--)
-	if (!cfun->machine->need_to_save [i])
+	if (!cfun->machine->need_to_save[i])
 	  {
 	    helper_n = 10 - i;
 	    for (; i >= 4; i--)
-	      if (cfun->machine->need_to_save [i])
+	      if (cfun->machine->need_to_save[i])
 		{
 		  helper_n = 0;
 		  break;
@@ -2311,7 +2309,7 @@ msp430_expand_epilogue (int is_eh)
     }
 
   for (i = 4; i <= 15; i++)
-    if (cfun->machine->need_to_save [i])
+    if (cfun->machine->need_to_save[i])
       {
 	int seq, count;
 
@@ -2432,7 +2430,7 @@ static struct
   int need_430x;
   rtx (*genfunc)(rtx,rtx);
 }
-  const_shift_helpers[] =
+const_shift_helpers[] =
 {
 #define CSH(N,C,X,G) { "__mspabi_" N, C, X, gen_##G }
 
@@ -2624,8 +2622,7 @@ msp430_split_movsi (rtx *operands)
 	   /* Catch the case where we are loading (rN, rN+1) from mem (rN).  */
 	   || (REG_P (op00) && reg_mentioned_p (op00, op10))
 	   /* Or storing (rN) into mem (rN).  */
-	   || (REG_P (op10) && reg_mentioned_p (op10, op00))
-	   )
+	   || (REG_P (op10) && reg_mentioned_p (op10, op00)))
     {
       operands[2] = op02;
       operands[4] = op12;
@@ -2650,8 +2647,8 @@ static const struct
   char const * const gcc_name;
   char const * const ti_name;
 }
-  helper_function_name_mappings [] =
-{
+helper_function_name_mappings[] =
+  {
     /* Floating point to/from integer conversions.  */
     { "__truncdfsf2", "__mspabi_cvtdf" },
     { "__extendsfdf2", "__mspabi_cvtfd" },
@@ -2684,7 +2681,7 @@ static const struct
     /* GCC uses individual functions for each comparison, TI uses one
        compare <=> function.  */
 
-  /* Floating point arithmatic */
+    /* Floating point arithmetic.  */
     { "__adddf3", "__mspabi_addd" },
     { "__addsf3", "__mspabi_addf" },
     { "__divdf3", "__mspabi_divd" },
@@ -2693,7 +2690,7 @@ static const struct
     { "__mulsf3", "__mspabi_mpyf" },
     { "__subdf3", "__mspabi_subd" },
     { "__subsf3", "__mspabi_subf" },
-  /* GCC does not use helper functions for negation */
+    /* GCC does not use helper functions for negation.  */
 
     /* Integer multiply, divide, remainder.  */
     { "__mulhi3", "__mspabi_mpyi" },
@@ -2725,7 +2722,7 @@ static const struct
     /* Arithmetic right shift - gcc already does these itself.  */
 
     { NULL, NULL }
-};
+  };
 
 /* Returns true if the current MCU supports an F5xxx series
    hardware multiper.  */
@@ -2829,10 +2826,10 @@ msp430_output_labelref (FILE *file, const char *name)
 {
   int i;
 
-  for (i = 0; helper_function_name_mappings [i].gcc_name; i++)
-    if (strcmp (helper_function_name_mappings [i].gcc_name, name) == 0)
+  for (i = 0; helper_function_name_mappings[i].gcc_name; i++)
+    if (strcmp (helper_function_name_mappings[i].gcc_name, name) == 0)
       {
-	name = helper_function_name_mappings [i].ti_name;
+	name = helper_function_name_mappings[i].ti_name;
 	break;
       }
 
@@ -2874,7 +2871,7 @@ msp430_print_operand_raw (FILE * file, rtx op)
   switch (GET_CODE (op))
     {
     case REG:
-      fprintf (file, "%s", reg_names [REGNO (op)]);
+      fprintf (file, "%s", reg_names[REGNO (op)]);
       break;
 
     case CONST_INT:
@@ -2919,7 +2916,7 @@ msp430_print_operand_addr (FILE * file, machine_mode /*mode*/, rtx addr)
     case PLUS:
       msp430_print_operand_raw (file, XEXP (addr, 1));
       gcc_assert (REG_P (XEXP (addr, 0)));
-      fprintf (file, "(%s)", reg_names [REGNO (XEXP (addr, 0))]);
+      fprintf (file, "(%s)", reg_names[REGNO (XEXP (addr, 0))]);
       return;
 
     case REG: