2010-12-10 Tobias Burnus <burnus@net-b.de>

[deliverable/binutils-gdb.git] / gas / macro.c

diff --git a/gas/macro.c b/gas/macro.c
index afc560fbbc03f59c49d199483080e1e42c65c1b2..e39288355cbb7fbb63997262fad81264feb060be 100644 (file)
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -1,6 +1,6 @@
 /* macro.c - macro support for gas
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
 /* macro.c - macro support for gas
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,

-   2004, 2005 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 
    Written by Steve and Judy Chamberlain of Cygnus Support,
       sac@cygnus.com
 
    Written by Steve and Judy Chamberlain of Cygnus Support,
       sac@cygnus.com


@@ -9,7 +9,7 @@
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -22,65 +22,14 @@
    Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
    Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 

-#include "config.h"
-
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
-/* Indented so that pre-ansi C compilers will ignore it, rather than
-   choke on it.  Some versions of AIX require this to be the first
-   thing in the file.  */
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-#    if !defined (__STDC__) && !defined (__hpux)
-extern char *alloca ();
-#    else
-extern void *alloca ();
-#    endif /* __STDC__, __hpux */
-#   endif /* alloca */
-#  endif /* _AIX */
-# endif /* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
-
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif

 #include "as.h"
 #include "as.h"

-#include "libiberty.h"

 #include "safe-ctype.h"
 #include "sb.h"
 #include "safe-ctype.h"
 #include "sb.h"

-#include "hash.h"

 #include "macro.h"
 
 #include "macro.h"
 

-#include "asintl.h"
-

 /* The routines in this file handle macro definition and expansion.
    They are called by gas.  */
 
 /* The routines in this file handle macro definition and expansion.
    They are called by gas.  */
 

-/* Internal functions.  */
-
-static int get_token (int, sb *, sb *);
-static int getstring (int, sb *, sb *);
-static int get_any_string (int, sb *, sb *);
-static formal_entry *new_formal (void);
-static void del_formal (formal_entry *);
-static int do_formals (macro_entry *, int, sb *);
-static int get_apost_token (int, sb *, sb *, int);
-static int sub_actual (int, sb *, sb *, struct hash_control *, int, sb *, int);
-static const char *macro_expand_body
-  (sb *, sb *, formal_entry *, struct hash_control *, const macro_entry *);
-static const char *macro_expand (int, sb *, macro_entry *, sb *);
-static void free_macro(macro_entry *);
-

 #define ISWHITE(x) ((x) == ' ' || (x) == '\t')
 
 #define ISSEP(x) \
 #define ISWHITE(x) ((x) == ' ' || (x) == '\t')
 
 #define ISSEP(x) \


@@ -126,14 +75,14 @@ static int macro_number;
 
 void
 macro_init (int alternate, int mri, int strip_at,
 
 void
 macro_init (int alternate, int mri, int strip_at,

-           int (*expr) (const char *, int, sb *, int *))
+           int (*exp) (const char *, int, sb *, int *))

 {
   macro_hash = hash_new ();
   macro_defined = 0;
   macro_alternate = alternate;
   macro_mri = mri;
   macro_strip_at = strip_at;
 {
   macro_hash = hash_new ();
   macro_defined = 0;
   macro_alternate = alternate;
   macro_mri = mri;
   macro_strip_at = strip_at;

-  macro_expr = expr;
+  macro_expr = exp;

 }
 
 /* Switch in and out of alternate mode on the fly.  */
 }
 
 /* Switch in and out of alternate mode on the fly.  */


