PATCH: various gas tidy-ups

PATCH: various gas tidy-ups

[Ben Elliston]

I have had these changes in my tree for a long time and want to now
get them checked in.  They're all pretty simple, but I wouldn't mind a
review before I commit them.  No testsuite regressions on i686-linux.

Thanks, Ben

2006-05-01  Ben Elliston  <bje@au.ibm.com>

	* listing.c (listing_listing): Remove useless loop.
	* macro.c (macro_expand): Remove is_positional local variable.
	* read.c (s_comm_internal): Simplify `if' condition 1 || x -> 1
	and simplify surrounding expressions, where possible.
	(assign_symbol): Likewise.
	(s_weakref): Likewise.
	* symbols.c (colon): Likewise.

Index: listing.c
===================================================================
RCS file: /cvs/src/src/gas/listing.c,v
retrieving revision 1.29
diff -u -p -r1.29 listing.c
--- listing.c   11 Aug 2005 01:25:20 -0000      1.29
+++ listing.c   1 May 2006 04:46:59 -0000
@@ -946,15 +946,6 @@ listing_listing (char *name ATTRIBUTE_UN
   buffer = xmalloc (listing_rhs_width);
   data_buffer = xmalloc (MAX_BYTES);
   eject = 1;
-  list = head;
-
-  while (list != (list_info_type *) NULL && 0)
-    {
-      if (list->next)
-       list->frag = list->next->frag;
-      list = list->next;
-    }
-
   list = head->next;
 
   while (list)
Index: macro.c
===================================================================
RCS file: /cvs/src/src/gas/macro.c,v
retrieving revision 1.42
diff -u -p -r1.42 macro.c
--- macro.c     28 Feb 2006 07:57:09 -0000      1.42
+++ macro.c     1 May 2006 04:47:01 -0000
@@ -1025,7 +1025,6 @@ macro_expand (int idx, sb *in, macro_ent
   sb t;
   formal_entry *ptr;
   formal_entry *f;
-  int is_positional = 0;
   int is_keyword = 0;
   int narg = 0;
   const char *err = NULL;
@@ -1116,8 +1115,6 @@ macro_expand (int idx, sb *in, macro_ent
        }
       else
        {
-         /* This is a positional arg.  */
-         is_positional = 1;
          if (is_keyword)
            {
              err = _("can't mix positional and keyword arguments");
Index: read.c
===================================================================
RCS file: /cvs/src/src/gas/read.c,v
retrieving revision 1.115
diff -u -p -r1.115 read.c
--- read.c      17 Nov 2005 07:29:28 -0000      1.115
+++ read.c      1 May 2006 04:47:04 -0000
@@ -1478,10 +1478,7 @@ s_comm_internal (int param,
          ignore_rest_of_line ();
          goto out;
        }
-      /* This could be avoided when the symbol wasn't used so far, but
-        the comment in struc-symbol.h says this flag isn't reliable.  */
-      if (1 || !symbol_used_p (symbolP))
-       symbolP = symbol_clone (symbolP, 1);
+      symbolP = symbol_clone (symbolP, 1);
       S_SET_SEGMENT (symbolP, undefined_section);
       S_SET_VALUE (symbolP, 0);
       symbol_set_frag (symbolP, &zero_address_frag);
@@ -2812,10 +2809,7 @@ assign_symbol (char *name, int mode)
       /* If the symbol is volatile, copy the symbol and replace the
         original with the copy, so that previous uses of the symbol will
         retain the value of the symbol at the point of use.  */
-      else if (S_IS_VOLATILE (symbolP)
-         /* This could be avoided when the symbol wasn't used so far, but
-            the comment in struc-symbol.h says this flag isn't reliable.  */
-         && (1 || symbol_used_p (symbolP)))
+      else if (S_IS_VOLATILE (symbolP))
        symbolP = symbol_clone (symbolP, 1);
     }
 
@@ -3186,17 +3180,14 @@ s_weakref (int ignore ATTRIBUTE_UNUSED)
 
   if (S_IS_DEFINED (symbolP) || symbol_equated_p (symbolP))
     {
-      if(!S_IS_VOLATILE (symbolP))
+      if (!S_IS_VOLATILE (symbolP))
        {
          as_bad (_("symbol `%s' is already defined"), name);
          *end_name = delim;
          ignore_rest_of_line ();
          return;
        }
-      /* This could be avoided when the symbol wasn't used so far, but
-        the comment in struc-symbol.h says this flag isn't reliable.  */
-      if (1 || !symbol_used_p (symbolP))
-       symbolP = symbol_clone (symbolP, 1);
+      symbolP = symbol_clone (symbolP, 1);
       S_CLEAR_VOLATILE (symbolP);
     }
 
Index: symbols.c
===================================================================
RCS file: /cvs/src/src/gas/symbols.c,v
retrieving revision 1.74
diff -u -p -r1.74 symbols.c
--- symbols.c   9 Jan 2006 17:14:40 -0000       1.74
+++ symbols.c   1 May 2006 04:47:07 -0000
@@ -336,10 +336,7 @@ colon (/* Just seen "x:" - rattle symbol
               || S_IS_COMMON (symbolP)
               || S_IS_VOLATILE (symbolP))
        {
-         if (S_IS_VOLATILE (symbolP)
-             /* This could be avoided when the symbol wasn't used so far, but
-                the comment in struc-symbol.h says this flag isn't reliable.  */
-             && (1 || !symbol_used_p (symbolP)))
+         if (S_IS_VOLATILE (symbolP))
            {
              symbolP = symbol_clone (symbolP, 1);
              S_SET_VALUE (symbolP, 0);

Re: PATCH: various gas tidy-ups

[Alan Modra]

On Mon, May 01, 2006 at 02:49:28PM +1000, Ben Elliston wrote:
> 	* listing.c (listing_listing): Remove useless loop.
> 	* macro.c (macro_expand): Remove is_positional local variable.
> 	* read.c (s_comm_internal): Simplify `if' condition 1 || x -> 1
> 	and simplify surrounding expressions, where possible.
> 	(assign_symbol): Likewise.
> 	(s_weakref): Likewise.
> 	* symbols.c (colon): Likewise.

OK mainline.

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre