Revert "Sync top level files with versions from gcc."

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

diff --git a/gas/macro.c b/gas/macro.c
index 44d2bf84c817557b3124bfb904a9d7ff790fa390..e00a18bdad48ef369848dea4f4802ebadaa45c52 100644 (file)
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -1,6 +1,5 @@
 /* macro.c - macro support for gas
 /* macro.c - macro support for gas

-   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1994-2019 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 +8,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,


@@ -19,65 +18,17 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free

-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, 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
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+

 #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 *, int, int);
-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 *, int);
-static const char *macro_expand (int, sb *, macro_entry *, sb *);
-

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


@@ -113,7 +64,7 @@ static int macro_strip_at;
 
 /* Function to use to parse an expression.  */
 
 
 /* Function to use to parse an expression.  */
 

-static int (*macro_expr) (const char *, int, sb *, int *);
+static size_t (*macro_expr) (const char *, size_t, sb *, offsetT *);

 
 /* Number of macro expansions that have been done.  */
 
 
 /* Number of macro expansions that have been done.  */
 


@@ -123,14 +74,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 *))
+           size_t (*exp) (const char *, size_t, sb *, offsetT *))

 {
   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.  */


@@ -158,16 +109,15 @@ macro_mri_mode (int mri)
 
 int
 buffer_and_nest (const char *from, const char *to, sb *ptr,
 
 int
 buffer_and_nest (const char *from, const char *to, sb *ptr,

-                int (*get_line) (sb *))
+                size_t (*get_line) (sb *))

 {
 {

-  int from_len;
-  int to_len = strlen (to);
+  size_t from_len;
+  size_t to_len = strlen (to);

   int depth = 1;
   int depth = 1;

-  int line_start = ptr->len;
-
-  int more = get_line (ptr);
+  size_t line_start = ptr->len;
+  size_t more = get_line (ptr);

 
 

-  if (to_len == 4 && strcasecmp(to, "ENDR") == 0)
+  if (to_len == 4 && strcasecmp (to, "ENDR") == 0)

     {
       from = NULL;
       from_len = 0;
     {
       from = NULL;
       from_len = 0;


@@ -177,33 +127,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.  */
-      int i = line_start;
+      /* Try to find the first pseudo op on the line.  */
+      size_t 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++;
          /* Skip leading whitespace.  */
          while (i < ptr->len && ISWHITE (ptr->ptr[i]))
            i++;

+       }

 
 

-         /* Skip over a label.  */
-         while (i < ptr->len
-                && (ISALNUM (ptr->ptr[i])
-                    || ptr->ptr[i] == '_'
-                    || ptr->ptr[i] == '$'))
+      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++;
            i++;

-
-         /* And a colon.  */
-         if (i < ptr->len
-             && ptr->ptr[i] == ':')
+         if (i < ptr->len && is_name_ender (ptr->ptr[i]))

            i++;
            i++;

-
+         /* Skip whitespace.  */
+         while (i < ptr->len && ISWHITE (ptr->ptr[i]))
+           i++;
+         /* Check for the colon.  */
+         if (i >= ptr->len || 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;
+             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++;


@@ -226,11 +195,13 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
               ? strncasecmp (ptr->ptr + i, from, from_len) == 0
               : from_len > 0)
              && (ptr->len == (i + from_len)
               ? strncasecmp (ptr->ptr + i, from, from_len) == 0
               : from_len > 0)
              && (ptr->len == (i + from_len)

-                 || ! ISALNUM (ptr->ptr[i + from_len])))
+                 || ! (is_part_of_name (ptr->ptr[i + from_len])
+                       || is_name_ender (ptr->ptr[i + from_len]))))

            depth++;
          if (strncasecmp (ptr->ptr + i, to, to_len) == 0
              && (ptr->len == (i + to_len)
            depth++;
          if (strncasecmp (ptr->ptr + i, to, to_len) == 0
              && (ptr->len == (i + to_len)

-                 || ! ISALNUM (ptr->ptr[i + to_len])))
+                 || ! (is_part_of_name (ptr->ptr[i + to_len])
+                       || is_name_ender (ptr->ptr[i + to_len]))))

            {
              depth--;
              if (depth == 0)
            {
              depth--;
              if (depth == 0)


@@ -240,6 +211,27 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
                  break;
                }
            }
                  break;
                }
            }

+
+         /* PR gas/16908
+            Apply and discard .linefile directives that appear within
+            the macro.  For long macros, one might want to report the
+            line number information associated with the lines within
+            the macro definition, but we would need more infrastructure
+            to make that happen correctly (e.g. resetting the line
+            number when expanding the macro), and since for short
+            macros we clearly prefer reporting the point of expansion
+            anyway, there's not an obviously better fix here.  */
+         if (strncasecmp (ptr->ptr + i, "linefile", 8) == 0)
+           {
+             char saved_eol_char = ptr->ptr[ptr->len];
+
+             ptr->ptr[ptr->len] = '\0';
+             temp_ilp (ptr->ptr + i + 8);
+             s_app_line (0);
+             restore_ilp ();
+             ptr->ptr[ptr->len] = saved_eol_char;
+             ptr->len = line_start;
+           }

        }
 
       /* Add the original end-of-line char to the end and keep running.  */
        }
 
       /* Add the original end-of-line char to the end and keep running.  */


@@ -254,19 +246,20 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
 
 /* Pick up a token.  */
 
 
 /* Pick up a token.  */
 

-static int
-get_token (int idx, sb *in, sb *name)
+static size_t
+get_token (size_t idx, sb *in, sb *name)

 {
   if (idx < in->len
 {
   if (idx < in->len

-      && (ISALPHA (in->ptr[idx])
-         || in->ptr[idx] == '_'
-         || in->ptr[idx] == '$'))
+      && is_name_beginner (in->ptr[idx]))

     {
       sb_add_char (name, in->ptr[idx++]);
       while (idx < in->len
     {
       sb_add_char (name, in->ptr[idx++]);
       while (idx < in->len

-            && (ISALNUM (in->ptr[idx])
-                || in->ptr[idx] == '_'
-                || in->ptr[idx] == '$'))
+            && is_part_of_name (in->ptr[idx]))
+       {
+         sb_add_char (name, in->ptr[idx++]);
+       }
+      if (idx < in->len
+            && is_name_ender (in->ptr[idx]))

        {
          sb_add_char (name, in->ptr[idx++]);
        }
        {
          sb_add_char (name, in->ptr[idx++]);
        }


@@ -279,11 +272,9 @@ get_token (int idx, sb *in, sb *name)
 
 /* Pick up a string.  */
 
 
 /* Pick up a string.  */
 

-static int
-getstring (int idx, sb *in, sb *acc)
+static size_t
+getstring (size_t idx, sb *in, sb *acc)

 {
 {

-  idx = sb_skip_white (idx, in);
-

   while (idx < in->len
         && (in->ptr[idx] == '"'
             || (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
   while (idx < in->len
         && (in->ptr[idx] == '"'
             || (in->ptr[idx] == '<' && (macro_alternate || macro_mri))


@@ -293,8 +284,8 @@ getstring (int idx, sb *in, sb *acc)
        {
          int nest = 0;
          idx++;
        {
          int nest = 0;
          idx++;

-         while ((in->ptr[idx] != '>' || nest)
-                && idx < in->len)
+         while (idx < in->len
+                && (in->ptr[idx] != '>' || nest))

            {
              if (in->ptr[idx] == '!')
                {
            {
              if (in->ptr[idx] == '!')
                {


@@ -362,13 +353,13 @@ 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, int expand, int pretend_quoted)
+static size_t
+get_any_string (size_t idx, sb *in, sb *out)

 {
   sb_reset (out);
   idx = sb_skip_white (idx, in);
 {
   sb_reset (out);
   idx = sb_skip_white (idx, in);


@@ -377,37 +368,33 @@ get_any_string (int idx, sb *in, sb *out, int expand, int pretend_quoted)
     {
       if (in->len > idx + 2 && in->ptr[idx + 1] == '\'' && ISBASE (in->ptr[idx]))
        {
     {
       if (in->len > idx + 2 && in->ptr[idx + 1] == '\'' && ISBASE (in->ptr[idx]))
        {

-         while (!ISSEP (in->ptr[idx]))
+         while (idx < in->len && !ISSEP (in->ptr[idx]))

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

-      else if (in->ptr[idx] == '%'
-              && macro_alternate
-              && expand)
+      else if (in->ptr[idx] == '%' && macro_alternate)

        {
        {

-         int val;
-         char buf[20];
+         offsetT val;
+         char buf[64];
+

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

-         sprintf (buf, "%d", val);
+         sprintf (buf, "%" BFD_VMA_FMT "d", val);

          sb_add_string (out, buf);
        }
       else if (in->ptr[idx] == '"'
               || (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
               || (macro_alternate && in->ptr[idx] == '\''))
        {
          sb_add_string (out, buf);
        }
       else if (in->ptr[idx] == '"'
               || (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
               || (macro_alternate && in->ptr[idx] == '\''))
        {

-         if (macro_alternate
-             && ! macro_strip_at
-             && expand)
+         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
            {


@@ -416,76 +403,183 @@ get_any_string (int idx, sb *in, sb *out, int expand, int pretend_quoted)
        }
       else
        {
        }
       else
        {

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

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

-                && (in->ptr[idx] == '"'
-                    || in->ptr[idx] == '\''
-                    || pretend_quoted
+                && (*in_br

                     || (in->ptr[idx] != ' '
                     || (in->ptr[idx] != ' '

-                        && in->ptr[idx] != '\t'
-                        && in->ptr[idx] != ','
-                        && (in->ptr[idx] != '<'
-                            || (! macro_alternate && ! macro_mri)))))
+                        && in->ptr[idx] != '\t'))
+                && 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)
                  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;
+                   {
+                     free (br_buf);
+                     return idx;
+                   }
+                 break;
+               case '(':
+               case '[':
+                 if (in_br > br_buf)
+                   --in_br;
+                 else
+                   {
+                     br_buf = XNEWVEC (char, 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);

        }
     }
 
   return idx;
 }
 
        }
     }
 
   return idx;
 }
 

+/* Allocate a new formal.  */
+
+static formal_entry *
+new_formal (void)
+{
+  formal_entry *formal;
+
+  formal = XNEW (formal_entry);
+
+  sb_new (&formal->name);
+  sb_new (&formal->def);
+  sb_new (&formal->actual);
+  formal->next = NULL;
+  formal->type = FORMAL_OPTIONAL;
+  return formal;
+}
+
+/* Free a formal.  */
+
+static void
+del_formal (formal_entry *formal)
+{
+  sb_kill (&formal->actual);
+  sb_kill (&formal->def);
+  sb_kill (&formal->name);
+  free (formal);
+}
+

 /* Pick up the formal parameters of a macro definition.  */
 
 /* Pick up the formal parameters of a macro definition.  */
 

-static int
-do_formals (macro_entry *macro, int idx, sb *in)
+static size_t
+do_formals (macro_entry *macro, size_t idx, sb *in)

 {
   formal_entry **p = &macro->formals;
 {
   formal_entry **p = &macro->formals;

+  const char *name;

 
 

-  macro->formal_count = 0;
-  macro->formal_hash = hash_new ();

   idx = sb_skip_white (idx, in);
   while (idx < in->len)
     {
   idx = sb_skip_white (idx, in);
   while (idx < in->len)
     {

-      formal_entry *formal;
-      int cidx;
-
-      formal = (formal_entry *) xmalloc (sizeof (formal_entry));
-
-      sb_new (&formal->name);
-      sb_new (&formal->def);
-      sb_new (&formal->actual);
+      formal_entry *formal = new_formal ();
+      size_t cidx;

 
       idx = get_token (idx, in, &formal->name);
       if (formal->name.len == 0)
        {
          if (macro->formal_count)
            --idx;
 
       idx = get_token (idx, in, &formal->name);
       if (formal->name.len == 0)
        {
          if (macro->formal_count)
            --idx;

+         del_formal (formal);  /* 'formal' goes out of scope.  */

          break;
        }
       idx = sb_skip_white (idx, in);
       /* This is a formal.  */
          break;
        }
       idx = sb_skip_white (idx, in);
       /* This is a formal.  */

+      name = sb_terminate (&formal->name);
+      if (! macro_mri
+         && idx < in->len
+         && in->ptr[idx] == ':'
+         && (! is_name_beginner (':')
+             || idx + 1 >= in->len
+             || ! is_part_of_name (in->ptr[idx + 1])))
+       {
+         /* Got a qualifier.  */
+         sb qual;
+
+         sb_new (&qual);
+         idx = get_token (sb_skip_white (idx + 1, in), in, &qual);
+         sb_terminate (&qual);
+         if (qual.len == 0)
+           as_bad_where (macro->file,
+                         macro->line,
+                         _("Missing parameter qualifier for `%s' in macro `%s'"),
+                         name,
+                         macro->name);
+         else if (strcmp (qual.ptr, "req") == 0)
+           formal->type = FORMAL_REQUIRED;
+         else if (strcmp (qual.ptr, "vararg") == 0)
+           formal->type = FORMAL_VARARG;
+         else
+           as_bad_where (macro->file,
+                         macro->line,
+                         _("`%s' is not a valid parameter qualifier for `%s' in macro `%s'"),
+                         qual.ptr,
+                         name,
+                         macro->name);
+         sb_kill (&qual);
+         idx = sb_skip_white (idx, in);
+       }

       if (idx < in->len && in->ptr[idx] == '=')
        {
          /* Got a default.  */
       if (idx < in->len && in->ptr[idx] == '=')
        {
          /* Got a default.  */

-         idx = get_any_string (idx + 1, in, &formal->def, 1, 0);
+         idx = get_any_string (idx + 1, in, &formal->def);

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

+         if (formal->type == FORMAL_REQUIRED)
+           {
+             sb_reset (&formal->def);
+             as_warn_where (macro->file,
+                           macro->line,
+                           _("Pointless default value for required parameter `%s' in macro `%s'"),
+                           name,
+                           macro->name);
+           }

        }
 
       /* Add to macro's hash table.  */
        }
 
       /* Add to macro's hash table.  */

-      hash_jam (macro->formal_hash, sb_terminate (&formal->name), formal);
+      if (! hash_find (macro->formal_hash, name))
+       hash_jam (macro->formal_hash, name, formal);
+      else
+       as_bad_where (macro->file,
+                     macro->line,
+                     _("A parameter named `%s' already exists for macro `%s'"),
+                     name,
+                     macro->name);

 
       formal->index = macro->formal_count++;
 
       formal->index = macro->formal_count++;

+      *p = formal;
+      p = &formal->next;
+      if (formal->type == FORMAL_VARARG)
+       break;

       cidx = idx;
       idx = sb_skip_comma (idx, in);
       if (idx != cidx && idx >= in->len)
       cidx = idx;
       idx = sb_skip_comma (idx, in);
       if (idx != cidx && idx >= in->len)


@@ -493,26 +587,16 @@ do_formals (macro_entry *macro, int idx, sb *in)
          idx = cidx;
          break;
        }
          idx = cidx;
          break;
        }

-      *p = formal;
-      p = &formal->next;
-      *p = NULL;

     }
 
   if (macro_mri)
     {
     }
 
   if (macro_mri)
     {

-      formal_entry *formal;
-      const char *name;
+      formal_entry *formal = new_formal ();

 
       /* Add a special NARG formal, which macro_expand will set to the
 
       /* Add a special NARG formal, which macro_expand will set to the

-         number of arguments.  */
-      formal = (formal_entry *) xmalloc (sizeof (formal_entry));
-
-      sb_new (&formal->name);
-      sb_new (&formal->def);
-      sb_new (&formal->actual);
-
+        number of arguments.  */

       /* The same MRI assemblers which treat '@' characters also use
       /* The same MRI assemblers which treat '@' characters also use

-         the name $NARG.  At least until we find an exception.  */
+        the name $NARG.  At least until we find an exception.  */

       if (macro_strip_at)
        name = "$NARG";
       else
       if (macro_strip_at)
        name = "$NARG";
       else


@@ -521,48 +605,80 @@ do_formals (macro_entry *macro, int idx, sb *in)
       sb_add_string (&formal->name, name);
 
       /* Add to macro's hash table.  */
       sb_add_string (&formal->name, name);
 
       /* Add to macro's hash table.  */

+      if (hash_find (macro->formal_hash, name))
+       as_bad_where (macro->file,
+                     macro->line,
+                     _("Reserved word `%s' used as parameter in macro `%s'"),
+                     name,
+                     macro->name);

       hash_jam (macro->formal_hash, name, formal);
 
       formal->index = NARG_INDEX;
       *p = formal;
       hash_jam (macro->formal_hash, name, formal);
 
       formal->index = NARG_INDEX;
       *p = formal;

-      formal->next = NULL;

     }
 
   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.  */
 
 const char *
 /* 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.  */
 
 const char *

-define_macro (int idx, sb *in, sb *label,
-             int (*get_line) (sb *), const char **namep)
+define_macro (size_t idx, sb *in, sb *label,
+             size_t (*get_line) (sb *),
+             const char *file, unsigned int line,
+             const char **namep)

 {
   macro_entry *macro;
   sb name;
 {
   macro_entry *macro;
   sb name;

-  const char *namestr;
+  const char *error = NULL;

 
 

-  macro = (macro_entry *) xmalloc (sizeof (macro_entry));
+  macro = XNEW (macro_entry);

   sb_new (&macro->sub);
   sb_new (&name);
   sb_new (&macro->sub);
   sb_new (&name);

+  macro->file = file;
+  macro->line = line;

 
   macro->formal_count = 0;
   macro->formals = 0;
 
   macro->formal_count = 0;
   macro->formals = 0;

+  macro->formal_hash = hash_new_sized (7);

 
   idx = sb_skip_white (idx, in);
   if (! buffer_and_nest ("MACRO", "ENDM", &macro->sub, get_line))
 
   idx = sb_skip_white (idx, in);
   if (! buffer_and_nest ("MACRO", "ENDM", &macro->sub, get_line))

-    return _("unexpected end of file in macro definition");
+    error = _("unexpected end of file in macro `%s' definition");

   if (label != NULL && label->len != 0)
     {
       sb_add_sb (&name, label);
   if (label != NULL && label->len != 0)
     {
       sb_add_sb (&name, label);

+      macro->name = sb_terminate (&name);

       if (idx < in->len && in->ptr[idx] == '(')
        {
          /* It's the label: MACRO (formals,...)  sort  */
          idx = do_formals (macro, idx + 1, in);
       if (idx < in->len && in->ptr[idx] == '(')
        {
          /* It's the label: MACRO (formals,...)  sort  */
          idx = do_formals (macro, idx + 1, in);

-         if (idx >= in->len || in->ptr[idx] != ')')
-           return _("missing ) after formals");
-         idx = sb_skip_white (idx + 1, in);
+         if (idx < in->len && in->ptr[idx] == ')')
+           idx = sb_skip_white (idx + 1, in);
+         else if (!error)
+           error = _("missing `)' after formals in macro definition `%s'");

        }
       else
        {
        }
       else
        {


@@ -572,11 +688,12 @@ define_macro (int idx, sb *in, sb *label,
     }
   else
     {
     }
   else
     {

-      int cidx;
+      size_t cidx;

 
       idx = get_token (idx, in, &name);
 
       idx = get_token (idx, in, &name);

+      macro->name = sb_terminate (&name);

       if (name.len == 0)
       if (name.len == 0)

-       return _("Missing macro name");
+       error = _("Missing macro name");

       cidx = sb_skip_white (idx, in);
       idx = sb_skip_comma (cidx, in);
       if (idx == cidx || idx < in->len)
       cidx = sb_skip_white (idx, in);
       idx = sb_skip_comma (cidx, in);
       if (idx == cidx || idx < in->len)


@@ -584,29 +701,32 @@ define_macro (int idx, sb *in, sb *label,
       else
        idx = cidx;
     }
       else
        idx = cidx;
     }

-  if (idx < in->len)
-    return _("Bad macro parameter list");
+  if (!error && idx < in->len)
+    error = _("Bad parameter list for macro `%s'");

 
   /* And stick it in the macro hash table.  */
   for (idx = 0; idx < name.len; idx++)
     name.ptr[idx] = TOLOWER (name.ptr[idx]);
 
   /* And stick it in the macro hash table.  */
   for (idx = 0; idx < name.len; idx++)
     name.ptr[idx] = TOLOWER (name.ptr[idx]);

-  namestr = sb_terminate (&name);
-  if (hash_find (macro_hash, namestr))
-    return _("Macro with this name was already defined");
-  hash_jam (macro_hash, namestr, (PTR) macro);
-
-  macro_defined = 1;
+  if (hash_find (macro_hash, macro->name))
+    error = _("Macro `%s' was already defined");
+  if (!error)
+    error = hash_jam (macro_hash, macro->name, (void *) macro);

 
   if (namep != NULL)
 
   if (namep != NULL)

-    *namep = namestr;
+    *namep = macro->name;
+
+  if (!error)
+    macro_defined = 1;
+  else
+    free_macro (macro);

 
 

-  return NULL;
+  return error;

 }
 
 /* Scan a token, and then skip KIND.  */
 
 }
 
 /* Scan a token, and then skip KIND.  */
 

-static int
-get_apost_token (int idx, sb *in, sb *name, int kind)
+static size_t
+get_apost_token (size_t idx, sb *in, sb *name, int kind)

 {
   idx = get_token (idx, in, name);
   if (idx < in->len
 {
   idx = get_token (idx, in, name);
   if (idx < in->len


@@ -619,11 +739,11 @@ get_apost_token (int idx, sb *in, sb *name, int kind)
 
 /* Substitute the actual value for a formal parameter.  */
 
 
 /* Substitute the actual value for a formal parameter.  */
 

-static int
-sub_actual (int start, sb *in, sb *t, struct hash_control *formal_hash,
+static size_t
+sub_actual (size_t start, sb *in, sb *t, struct hash_control *formal_hash,

            int kind, sb *out, int copyifnotthere)
 {
            int kind, sb *out, int copyifnotthere)
 {

-  int src;
+  size_t src;

   formal_entry *ptr;
 
   src = get_apost_token (start, in, t, kind);
   formal_entry *ptr;
 
   src = get_apost_token (start, in, t, kind);


@@ -651,6 +771,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)
     {


@@ -668,16 +790,17 @@ sub_actual (int start, sb *in, sb *t, struct hash_control *formal_hash,
 
 static const char *
 macro_expand_body (sb *in, sb *out, formal_entry *formals,
 
 static const char *
 macro_expand_body (sb *in, sb *out, formal_entry *formals,

-                  struct hash_control *formal_hash, int locals)
+                  struct hash_control *formal_hash, const macro_entry *macro)

 {
   sb t;
 {
   sb t;

-  int src = 0;
-  int inquote = 0;
+  size_t src = 0;
+  int inquote = 0, macro_line = 0;

   formal_entry *loclist = NULL;
   formal_entry *loclist = NULL;

+  const char *err = NULL;

 
   sb_new (&t);
 
 
   sb_new (&t);
 

-  while (src < in->len)
+  while (src < in->len && !err)

     {
       if (in->ptr[src] == '&')
        {
     {
       if (in->ptr[src] == '&')
        {


@@ -691,14 +814,15 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
            }
          else
            {
            }
          else
            {

-             /* FIXME: Why do we do this?  */
+             /* Permit macro parameter substitution delineated with
+                an '&' prefix and optional '&' suffix.  */

              src = sub_actual (src + 1, in, &t, formal_hash, '&', out, 0);
            }
        }
       else if (in->ptr[src] == '\\')
        {
          src++;
              src = sub_actual (src + 1, in, &t, formal_hash, '&', out, 0);
            }
        }
       else if (in->ptr[src] == '\\')
        {
          src++;

-         if (in->ptr[src] == '(')
+         if (src < in->len && in->ptr[src] == '(')

            {
              /* Sub in till the next ')' literally.  */
              src++;
            {
              /* Sub in till the next ')' literally.  */
              src++;


@@ -706,21 +830,23 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
                {
                  sb_add_char (out, in->ptr[src++]);
                }
                {
                  sb_add_char (out, in->ptr[src++]);
                }

-             if (in->ptr[src] == ')')
+             if (src < in->len)

                src++;
                src++;

+             else if (!macro)
+               err = _("missing `)'");

              else
              else

-               return _("missplaced )");
+               as_bad_where (macro->file, macro->line + macro_line, _("missing `)'"));

            }
            }

-         else if (in->ptr[src] == '@')
+         else if (src < in->len && in->ptr[src] == '@')

            {
              /* Sub in the macro invocation number.  */
 
            {
              /* Sub in the macro invocation number.  */
 

-             char buffer[10];
+             char buffer[12];

              src++;
              sprintf (buffer, "%d", macro_number);
              sb_add_string (out, buffer);
            }
              src++;
              sprintf (buffer, "%d", macro_number);
              sb_add_string (out, buffer);
            }

-         else if (in->ptr[src] == '&')
+         else if (src < in->len && in->ptr[src] == '&')

            {
              /* This is a preprocessor variable name, we don't do them
                 here.  */
            {
              /* This is a preprocessor variable name, we don't do them
                 here.  */


@@ -728,7 +854,7 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
              sb_add_char (out, '&');
              src++;
            }
              sb_add_char (out, '&');
              src++;
            }

-         else if (macro_mri && ISALNUM (in->ptr[src]))
+         else if (macro_mri && src < in->len && ISALNUM (in->ptr[src]))

            {
              int ind;
              formal_entry *f;
            {
              int ind;
              formal_entry *f;


@@ -759,17 +885,17 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
            }
        }
       else if ((macro_alternate || macro_mri)
            }
        }
       else if ((macro_alternate || macro_mri)

-              && (ISALPHA (in->ptr[src])
-                  || in->ptr[src] == '_'
-                  || in->ptr[src] == '$')
+              && is_name_beginner (in->ptr[src])

               && (! inquote
                   || ! macro_strip_at
                   || (src > 0 && in->ptr[src - 1] == '@')))
        {
               && (! inquote
                   || ! macro_strip_at
                   || (src > 0 && in->ptr[src - 1] == '@')))
        {

-         if (! locals
+         if (! macro

              || src + 5 >= in->len
              || strncasecmp (in->ptr + src, "LOCAL", 5) != 0
              || 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,


@@ -778,31 +904,38 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
            }
          else
            {
            }
          else
            {

-             formal_entry *f;
-

              src = sb_skip_white (src + 5, in);
              while (in->ptr[src] != '\n')
                {
              src = sb_skip_white (src + 5, in);
              while (in->ptr[src] != '\n')
                {

-                 static int loccnt;
-                 char buf[20];
-                 const char *err;
-
-                 f = (formal_entry *) xmalloc (sizeof (formal_entry));
-                 sb_new (&f->name);
-                 sb_new (&f->def);
-                 sb_new (&f->actual);
-                 f->index = LOCAL_INDEX;
-                 f->next = loclist;
-                 loclist = f;
+                 const char *name;
+                 formal_entry *f = new_formal ();

 
                  src = get_token (src, in, &f->name);
 
                  src = get_token (src, in, &f->name);

-                 ++loccnt;
-                 sprintf (buf, IS_ELF ? ".LL%04x" : "LL%04x", loccnt);
-                 sb_add_string (&f->actual, buf);
+                 name = sb_terminate (&f->name);
+                 if (! hash_find (formal_hash, name))
+                   {
+                     static int loccnt;
+                     char buf[20];
+
+                     f->index = LOCAL_INDEX;
+                     f->next = loclist;
+                     loclist = f;
+
+                     sprintf (buf, IS_ELF ? ".LL%04x" : "LL%04x", ++loccnt);
+                     sb_add_string (&f->actual, buf);

 
 

-                 err = hash_jam (formal_hash, sb_terminate (&f->name), f);
-                 if (err != NULL)
-                   return err;
+                     err = hash_jam (formal_hash, name, f);
+                     if (err != NULL)
+                       break;
+                   }
+                 else
+                   {
+                     as_bad_where (macro->file,
+                                   macro->line + macro_line,
+                                   _("`%s' was already used as parameter (or another local) name"),
+                                   name);
+                     del_formal (f);
+                   }

 
                  src = sb_skip_comma (src, in);
                }
 
                  src = sb_skip_comma (src, in);
                }


@@ -837,13 +970,13 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
          if (ptr == NULL)
            {
              /* FIXME: We should really return a warning string here,
          if (ptr == NULL)
            {
              /* FIXME: We should really return a warning string here,

-                 but we can't, because the == might be in the MRI
-                 comment field, and, since the nature of the MRI
-                 comment field depends upon the exact instruction
-                 being used, we don't have enough information here to
-                 figure out whether it is or not.  Instead, we leave
-                 the == in place, which should cause a syntax error if
-                 it is not in a comment.  */
+                but we can't, because the == might be in the MRI
+                comment field, and, since the nature of the MRI
+                comment field depends upon the exact instruction
+                being used, we don't have enough information here to
+                figure out whether it is or not.  Instead, we leave
+                the == in place, which should cause a syntax error if
+                it is not in a comment.  */

              sb_add_char (out, '=');
              sb_add_char (out, '=');
              sb_add_sb (out, &t);
              sb_add_char (out, '=');
              sb_add_char (out, '=');
              sb_add_sb (out, &t);


@@ -862,6 +995,8 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
        }
       else
        {
        }
       else
        {

+         if (in->ptr[src] == '\n')
+           ++macro_line;

          sb_add_char (out, in->ptr[src++]);
        }
     }
          sb_add_char (out, in->ptr[src++]);
        }
     }


@@ -871,34 +1006,30 @@ 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);
-      sb_kill (&loclist->name);
-      sb_kill (&loclist->def);
-      sb_kill (&loclist->actual);
-      free (loclist);
+      name = sb_terminate (&loclist->name);
+      hash_delete (formal_hash, name, f == NULL);
+      del_formal (loclist);

       loclist = f;
     }
 
       loclist = f;
     }
 

-  return NULL;
+  return err;

 }
 
 /* Assign values to the formal parameters of a macro, and expand the
    body.  */
 
 static const char *
 }
 
 /* Assign values to the formal parameters of a macro, and expand the
    body.  */
 
 static const char *

-macro_expand (int idx, sb *in, macro_entry *m, sb *out)
+macro_expand (size_t 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;
   int is_keyword = 0;
   int narg = 0;

-  const char *err;
+  const char *err = NULL;

 
   sb_new (&t);
 
 
   sb_new (&t);
 


@@ -912,7 +1043,7 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
   if (macro_mri)
     {
       /* The macro may be called with an optional qualifier, which may
   if (macro_mri)
     {
       /* The macro may be called with an optional qualifier, which may

-         be referred to in the macro body as \0.  */
+        be referred to in the macro body as \0.  */

       if (idx < in->len && in->ptr[idx] == '.')
        {
          /* The Microtec assembler ignores this if followed by a white space.
       if (idx < in->len && in->ptr[idx] == '.')
        {
          /* The Microtec assembler ignores this if followed by a white space.


@@ -922,18 +1053,14 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
                  && in->ptr[idx] != ' '
                  && in->ptr[idx] != '\t')
            {
                  && in->ptr[idx] != ' '
                  && in->ptr[idx] != '\t')
            {

-             formal_entry *n;
+             formal_entry *n = new_formal ();

 
 

-             n = (formal_entry *) xmalloc (sizeof (formal_entry));
-             sb_new (&n->name);
-             sb_new (&n->def);
-             sb_new (&n->actual);

              n->index = QUAL_INDEX;
 
              n->next = m->formals;
              m->formals = n;
 
              n->index = QUAL_INDEX;
 
              n->next = m->formals;
              m->formals = n;
 

-             idx = get_any_string (idx, in, &n->actual, 1, 0);
+             idx = get_any_string (idx, in, &n->actual);

            }
        }
     }
            }
        }
     }


@@ -942,7 +1069,7 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
   idx = sb_skip_white (idx, in);
   while (idx < in->len)
     {
   idx = sb_skip_white (idx, in);
   while (idx < in->len)
     {

-      int scan;
+      size_t scan;

 
       /* Look and see if it's a positional or keyword arg.  */
       scan = idx;
 
       /* Look and see if it's a positional or keyword arg.  */
       scan = idx;


@@ -962,27 +1089,43 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
          sb_reset (&t);
          idx = get_token (idx, in, &t);
          if (in->ptr[idx] != '=')
          sb_reset (&t);
          idx = get_token (idx, in, &t);
          if (in->ptr[idx] != '=')

-           return _("confusion in formal parameters");
+           {
+             err = _("confusion in formal parameters");
+             break;
+           }

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

-           return _("macro formal argument does not exist");
+           {
+             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.  */

-             sb_reset (&ptr->actual);
-             idx = get_any_string (idx + 1, in, &ptr->actual, 0, 0);
+             if (ptr->actual.len)
+               {
+                 as_warn (_("Value for parameter `%s' of macro `%s' was already specified"),
+                          ptr->name.ptr,
+                          m->name);
+                 sb_reset (&ptr->actual);
+               }
+             idx = get_any_string (idx + 1, in, &ptr->actual);

              if (ptr->actual.len > 0)
                ++narg;
            }
        }
       else
        {
              if (ptr->actual.len > 0)
                ++narg;
            }
        }
       else
        {

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

          if (is_keyword)
          if (is_keyword)

-           return _("can't mix positional and keyword arguments");
+           {
+             err = _("can't mix positional and keyword arguments");
+             break;
+           }

 
          if (!f)
            {
 
          if (!f)
            {


@@ -990,13 +1133,12 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
              int c;
 
              if (!macro_mri)
              int c;
 
              if (!macro_mri)

-               return _("too many positional arguments");
+               {
+                 err = _("too many positional arguments");
+                 break;
+               }

 
 

-             f = (formal_entry *) xmalloc (sizeof (formal_entry));
-             sb_new (&f->name);
-             sb_new (&f->def);
-             sb_new (&f->actual);
-             f->next = NULL;
+             f = new_formal ();

 
              c = -1;
              for (pf = &m->formals; *pf != NULL; pf = &(*pf)->next)
 
              c = -1;
              for (pf = &m->formals; *pf != NULL; pf = &(*pf)->next)


@@ -1008,8 +1150,13 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
              f->index = c;
            }
 
              f->index = c;
            }
 

-         sb_reset (&f->actual);
-         idx = get_any_string (idx, in, &f->actual, 1, 0);
+         if (f->type != FORMAL_VARARG)
+           idx = get_any_string (idx, in, &f->actual);
+         else
+           {
+             sb_add_buffer (&f->actual, in->ptr + idx, in->len - idx);
+             idx = in->len;
+           }

          if (f->actual.len > 0)
            ++narg;
          do
          if (f->actual.len > 0)
            ++narg;
          do


@@ -1030,21 +1177,29 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
        }
     }
 
        }
     }
 

-  if (macro_mri)
+  if (! err)

     {
     {

-      char buffer[20];
-
-      sb_reset (&t);
-      sb_add_string (&t, macro_strip_at ? "$NARG" : "NARG");
-      ptr = (formal_entry *) hash_find (m->formal_hash, sb_terminate (&t));
-      sb_reset (&ptr->actual);
-      sprintf (buffer, "%d", narg);
-      sb_add_string (&ptr->actual, buffer);
-    }
+      for (ptr = m->formals; ptr; ptr = ptr->next)
+       {
+         if (ptr->type == FORMAL_REQUIRED && ptr->actual.len == 0)
+           as_bad (_("Missing value for required parameter `%s' of macro `%s'"),
+                   ptr->name.ptr,
+                   m->name);
+       }

 
 

-  err = macro_expand_body (&m->sub, out, m->formals, m->formal_hash, 1);
-  if (err != NULL)
-    return err;
+      if (macro_mri)
+       {
+         char buffer[20];
+
+         sb_reset (&t);
+         sb_add_string (&t, macro_strip_at ? "$NARG" : "NARG");
+         ptr = (formal_entry *) hash_find (m->formal_hash, sb_terminate (&t));
+         sprintf (buffer, "%d", narg);
+         sb_add_string (&ptr->actual, buffer);
+       }
+
+      err = macro_expand_body (&m->sub, out, m->formals, m->formal_hash, m);
+    }

 
   /* Discard any unnamed formal arguments.  */
   if (macro_mri)
 
   /* Discard any unnamed formal arguments.  */
   if (macro_mri)


@@ -1058,20 +1213,18 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
            pf = &(*pf)->next;
          else
            {
            pf = &(*pf)->next;
          else
            {

-             sb_kill (&(*pf)->name);
-             sb_kill (&(*pf)->def);
-             sb_kill (&(*pf)->actual);

              f = (*pf)->next;
              f = (*pf)->next;

-             free (*pf);
+             del_formal (*pf);

              *pf = f;
            }
        }
     }
 
   sb_kill (&t);
              *pf = f;
            }
        }
     }
 
   sb_kill (&t);

-  macro_number++;
+  if (!err)
+    macro_number++;

 
 

-  return NULL;
+  return err;

 }
 
 /* Check for a macro.  If one is found, put the expansion into
 }
 
 /* Check for a macro.  If one is found, put the expansion into


@@ -1082,29 +1235,26 @@ 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;
 

-  if (! ISALPHA (*line)
-      && *line != '_'
-      && *line != '$'
+  if (! is_name_beginner (*line)

       && (! macro_mri || *line != '.'))
     return 0;
 
   s = line + 1;
       && (! macro_mri || *line != '.'))
     return 0;
 
   s = line + 1;

-  while (ISALNUM (*s)
-        || *s == '_'
-        || *s == '$')
+  while (is_part_of_name (*s))
+    ++s;
+  if (is_name_ender (*s))

     ++s;
 
     ++s;
 

-  copy = (char *) alloca (s - line + 1);
-  memcpy (copy, line, s - line);
-  copy[s - line] = '\0';
-  for (cs = copy; *cs != '\0'; cs++)
-    *cs = TOLOWER (*cs);
+  copy = xmemdup0 (line, s - line);
+  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);

+  free (copy);

 
   if (macro == NULL)
     return 0;
 
   if (macro == NULL)
     return 0;


@@ -1131,7 +1281,27 @@ check_macro (const char *line, sb *expand,
 void
 delete_macro (const char *name)
 {
 void
 delete_macro (const char *name)
 {

-  hash_delete (macro_hash, name);
+  char *copy;
+  size_t i, len;
+  macro_entry *macro;
+
+  len = strlen (name);
+  copy = XNEWVEC (char, len + 1);
+  for (i = 0; i < len; ++i)
+    copy[i] = TOLOWER (name[i]);
+  copy[i] = '\0';
+
+  /* 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);
+    }
+  else
+    as_warn (_("Attempt to purge non-existing macro `%s'"), copy);
+  free (copy);

 }
 
 /* Handle the MRI IRP and IRPC pseudo-ops.  These are handled as a
 }
 
 /* Handle the MRI IRP and IRPC pseudo-ops.  These are handled as a


@@ -1139,7 +1309,7 @@ delete_macro (const char *name)
    success, or an error message otherwise.  */
 
 const char *
    success, or an error message otherwise.  */
 
 const char *

-expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
+expand_irp (int irpc, size_t idx, sb *in, sb *out, size_t (*get_line) (sb *))

 {
   sb sub;
   formal_entry f;
 {
   sb sub;
   formal_entry f;


@@ -1167,6 +1337,7 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
 
   f.index = 1;
   f.next = NULL;
 
   f.index = 1;
   f.next = NULL;

+  f.type = FORMAL_OPTIONAL;

 
   sb_reset (out);
 
 
   sb_reset (out);
 


@@ -1175,22 +1346,29 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
     {
       /* Expand once with a null string.  */
       err = macro_expand_body (&sub, out, &f, h, 0);
     {
       /* Expand once with a null string.  */
       err = macro_expand_body (&sub, out, &f, h, 0);

-      if (err != NULL)
-       return err;

     }
   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)

-           idx = get_any_string (idx, in, &f.actual, 1, 0);
+           idx = get_any_string (idx, in, &f.actual);

          else
            {
              if (in->ptr[idx] == '"')
                {
          else
            {
              if (in->ptr[idx] == '"')
                {

-                 int nxt;
+                 size_t 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)


@@ -1203,18 +1381,22 @@ 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)
          err = macro_expand_body (&sub, out, &f, h, 0);
          if (err != NULL)

-           return err;
+           break;

          if (!irpc)
            idx = sb_skip_comma (idx, in);
          if (!irpc)
            idx = sb_skip_comma (idx, in);

-         else
+         else if (! in_quotes)

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

+  sb_kill (&f.actual);
+  sb_kill (&f.def);
+  sb_kill (&f.name);

   sb_kill (&sub);
 
   sb_kill (&sub);
 

-  return NULL;
+  return err;

 }
 }