@@ -180,49 +129,52 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
 
   while (more)
     {
 
   while (more)
     {

-      /* Try and find the first pseudo op on the line.  */
+      /* Try to find the first pseudo op on the line.  */

       int i = line_start;
       int i = line_start;

+      bfd_boolean had_colon = FALSE;

 
 

-      if (! NO_PSEUDO_DOT && ! flag_m68k_mri)
-       {
-         /* With normal syntax we can suck what we want till we get
-            to the dot.  With the alternate, labels have to start in
-            the first column, since we can't tell what's a label and
-            whats a pseudoop.  */
+      /* With normal syntax we can suck what we want till we get
+        to the dot.  With the alternate, labels have to start in
+        the first column, since we can't tell what's a label and
+        what's a pseudoop.  */

 
 

-         if (! LABELS_WITHOUT_COLONS)
-           {
-             /* Skip leading whitespace.  */
-             while (i < ptr->len && ISWHITE (ptr->ptr[i]))
-               i++;
-           }
+      if (! LABELS_WITHOUT_COLONS)
+       {
+         /* Skip leading whitespace.  */
+         while (i < ptr->len && ISWHITE (ptr->ptr[i]))
+           i++;
+       }

 
 

-         for (;;)
+      for (;;)
+       {
+         /* Skip over a label, if any.  */
+         if (i >= ptr->len || ! is_name_beginner (ptr->ptr[i]))
+           break;
+         i++;
+         while (i < ptr->len && is_part_of_name (ptr->ptr[i]))
+           i++;
+         if (i < ptr->len && is_name_ender (ptr->ptr[i]))
+           i++;
+         /* Skip whitespace.  */
+         while (i < ptr->len && ISWHITE (ptr->ptr[i]))
+           i++;
+         /* Check for the colon.  */
+         if (i >= ptr->len || ptr->ptr[i] != ':')

            {
            {

-             /* Skip over a label, if any.  */
-             if (i >= ptr->len || ! is_name_beginner (ptr->ptr[i]))
+             /* LABELS_WITHOUT_COLONS doesn't mean we cannot have a
+                colon after a label.  If we do have a colon on the
+                first label then handle more than one label on the
+                line, assuming that each label has a colon.  */
+             if (LABELS_WITHOUT_COLONS && !had_colon)

                break;
                break;

-             i++;
-             while (i < ptr->len && is_part_of_name (ptr->ptr[i]))
-               i++;
-             if (i < ptr->len && is_name_ender (ptr->ptr[i]))
-               i++;
-             if (LABELS_WITHOUT_COLONS)
-               break;
-             /* Skip whitespace.  */
-             while (i < ptr->len && ISWHITE (ptr->ptr[i]))
-               i++;
-             /* Check for the colon.  */
-             if (i >= ptr->len || ptr->ptr[i] != ':')
-               {
-                 i = line_start;
-                 break;
-               }
-             i++;
-             line_start = i;
+             i = line_start;
+             break;

            }
            }

-
+         i++;
+         line_start = i;
+         had_colon = TRUE;

        }
        }

+

       /* Skip trailing whitespace.  */
       while (i < ptr->len && ISWHITE (ptr->ptr[i]))
        i++;
       /* Skip trailing whitespace.  */
       while (i < ptr->len && ISWHITE (ptr->ptr[i]))
        i++;


@@ -382,10 +334,10 @@ getstring (int idx, sb *in, sb *acc)
 /* Fetch string from the input stream,
    rules:
     'Bxyx<whitespace>          -> return 'Bxyza
 /* Fetch string from the input stream,
    rules:
     'Bxyx<whitespace>          -> return 'Bxyza

-    %<char>            -> return string of decimal value of x
-    "<string>"         -> return string
-    xyx<whitespace>     -> return xyz
-*/
+    %<expr>            -> return string of decimal value of <expr>
+    "string"           -> return string
+    (string)           -> return (string-including-whitespaces)
+    xyx<whitespace>     -> return xyz.  */

 
 static int
 get_any_string (int idx, sb *in, sb *out)
 
 static int
 get_any_string (int idx, sb *in, sb *out)


@@ -404,6 +356,7 @@ get_any_string (int idx, sb *in, sb *out)
        {
          int val;
          char buf[20];
        {
          int val;
          char buf[20];

+

          /* Turns the next expression into a string.  */
          /* xgettext: no-c-format */
          idx = (*macro_expr) (_("% operator needs absolute expression"),
          /* Turns the next expression into a string.  */
          /* xgettext: no-c-format */
          idx = (*macro_expr) (_("% operator needs absolute expression"),


@@ -417,13 +370,12 @@ get_any_string (int idx, sb *in, sb *out)
               || (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
               || (macro_alternate && in->ptr[idx] == '\''))
        {
               || (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
               || (macro_alternate && in->ptr[idx] == '\''))
        {

-         if (macro_alternate && ! macro_strip_at)
+         if (macro_alternate && ! macro_strip_at && in->ptr[idx] != '<')

            {
              /* Keep the quotes.  */
            {
              /* Keep the quotes.  */

-             sb_add_char (out, '\"');
-
+             sb_add_char (out, '"');

              idx = getstring (idx, in, out);
              idx = getstring (idx, in, out);

-             sb_add_char (out, '\"');
+             sb_add_char (out, '"');

            }
          else
            {
            }
          else
            {


@@ -432,26 +384,57 @@ get_any_string (int idx, sb *in, sb *out)
        }
       else
        {
        }
       else
        {

+         char *br_buf = (char *) xmalloc(1);
+         char *in_br = br_buf;
+
+         *in_br = '\0';

          while (idx < in->len
          while (idx < in->len

-                && in->ptr[idx] != ' '
-                && in->ptr[idx] != '\t'
+                && (*in_br
+                    || (in->ptr[idx] != ' '
+                        && in->ptr[idx] != '\t'))

                 && in->ptr[idx] != ','
                 && (in->ptr[idx] != '<'
                     || (! macro_alternate && ! macro_mri)))
            {
                 && in->ptr[idx] != ','
                 && (in->ptr[idx] != '<'
                     || (! macro_alternate && ! macro_mri)))
            {

-             if (in->ptr[idx] == '"'
-                 || in->ptr[idx] == '\'')
+             char tchar = in->ptr[idx];
+
+             switch (tchar)

                {
                {

-                 char tchar = in->ptr[idx];
+               case '"':
+               case '\'':

                  sb_add_char (out, in->ptr[idx++]);
                  while (idx < in->len
                         && in->ptr[idx] != tchar)
                    sb_add_char (out, in->ptr[idx++]);
                  if (idx == in->len)
                    return idx;
                  sb_add_char (out, in->ptr[idx++]);
                  while (idx < in->len
                         && in->ptr[idx] != tchar)
                    sb_add_char (out, in->ptr[idx++]);
                  if (idx == in->len)
                    return idx;

+                 break;
+               case '(':
+               case '[':
+                 if (in_br > br_buf)
+                   --in_br;
+                 else
+                   {
+                     br_buf = (char *) xmalloc(strlen(in_br) + 2);
+                     strcpy(br_buf + 1, in_br);
+                     free(in_br);
+                     in_br = br_buf;
+                   }
+                 *in_br = tchar;
+                 break;
+               case ')':
+                 if (*in_br == '(')
+                   ++in_br;
+                 break;
+               case ']':
+                 if (*in_br == '[')
+                   ++in_br;
+                 break;

                }
                }

-             sb_add_char (out, in->ptr[idx++]);
+             sb_add_char (out, tchar);
+             ++idx;

            }
            }

+         free(br_buf);

        }
     }
 
        }
     }
 


@@ -465,7 +448,7 @@ new_formal (void)
 {
   formal_entry *formal;
 
 {
   formal_entry *formal;
 

-  formal = xmalloc (sizeof (formal_entry));
+  formal = (formal_entry *) xmalloc (sizeof (formal_entry));

 
   sb_new (&formal->name);
   sb_new (&formal->def);
 
   sb_new (&formal->name);
   sb_new (&formal->def);


@@ -614,6 +597,26 @@ do_formals (macro_entry *macro, int idx, sb *in)
   return idx;
 }
 
   return idx;
 }
 

+/* Free the memory allocated to a macro.  */
+
+static void
+free_macro (macro_entry *macro)
+{
+  formal_entry *formal;
+
+  for (formal = macro->formals; formal; )
+    {
+      formal_entry *f;
+
+      f = formal;
+      formal = formal->next;
+      del_formal (f);
+    }
+  hash_die (macro->formal_hash);
+  sb_kill (&macro->sub);
+  free (macro);
+}
+

 /* Define a new macro.  Returns NULL on success, otherwise returns an
    error message.  If NAMEP is not NULL, *NAMEP is set to the name of
    the macro which was defined.  */
 /* Define a new macro.  Returns NULL on success, otherwise returns an
    error message.  If NAMEP is not NULL, *NAMEP is set to the name of
    the macro which was defined.  */


@@ -684,7 +687,7 @@ define_macro (int idx, sb *in, sb *label,
   if (hash_find (macro_hash, macro->name))
     error = _("Macro `%s' was already defined");
   if (!error)
   if (hash_find (macro_hash, macro->name))
     error = _("Macro `%s' was already defined");
   if (!error)

-    error = hash_jam (macro_hash, macro->name, (PTR) macro);
+    error = hash_jam (macro_hash, macro->name, (void *) macro);

 
   if (namep != NULL)
     *namep = macro->name;
 
   if (namep != NULL)
     *namep = macro->name;


@@ -745,6 +748,8 @@ sub_actual (int start, sb *in, sb *t, struct hash_control *formal_hash,
       /* Doing this permits people to use & in macro bodies.  */
       sb_add_char (out, '&');
       sb_add_sb (out, t);
       /* Doing this permits people to use & in macro bodies.  */
       sb_add_char (out, '&');
       sb_add_sb (out, t);

+      if (src != start && in->ptr[src - 1] == '&')
+       sb_add_char (out, '&');

     }
   else if (copyifnotthere)
     {
     }
   else if (copyifnotthere)
     {


@@ -785,9 +790,8 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
            }
          else
            {
            }
          else
            {

-             /* FIXME: Why do we do this?  */
-             /* At least in alternate mode this seems correct; without this
-                one can't append a literal to a parameter.  */
+             /* Permit macro parameter substition delineated with
+                an '&' prefix and optional '&' suffix.  */

              src = sub_actual (src + 1, in, &t, formal_hash, '&', out, 0);
            }
        }
              src = sub_actual (src + 1, in, &t, formal_hash, '&', out, 0);
            }
        }


@@ -865,7 +869,9 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
          if (! macro
              || src + 5 >= in->len
              || strncasecmp (in->ptr + src, "LOCAL", 5) != 0
          if (! macro
              || src + 5 >= in->len
              || strncasecmp (in->ptr + src, "LOCAL", 5) != 0

-             || ! ISWHITE (in->ptr[src + 5]))
+             || ! ISWHITE (in->ptr[src + 5])
+             /* PR 11507: Skip keyword LOCAL if it is found inside a quoted string.  */
+             || inquote)

            {
              sb_reset (&t);
              src = sub_actual (src, in, &t, formal_hash,
            {
              sb_reset (&t);
              src = sub_actual (src, in, &t, formal_hash,


@@ -976,11 +982,11 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
   while (loclist != NULL)
     {
       formal_entry *f;
   while (loclist != NULL)
     {
       formal_entry *f;

+      const char *name;

 
       f = loclist->next;
 
       f = loclist->next;

-      /* Setting the value to NULL effectively deletes the entry.  We
-         avoid calling hash_delete because it doesn't reclaim memory.  */
-      hash_jam (formal_hash, sb_terminate (&loclist->name), NULL);
+      name = sb_terminate (&loclist->name);
+      hash_delete (formal_hash, name, f == NULL);

       del_formal (loclist);
       loclist = f;
     }
       del_formal (loclist);
       loclist = f;
     }


@@ -997,7 +1003,6 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
   sb t;
   formal_entry *ptr;
   formal_entry *f;
   sb t;
   formal_entry *ptr;
   formal_entry *f;

-  int is_positional = 0;

   int is_keyword = 0;
   int narg = 0;
   const char *err = NULL;
   int is_keyword = 0;
   int narg = 0;
   const char *err = NULL;


@@ -1068,9 +1073,13 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
          /* Lookup the formal in the macro's list.  */
          ptr = (formal_entry *) hash_find (m->formal_hash, sb_terminate (&t));
          if (!ptr)
          /* Lookup the formal in the macro's list.  */
          ptr = (formal_entry *) hash_find (m->formal_hash, sb_terminate (&t));
          if (!ptr)

-           as_bad (_("Parameter named `%s' does not exist for macro `%s'"),
-                   t.ptr,
-                   m->name);
+           {
+             as_bad (_("Parameter named `%s' does not exist for macro `%s'"),
+                     t.ptr,
+                     m->name);
+             sb_reset (&t);
+             idx = get_any_string (idx + 1, in, &t);
+           }

          else
            {
              /* Insert this value into the right place.  */
          else
            {
              /* Insert this value into the right place.  */


@@ -1088,8 +1097,6 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
        }
       else
        {
        }
       else
        {

-         /* This is a positional arg.  */
-         is_positional = 1;

          if (is_keyword)
            {
              err = _("can't mix positional and keyword arguments");
          if (is_keyword)
            {
              err = _("can't mix positional and keyword arguments");


@@ -1204,7 +1211,7 @@ check_macro (const char *line, sb *expand,
             const char **error, macro_entry **info)
 {
   const char *s;
             const char **error, macro_entry **info)
 {
   const char *s;

-  char *copy, *cs;
+  char *copy, *cls;

   macro_entry *macro;
   sb line_sb;
 
   macro_entry *macro;
   sb line_sb;
 


@@ -1221,8 +1228,8 @@ check_macro (const char *line, sb *expand,
   copy = (char *) alloca (s - line + 1);
   memcpy (copy, line, s - line);
   copy[s - line] = '\0';
   copy = (char *) alloca (s - line + 1);
   memcpy (copy, line, s - line);
   copy[s - line] = '\0';

-  for (cs = copy; *cs != '\0'; cs++)
-    *cs = TOLOWER (*cs);
+  for (cls = copy; *cls != '\0'; cls ++)
+    *cls = TOLOWER (*cls);

 
   macro = (macro_entry *) hash_find (macro_hash, copy);
 
 
   macro = (macro_entry *) hash_find (macro_hash, copy);
 


@@ -1246,26 +1253,6 @@ check_macro (const char *line, sb *expand,
   return 1;
 }
 
   return 1;
 }
 

-/* Free the memory allocated to a macro.  */
-
-static void
-free_macro(macro_entry *macro)
-{
-  formal_entry *formal;
-
-  for (formal = macro->formals; formal; )
-    {
-      formal_entry *f;
-
-      f = formal;
-      formal = formal->next;
-      del_formal (f);
-    }
-  hash_die (macro->formal_hash);
-  sb_kill (&macro->sub);
-  free (macro);
-}
-

 /* Delete a macro.  */
 
 void
 /* Delete a macro.  */
 
 void


@@ -1281,8 +1268,10 @@ delete_macro (const char *name)
     copy[i] = TOLOWER (name[i]);
   copy[i] = '\0';
 
     copy[i] = TOLOWER (name[i]);
   copy[i] = '\0';
 

-  /* Since hash_delete doesn't free memory, just clear out the entry.  */
-  if ((macro = hash_find (macro_hash, copy)) != NULL)
+  /* We can only ask hash_delete to free memory if we are deleting
+     macros in reverse order to their definition.
+     So just clear out the entry.  */
+  if ((macro = (macro_entry *) hash_find (macro_hash, copy)) != NULL)

     {
       hash_jam (macro_hash, copy, NULL);
       free_macro (macro);
     {
       hash_jam (macro_hash, copy, NULL);
       free_macro (macro);


@@ -1336,8 +1325,14 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
     }
   else
     {
     }
   else
     {

+      bfd_boolean in_quotes = FALSE;
+

       if (irpc && in->ptr[idx] == '"')
       if (irpc && in->ptr[idx] == '"')

-       ++idx;
+       {
+         in_quotes = TRUE;
+         ++idx;
+       }
+

       while (idx < in->len)
        {
          if (!irpc)
       while (idx < in->len)
        {
          if (!irpc)


@@ -1348,6 +1343,9 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
                {
                  int nxt;
 
                {
                  int nxt;
 

+                 if (irpc)
+                   in_quotes = ! in_quotes;
+         

                  nxt = sb_skip_white (idx + 1, in);
                  if (nxt >= in->len)
                    {
                  nxt = sb_skip_white (idx + 1, in);
                  if (nxt >= in->len)
                    {


@@ -1359,12 +1357,13 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
              sb_add_char (&f.actual, in->ptr[idx]);
              ++idx;
            }
              sb_add_char (&f.actual, in->ptr[idx]);
              ++idx;
            }

+

          err = macro_expand_body (&sub, out, &f, h, 0);
          if (err != NULL)
            break;
          if (!irpc)
            idx = sb_skip_comma (idx, in);
          err = macro_expand_body (&sub, out, &f, h, 0);
          if (err != NULL)
            break;
          if (!irpc)
            idx = sb_skip_comma (idx, in);

-         else
+         else if (! in_quotes)

            idx = sb_skip_white (idx, in);
        }
     }
            idx = sb_skip_white (idx, in);
        }
     }