gas/dw2gencfi.c formatting

	* dw2gencfi.c: Wrap overlong lines.  Add parens for emacs
	auto reformat.  Formatting and whitespace fixes.

2 files changed, 35 insertions, 25 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 11b7ac84397..24871a2abc5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-06  Alan Modra  <amodra@gmail.com>
+
+	* dw2gencfi.c: Wrap overlong lines.  Add parens for emacs
+	auto reformat.  Formatting and whitespace fixes.
+
 2017-03-05  Mark Wielaard  <mark@klomp.org>
 
 	* dwarf2dbg.c (out_debug_abbrev): Use DW_FORM_strp instead of
diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index d14c06e5f56..b90b48f087f 100644
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -831,8 +831,8 @@ dot_cfi (int arg)
 
   /* If the last address was not at the current PC, advance to current.  */
   if (symbol_get_frag (frchain_now->frch_cfi_data->last_address) != frag_now
-      || S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
-	 != frag_now_fix ())
+      || (S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
+	  != frag_now_fix ()))
     cfi_add_advance_loc (symbol_temp_new_now ());
 
   switch (arg)
@@ -961,8 +961,8 @@ dot_cfi_escape (int ignored ATTRIBUTE_UNUSED)
 
   /* If the last address was not at the current PC, advance to current.  */
   if (symbol_get_frag (frchain_now->frch_cfi_data->last_address) != frag_now
-      || S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
-	 != frag_now_fix ())
+      || (S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
+	  != frag_now_fix ()))
     cfi_add_advance_loc (symbol_temp_new_now ());
 
   tail = &head;
@@ -1009,13 +1009,13 @@ dot_cfi_personality (int ignored ATTRIBUTE_UNUSED)
   if ((encoding & 0xff) != encoding
       || ((((encoding & 0x70) != 0
 #if CFI_DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
-	   && (encoding & 0x70) != DW_EH_PE_pcrel
+	    && (encoding & 0x70) != DW_EH_PE_pcrel
 #endif
-	  )
-	 /* leb128 can be handled, but does something actually need it?  */
+	    )
+	   /* leb128 can be handled, but does something actually need it?  */
 	   || (encoding & 7) == DW_EH_PE_uleb128
 	   || (encoding & 7) > DW_EH_PE_udata8)
-	&& tc_cfi_reloc_for_encoding (encoding) == BFD_RELOC_NONE))
+	  && tc_cfi_reloc_for_encoding (encoding) == BFD_RELOC_NONE))
     {
       as_bad (_("invalid or unsupported encoding in .cfi_personality"));
       ignore_rest_of_line ();
@@ -1082,8 +1082,8 @@ dot_cfi_lsda (int ignored ATTRIBUTE_UNUSED)
 #if CFI_DIFF_LSDA_OK || defined tc_cfi_emit_pcrel_expr
 	    && (encoding & 0x70) != DW_EH_PE_pcrel
 #endif
-	   )
-	 /* leb128 can be handled, but does something actually need it?  */
+	    )
+	   /* leb128 can be handled, but does something actually need it?  */
 	   || (encoding & 7) == DW_EH_PE_uleb128
 	   || (encoding & 7) > DW_EH_PE_udata8)
 	  && tc_cfi_reloc_for_encoding (encoding) == BFD_RELOC_NONE))
@@ -1143,8 +1143,8 @@ dot_cfi_val_encoded_addr (int ignored ATTRIBUTE_UNUSED)
 
   /* If the last address was not at the current PC, advance to current.  */
   if (symbol_get_frag (frchain_now->frch_cfi_data->last_address) != frag_now
-      || S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
-	 != frag_now_fix ())
+      || (S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
+	  != frag_now_fix ()))
     cfi_add_advance_loc (symbol_temp_new_now ());
 
   insn_ptr = alloc_cfi_insn_data ();
@@ -1160,7 +1160,7 @@ dot_cfi_val_encoded_addr (int ignored ATTRIBUTE_UNUSED)
 	  && (encoding & 0x70) != DW_EH_PE_pcrel
 #endif
 	  )
