Automatic date update in version.in

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

diff --git a/gas/macro.c b/gas/macro.c
index af98bada6a866e6dd87f3f7ddf30b14fcf302e09..3aba78f6bfeedff2afc78169ab802e0ed7e7db71 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, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994-2022 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,


@@ -22,65 +21,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) \


@@ -96,7 +44,7 @@ static void free_macro(macro_entry *);
 
 /* The macro hash table.  */
 
 
 /* The macro hash table.  */
 

-struct hash_control *macro_hash;
+struct htab *macro_hash;

 
 /* Whether any macros have been defined.  */
 
 
 /* Whether any macros have been defined.  */
 


@@ -116,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.  */
 


@@ -126,14 +74,15 @@ 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_hash = htab_create_alloc (16, hash_macro_entry, eq_macro_entry,
+                                 NULL, xcalloc, free);

   macro_defined = 0;
   macro_alternate = alternate;
   macro_mri = mri;
   macro_strip_at = strip_at;
   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.  */


@@ -161,16 +110,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;


@@ -178,10 +126,29 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
   else
     from_len = strlen (from);
 
   else
     from_len = strlen (from);
 

+  /* Except for macros record the present source position, such that
+     diagnostics and debug info will be properly associated with the
+     respective original lines, rather than with the line of the ending
+     directive (TO).  */
+  if (from == NULL || strcasecmp (from, "MACRO") != 0)
+    {
+      unsigned int line;
+      char *linefile;
+
+      as_where (&line);
+      if (!flag_m68k_mri)
+       linefile = xasprintf ("\t.linefile %u .\n", line);
+      else
+       linefile = xasprintf ("\tlinefile %u .\n", line);
+      sb_add_buffer (ptr, linefile, strlen (linefile));
+      xfree (linefile);
+    }
+

   while (more)
     {
       /* Try to find the first pseudo op on the line.  */
   while (more)
     {
       /* Try to find the first pseudo op on the line.  */

-      int i = line_start;
+      size_t i = line_start;
+      bool had_colon = false;

 
       /* With normal syntax we can suck what we want till we get
         to the dot.  With the alternate, labels have to start in
 
       /* With normal syntax we can suck what we want till we get
         to the dot.  With the alternate, labels have to start in


@@ -205,19 +172,24 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
            i++;
          if (i < ptr->len && is_name_ender (ptr->ptr[i]))
            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] != ':')
            {
          /* 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;
              i = line_start;
              break;
            }
          i++;
          line_start = i;

+         had_colon = true;

        }
 
       /* Skip trailing whitespace.  */
        }
 
       /* Skip trailing whitespace.  */


@@ -230,23 +202,35 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
        {
          if (! flag_m68k_mri && ptr->ptr[i] == '.')
            i++;
        {
          if (! flag_m68k_mri && ptr->ptr[i] == '.')
            i++;

-         if (from == NULL
-            && strncasecmp (ptr->ptr + i, "IRPC", from_len = 4) != 0
-            && strncasecmp (ptr->ptr + i, "IRP", from_len = 3) != 0
-            && strncasecmp (ptr->ptr + i, "IREPC", from_len = 5) != 0
-            && strncasecmp (ptr->ptr + i, "IREP", from_len = 4) != 0
-            && strncasecmp (ptr->ptr + i, "REPT", from_len = 4) != 0
-            && strncasecmp (ptr->ptr + i, "REP", from_len = 3) != 0)
-           from_len = 0;
+         size_t len = ptr->len - i;
+         if (from == NULL)
+           {
+             if (len >= 5 && strncasecmp (ptr->ptr + i, "IREPC", 5) == 0)
+               from_len = 5;
+             else if (len >= 4 && strncasecmp (ptr->ptr + i, "IREP", 4) == 0)
+               from_len = 4;
+             else if (len >= 4 && strncasecmp (ptr->ptr + i, "IRPC", 4) == 0)
+               from_len = 4;
+             else if (len >= 4 && strncasecmp (ptr->ptr + i, "REPT", 4) == 0)
+               from_len = 4;
+             else if (len >= 3 && strncasecmp (ptr->ptr + i, "IRP", 3) == 0)
+               from_len = 3;
+             else if (len >= 3 && strncasecmp (ptr->ptr + i, "REP", 3) == 0)
+               from_len = 3;
+             else
+               from_len = 0;
+           }

          if ((from != NULL
          if ((from != NULL

-              ? strncasecmp (ptr->ptr + i, from, from_len) == 0
+              ? (len >= from_len
+                 && strncasecmp (ptr->ptr + i, from, from_len) == 0)

               : from_len > 0)
               : from_len > 0)

-             && (ptr->len == (i + from_len)
+             && (len == from_len

                  || ! (is_part_of_name (ptr->ptr[i + from_len])
                        || is_name_ender (ptr->ptr[i + from_len]))))
            depth++;
                  || ! (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)
+         if (len >= to_len
+             && strncasecmp (ptr->ptr + i, to, to_len) == 0
+             && (len == to_len

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


@@ -258,6 +242,28 @@ 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 (from != NULL && strcasecmp (from, "MACRO") == 0
+             && len >= 8 && 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_linefile (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.  */


@@ -272,8 +278,8 @@ 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
       && is_name_beginner (in->ptr[idx]))
 {
   if (idx < in->len
       && is_name_beginner (in->ptr[idx]))


@@ -298,8 +304,8 @@ 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)

 {
   while (idx < in->len
         && (in->ptr[idx] == '"'
 {
   while (idx < in->len
         && (in->ptr[idx] == '"'


@@ -310,8 +316,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] == '!')
                {


@@ -384,8 +390,8 @@ getstring (int idx, sb *in, sb *acc)
     (string)           -> return (string-including-whitespaces)
     xyx<whitespace>     -> return xyz.  */
 
     (string)           -> return (string-including-whitespaces)
     xyx<whitespace>     -> return xyz.  */
 

-static int
-get_any_string (int idx, sb *in, sb *out)
+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);


@@ -394,13 +400,13 @@ get_any_string (int idx, sb *in, sb *out)
     {
       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++]);
        }
       else if (in->ptr[idx] == '%' && macro_alternate)
        {
            sb_add_char (out, in->ptr[idx++]);
        }
       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 */
 
          /* Turns the next expression into a string.  */
          /* xgettext: no-c-format */


@@ -408,7 +414,7 @@ get_any_string (int idx, sb *in, sb *out)
                               idx + 1,
                               in,
                               &val);
                               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] == '"'
          sb_add_string (out, buf);
        }
       else if (in->ptr[idx] == '"'


@@ -429,7 +435,7 @@ get_any_string (int idx, sb *in, sb *out)
        }
       else
        {
        }
       else
        {

-         char *br_buf = xmalloc(1);
+         char *br_buf = XNEWVEC (char, 1);

          char *in_br = br_buf;
 
          *in_br = '\0';
          char *in_br = br_buf;
 
          *in_br = '\0';


@@ -452,7 +458,10 @@ get_any_string (int idx, sb *in, sb *out)
                         && in->ptr[idx] != tchar)
                    sb_add_char (out, in->ptr[idx++]);
                  if (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 '[':
                  break;
                case '(':
                case '[':


@@ -460,9 +469,9 @@ get_any_string (int idx, sb *in, sb *out)
                    --in_br;
                  else
                    {
                    --in_br;
                  else
                    {

-                     br_buf = xmalloc(strlen(in_br) + 2);
-                     strcpy(br_buf + 1, in_br);
-                     free(in_br);
+                     br_buf = XNEWVEC (char, strlen (in_br) + 2);
+                     strcpy (br_buf + 1, in_br);
+                     free (in_br);

                      in_br = br_buf;
                    }
                  *in_br = tchar;
                      in_br = br_buf;
                    }
                  *in_br = tchar;


@@ -479,7 +488,7 @@ get_any_string (int idx, sb *in, sb *out)
              sb_add_char (out, tchar);
              ++idx;
            }
              sb_add_char (out, tchar);
              ++idx;
            }

-         free(br_buf);
+         free (br_buf);

        }
     }
 
        }
     }
 


@@ -493,7 +502,7 @@ new_formal (void)
 {
   formal_entry *formal;
 
 {
   formal_entry *formal;
 

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

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


@@ -516,8 +525,8 @@ del_formal (formal_entry *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;
   const char *name;
 {
   formal_entry **p = &macro->formals;
   const char *name;


@@ -526,13 +535,15 @@ do_formals (macro_entry *macro, int idx, sb *in)
   while (idx < in->len)
     {
       formal_entry *formal = new_formal ();
   while (idx < in->len)
     {
       formal_entry *formal = new_formal ();

-      int cidx;
+      size_t cidx;
+      formal_hash_entry_t *elt;

 
       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);
          break;
        }
       idx = sb_skip_white (idx, in);


@@ -588,14 +599,15 @@ do_formals (macro_entry *macro, int idx, sb *in)
        }
 
       /* Add to macro's hash table.  */
        }
 
       /* Add to macro's hash table.  */

-      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);
+      elt = formal_entry_alloc (name, formal);
+      if (htab_insert (macro->formal_hash, elt, 0) != NULL)
+       {
+         free (elt);
+         as_bad_where (macro->file, macro->line,
+                       _("A parameter named `%s' "
+                         "already exists for macro `%s'"),
+                       name, macro->name);
+       }

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


@@ -614,11 +626,12 @@ do_formals (macro_entry *macro, int idx, sb *in)
   if (macro_mri)
     {
       formal_entry *formal = new_formal ();
   if (macro_mri)
     {
       formal_entry *formal = new_formal ();

+      formal_hash_entry_t *elt;

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


@@ -627,13 +640,14 @@ 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);
+      elt = formal_entry_alloc (name, formal);
+      if (htab_insert (macro->formal_hash, elt, 0) != NULL)
+       {
+         free (elt);
+         as_bad_where (macro->file, macro->line,
+                       _("Reserved word `%s' used as parameter in macro `%s'"),
+                       name, macro->name);
+       }

 
       formal->index = NARG_INDEX;
       *p = formal;
 
       formal->index = NARG_INDEX;
       *p = formal;


@@ -642,21 +656,41 @@ 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);
+    }
+  htab_delete (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 *),
-             char *file, unsigned int line,
+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;
   const char *error = NULL;
 
              const char **namep)
 {
   macro_entry *macro;
   sb name;
   const char *error = NULL;
 

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

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


@@ -664,7 +698,8 @@ define_macro (int idx, sb *in, sb *label,
 
   macro->formal_count = 0;
   macro->formals = 0;
 
   macro->formal_count = 0;
   macro->formals = 0;

-  macro->formal_hash = hash_new ();
+  macro->formal_hash = htab_create_alloc (7, hash_formal_entry, eq_formal_entry,
+                                         NULL, xcalloc, free);

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


@@ -690,7 +725,7 @@ define_macro (int idx, sb *in, sb *label,
     }
   else
     {
     }
   else
     {

-      int cidx;
+      size_t cidx;

 
       idx = get_token (idx, in, &name);
       macro->name = sb_terminate (&name);
 
       idx = get_token (idx, in, &name);
       macro->name = sb_terminate (&name);


@@ -709,10 +744,15 @@ define_macro (int idx, sb *in, sb *label,
   /* 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]);

-  if (hash_find (macro_hash, macro->name))
-    error = _("Macro `%s' was already defined");

   if (!error)
   if (!error)

-    error = hash_jam (macro_hash, macro->name, (PTR) macro);
+    {
+      macro_hash_entry_t *elt = macro_entry_alloc (macro->name, macro);
+      if (htab_insert (macro_hash, elt, 0) != NULL)
+       {
+         free (elt);
+         error = _("Macro `%s' was already defined");
+       }
+    }

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


@@ -727,8 +767,8 @@ define_macro (int idx, sb *in, sb *label,
 
 /* 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


@@ -741,11 +781,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 htab *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);


@@ -756,7 +796,7 @@ sub_actual (int start, sb *in, sb *t, struct hash_control *formal_hash,
       && (src == start || in->ptr[src - 1] != '@'))
     ptr = NULL;
   else
       && (src == start || in->ptr[src - 1] != '@'))
     ptr = NULL;
   else

-    ptr = (formal_entry *) hash_find (formal_hash, sb_terminate (t));
+    ptr = formal_entry_find (formal_hash, sb_terminate (t));

   if (ptr)
     {
       if (ptr->actual.len)
   if (ptr)
     {
       if (ptr->actual.len)


@@ -773,6 +813,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)
     {


@@ -790,10 +832,11 @@ 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, const macro_entry *macro)
+                  struct htab *formal_hash, const macro_entry *macro)

 {
   sb t;
 {
   sb t;

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

   formal_entry *loclist = NULL;
   const char *err = NULL;
 
   formal_entry *loclist = NULL;
   const char *err = NULL;
 


@@ -813,9 +856,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 substitution 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);
            }
        }


@@ -841,7 +883,7 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
            {
              /* 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);


@@ -893,7 +935,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,


@@ -907,10 +951,20 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
                {
                  const char *name;
                  formal_entry *f = new_formal ();
                {
                  const char *name;
                  formal_entry *f = new_formal ();

+                 formal_hash_entry_t *elt;

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

-                 if (! hash_find (formal_hash, name))
+                 elt = formal_entry_alloc (name, f);
+                 if (htab_insert (formal_hash, elt, 0) != NULL)
+                   {
+                     free (elt);
+                     as_bad_where (macro->file, macro->line + macro_line,
+                                   _("`%s' was already used as parameter "
+                                     "(or another local) name"), name);
+                     del_formal (f);
+                   }
+                 else

                    {
                      static int loccnt;
                      char buf[20];
                    {
                      static int loccnt;
                      char buf[20];


@@ -921,18 +975,6 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
 
                      sprintf (buf, IS_ELF ? ".LL%04x" : "LL%04x", ++loccnt);
                      sb_add_string (&f->actual, buf);
 
                      sprintf (buf, IS_ELF ? ".LL%04x" : "LL%04x", ++loccnt);
                      sb_add_string (&f->actual, buf);

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


@@ -964,17 +1006,17 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
 
          sb_reset (&t);
          src = get_token (src + 2, in, &t);
 
          sb_reset (&t);
          src = get_token (src + 2, in, &t);

-         ptr = (formal_entry *) hash_find (formal_hash, sb_terminate (&t));
+         ptr = formal_entry_find (formal_hash, sb_terminate (&t));

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


@@ -1004,11 +1046,12 @@ 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);
+      formal_hash_entry_t needle = { name, NULL };
+      htab_remove_elt (formal_hash, &needle);

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


@@ -1020,12 +1063,11 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
    body.  */
 
 static const char *
    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;
   const char *err = NULL;
   int is_keyword = 0;
   int narg = 0;
   const char *err = NULL;


@@ -1042,7 +1084,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.


@@ -1068,7 +1110,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;


@@ -1094,11 +1136,15 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
            }
 
          /* Lookup the formal in the macro's list.  */
            }
 
          /* Lookup the formal in the macro's list.  */

-         ptr = (formal_entry *) hash_find (m->formal_hash, sb_terminate (&t));
+         ptr = formal_entry_find (m->formal_hash, sb_terminate (&t));

          if (!ptr)
          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.  */


@@ -1116,8 +1162,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");


@@ -1190,7 +1234,7 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
 
          sb_reset (&t);
          sb_add_string (&t, macro_strip_at ? "$NARG" : "NARG");
 
          sb_reset (&t);
          sb_add_string (&t, macro_strip_at ? "$NARG" : "NARG");

-         ptr = (formal_entry *) hash_find (m->formal_hash, sb_terminate (&t));
+         ptr = formal_entry_find (m->formal_hash, sb_terminate (&t));

          sprintf (buffer, "%d", narg);
          sb_add_string (&ptr->actual, buffer);
        }
          sprintf (buffer, "%d", narg);
          sb_add_string (&ptr->actual, buffer);
        }


@@ -1232,7 +1276,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;
 


@@ -1246,13 +1290,12 @@ check_macro (const char *line, sb *expand,
   if (is_name_ender (*s))
     ++s;
 
   if (is_name_ender (*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_find (macro_hash, copy);
+  free (copy);

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


@@ -1274,26 +1317,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


@@ -1301,22 +1324,26 @@ delete_macro (const char *name)
 {
   char *copy;
   size_t i, len;
 {
   char *copy;
   size_t i, len;

-  macro_entry *macro;
+  void **slot;
+  macro_hash_entry_t needle;

 
   len = strlen (name);
 
   len = strlen (name);

-  copy = (char *) alloca (len + 1);
+  copy = XNEWVEC (char, len + 1);

   for (i = 0; i < len; ++i)
     copy[i] = TOLOWER (name[i]);
   copy[i] = '\0';
 
   for (i = 0; i < len; ++i)
     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)
+  needle.name = copy;
+  needle.macro = NULL;
+  slot = htab_find_slot (macro_hash, &needle, NO_INSERT);
+  if (slot)

     {
     {

-      hash_jam (macro_hash, copy, NULL);
-      free_macro (macro);
+      free_macro (((macro_hash_entry_t *) *slot)->macro);
+      htab_clear_slot (macro_hash, slot);

     }
   else
     }
   else

-    as_warn (_("Attempt to purge non-existant macro `%s'"), copy);
+    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


@@ -1324,12 +1351,12 @@ 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;

-  struct hash_control *h;
-  const char *err;
+  struct htab *h;
+  const char *err = NULL;

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


@@ -1345,10 +1372,10 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
   if (f.name.len == 0)
     return _("missing model parameter");
 
   if (f.name.len == 0)
     return _("missing model parameter");
 

-  h = hash_new ();
-  err = hash_jam (h, sb_terminate (&f.name), &f);
-  if (err != NULL)
-    return err;
+  h = htab_create_alloc (16, hash_formal_entry, eq_formal_entry,
+                        NULL, xcalloc, free);
+
+  htab_insert (h, formal_entry_alloc (sb_terminate (&f.name), &f), 0);

 
   f.index = 1;
   f.next = NULL;
 
   f.index = 1;
   f.next = NULL;


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

+      bool 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)


@@ -1374,7 +1407,10 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
            {
              if (in->ptr[idx] == '"')
                {
            {
              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)


@@ -1387,17 +1423,18 @@ 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);
        }
     }
 

-  hash_die (h);
+  htab_delete (h);

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