Sync config.guess and config.sub with GCC

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

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

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

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


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

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

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


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

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

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

-#include "libiberty.h"

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

-#include "hash.h"

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

-#include "asintl.h"
-

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

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

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


@@ -116,7 +65,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 +75,14 @@ static int macro_number;
 
 void
 macro_init (int alternate, int mri, int strip_at,
 
 void
 macro_init (int alternate, int mri, int strip_at,

-           int (*expr) (const char *, int, sb *, int *))
+           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.  */


@@ -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;
+  size_t line_start = ptr->len;
+  size_t more = get_line (ptr);

 
 

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


@@ -181,7 +129,8 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
   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;
+      bfd_boolean 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 +154,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.  */


@@ -272,8 +226,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 +252,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] == '"'


@@ -384,8 +338,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);


@@ -399,7 +353,7 @@ get_any_string (int idx, sb *in, sb *out)
        }
       else if (in->ptr[idx] == '%' && macro_alternate)
        {
        }
       else if (in->ptr[idx] == '%' && macro_alternate)
        {

-         int val;
+         offsetT val;

          char buf[20];
 
          /* Turns the next expression into a string.  */
          char buf[20];
 
          /* Turns the next expression into a string.  */


@@ -408,20 +362,19 @@ 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] == '"'
               || (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)
+         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
            {


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

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

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


@@ -453,7 +406,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 '[':


@@ -461,9 +417,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 = (char *) xmalloc (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;


@@ -480,7 +436,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);

        }
     }
 
        }
     }
 


@@ -494,7 +450,7 @@ new_formal (void)
 {
   formal_entry *formal;
 
 {
   formal_entry *formal;
 

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

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


@@ -517,8 +473,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;


@@ -527,13 +483,14 @@ 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;

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


@@ -643,13 +600,33 @@ do_formals (macro_entry *macro, int idx, sb *in)
   return idx;
 }
 
   return idx;
 }
 

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

 /* Define a new macro.  Returns NULL on success, otherwise returns an
    error message.  If NAMEP is not NULL, *NAMEP is set to the name of
    the macro which was defined.  */
 
 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 *),
+define_macro (size_t idx, sb *in, sb *label,
+             size_t (*get_line) (sb *),

              char *file, unsigned int line,
              const char **namep)
 {
              char *file, unsigned int line,
              const char **namep)
 {


@@ -691,7 +668,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);


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

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

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


@@ -728,8 +705,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


@@ -742,11 +719,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);


@@ -774,6 +751,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)
     {


@@ -794,7 +773,8 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals,
                   struct hash_control *formal_hash, const macro_entry *macro)
 {
   sb t;
                   struct hash_control *formal_hash, const macro_entry *macro)
 {
   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;
 


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

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

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


@@ -894,7 +873,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,


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

+      const char *name;

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

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

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


@@ -1021,12 +1002,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;


@@ -1069,7 +1049,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;


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

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

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


@@ -1117,8 +1101,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");


@@ -1233,7 +1215,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;
 


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

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

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


@@ -1275,26 +1257,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


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

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

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


@@ -1325,7 +1289,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;


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

+      bfd_boolean in_quotes = FALSE;
+

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

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

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


@@ -1375,8 +1345,11 @@ 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)
                    {


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

+

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

-         else
+         else if (! in_quotes)

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