-	 /* leb128 can be handled, but does something actually need it?  */
+      /* leb128 can be handled, but does something actually need it?  */
       || (encoding & 7) == DW_EH_PE_uleb128
       || (encoding & 7) > DW_EH_PE_udata8)
     {
@@ -1204,8 +1204,8 @@ dot_cfi_label (int ignored ATTRIBUTE_UNUSED)
 
   /* If the last address was not at the current PC, advance to current.  */
   if (symbol_get_frag (frchain_now->frch_cfi_data->last_address) != frag_now
-      || S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
-	 != frag_now_fix ())
+      || (S_GET_VALUE (frchain_now->frch_cfi_data->last_address)
+	  != frag_now_fix ()))
     cfi_add_advance_loc (symbol_temp_new_now ());
 
   cfi_add_label (name);
@@ -1235,7 +1235,8 @@ dot_cfi_sections (int ignored ATTRIBUTE_UNUSED)
 	else if (strncmp (name, ".debug_frame", sizeof ".debug_frame") == 0)
 	  sections |= CFI_EMIT_debug_frame;
 #if SUPPORT_COMPACT_EH
-	else if (strncmp (name, ".eh_frame_entry", sizeof ".eh_frame_entry") == 0)
+	else if (strncmp (name, ".eh_frame_entry",
+			  sizeof ".eh_frame_entry") == 0)
 	  {
 	    compact_eh = TRUE;
 	    sections |= CFI_EMIT_eh_frame_compact;
@@ -1258,21 +1259,23 @@ dot_cfi_sections (int ignored ATTRIBUTE_UNUSED)
 	  {
 	    name = input_line_pointer++;
 	    SKIP_WHITESPACE ();
-	    if (!is_name_beginner (*input_line_pointer) && *input_line_pointer != '"')
+	    if (!is_name_beginner (*input_line_pointer)
+		&& *input_line_pointer != '"')
 	      {
 		input_line_pointer = name;
 		break;
 	      }
 	  }
-	else if (is_name_beginner (*input_line_pointer) || *input_line_pointer == '"')
+	else if (is_name_beginner (*input_line_pointer)
+		 || *input_line_pointer == '"')
 	  break;
       }
 
   demand_empty_rest_of_line ();
   if (cfi_sections_set
       && (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact))
-      && (cfi_sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact))
-	 != (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact)))
+      && ((cfi_sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact))
+	  != (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact))))
     as_bad (_("inconsistent uses of .cfi_sections"));
   cfi_sections = sections;
 }
@@ -2046,8 +2049,8 @@ select_cie_for_fde (struct fde_entry *fde, bfd_boolean eh_frame,
       if (cie->per_encoding != DW_EH_PE_omit)
 	{
 	  if (cie->personality.X_op != fde->personality.X_op
-	      || cie->personality.X_add_number
-		 != fde->personality.X_add_number)
+	      || (cie->personality.X_add_number
+		  != fde->personality.X_add_number))
 	    continue;
 	  switch (cie->personality.X_op)
 	    {
@@ -2310,7 +2313,7 @@ cfi_finish (void)
 
 #if SUPPORT_COMPACT_EH
 	      /* Emit a LEGACY format header if we have processed all
-	         of the .cfi directives without encountering either inline or
+		 of the .cfi directives without encountering either inline or
 		 out-of-line compact unwinding opcodes.  */
 	      if (fde->eh_header_type == EH_COMPACT_HAS_LSDA
 		  || fde->eh_header_type == EH_COMPACT_UNKNOWN)
@@ -2348,7 +2351,8 @@ cfi_finish (void)
 
 	      if (fde->end_address == NULL)
 		{
-		  as_bad (_("open CFI at the end of file; missing .cfi_endproc directive"));
+		  as_bad (_("open CFI at the end of file; "
+			    "missing .cfi_endproc directive"));
 		  fde->end_address = fde->start_address;
 		}
 
@@ -2503,7 +2507,8 @@ cfi_finish (void)
 		}
 	      if (fde->end_address == NULL)
 		{
-		  as_bad (_("open CFI at the end of file; missing .cfi_endproc directive"));
+		  as_bad (_("open CFI at the end of file; "
+			    "missing .cfi_endproc directive"));
 		  fde->end_address = fde->start_address;
 		}