X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gas%2Fmacro.c;h=c5959f674dd320423a180338ba2bcd109080b77e;hb=4d944db22c351296bad0b54d6a1857ad1fbde575;hp=4f934ae52de73d540fdb48f42b033b12df55a163;hpb=5e75c3ab6ea7b02ce1262fc42fc436d604b47dde;p=binutils-gdb.git diff --git a/gas/macro.c b/gas/macro.c index 4f934ae52de..c5959f674dd 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -1,6 +1,5 @@ /* 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-2023 Free Software Foundation, Inc. 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 - 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, @@ -19,71 +18,23 @@ 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 -# 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 -#ifdef HAVE_STRING_H -#include -#else -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ + #include "as.h" -#include "libiberty.h" #include "safe-ctype.h" #include "sb.h" -#include "hash.h" #include "macro.h" -#include "asintl.h" - /* 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) \ ((x) == ' ' || (x) == '\t' || (x) == ',' || (x) == '"' || (x) == ';' \ || (x) == ')' || (x) == '(' \ - || ((macro_alternate || macro_mri) && ((x) == '<' || (x) == '>'))) + || ((flag_macro_alternate || flag_mri) && ((x) == '<' || (x) == '>'))) #define ISBASE(x) \ ((x) == 'b' || (x) == 'B' \ @@ -93,60 +44,43 @@ static const char *macro_expand (int, sb *, macro_entry *, sb *); /* The macro hash table. */ -struct hash_control *macro_hash; +htab_t macro_hash; /* Whether any macros have been defined. */ int macro_defined; -/* Whether we are in alternate syntax mode. */ - -static int macro_alternate; - -/* Whether we are in MRI mode. */ - -static int macro_mri; - /* Whether we should strip '@' characters. */ -static int macro_strip_at; - -/* Function to use to parse an expression. */ - -static int (*macro_expr) (const char *, int, sb *, int *); +#define macro_strip_at false /* Number of macro expansions that have been done. */ static int macro_number; -/* Initialize macro processing. */ +static void free_macro (macro_entry *); -void -macro_init (int alternate, int mri, int strip_at, - int (*expr) (const char *, int, sb *, int *)) +static void +macro_del_f (void *ent) { - macro_hash = hash_new (); - macro_defined = 0; - macro_alternate = alternate; - macro_mri = mri; - macro_strip_at = strip_at; - macro_expr = expr; + string_tuple_t *tuple = ent; + free_macro ((macro_entry *) tuple->value); } -/* Switch in and out of alternate mode on the fly. */ +/* Initialize macro processing. */ void -macro_set_alternate (int alternate) +macro_init (void) { - macro_alternate = alternate; + macro_hash = htab_create_alloc (16, hash_string_tuple, eq_string_tuple, + macro_del_f, notes_calloc, NULL); + macro_defined = 0; } -/* Switch in and out of MRI mode on the fly. */ - void -macro_mri_mode (int mri) +macro_end (void) { - macro_mri = mri; + htab_delete (macro_hash); } /* Read input lines till we get to a TO string. @@ -158,16 +92,14 @@ macro_mri_mode (int mri) 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 line_start = ptr->len; - - int more = get_line (ptr); + size_t line_start, more; - if (to_len == 4 && strcasecmp(to, "ENDR") == 0) + if (to_len == 4 && strcasecmp (to, "ENDR") == 0) { from = NULL; from_len = 0; @@ -175,78 +107,111 @@ buffer_and_nest (const char *from, const char *to, sb *ptr, else from_len = strlen (from); + /* Record the present source position, such that diagnostics and debug info + can be properly associated with the respective original lines, rather + than with the line of the ending directive (TO). */ + { + unsigned int line; + char *linefile; + + as_where_top (&line); + if (!flag_m68k_mri) + linefile = xasprintf ("\t.linefile %u .", line + 1); + else + linefile = xasprintf ("\tlinefile %u .", line + 1); + sb_add_string (ptr, linefile); + xfree (linefile); + } + + line_start = ptr->len; + more = get_line (ptr); 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; + bool had_colon = false; - if (! NO_PSEUDO_DOT && ! flag_m68k_mri) - { - /* With normal syntax we can suck what we want till we get - to the dot. With the alternate, labels have to start in - the first column, since we can't tell what's a label and - whats a pseudoop. */ + /* With normal syntax we can suck what we want till we get + to the dot. With the alternate, labels have to start in + the first column, since we can't tell what's a label and + what's a pseudoop. */ - if (! LABELS_WITHOUT_COLONS) - { - /* Skip leading whitespace. */ - while (i < ptr->len && ISWHITE (ptr->ptr[i])) - i++; - } + if (! LABELS_WITHOUT_COLONS) + { + /* Skip leading whitespace. */ + while (i < ptr->len && ISWHITE (ptr->ptr[i])) + i++; + } - for (;;) + for (;;) + { + /* Skip over a label, if any. */ + if (i >= ptr->len || ! is_name_beginner (ptr->ptr[i])) + break; + i++; + while (i < ptr->len && is_part_of_name (ptr->ptr[i])) + i++; + if (i < ptr->len && is_name_ender (ptr->ptr[i])) + i++; + /* Skip whitespace. */ + while (i < ptr->len && ISWHITE (ptr->ptr[i])) + i++; + /* Check for the colon. */ + if (i >= ptr->len || ptr->ptr[i] != ':') { - /* Skip over a label, if any. */ - if (i >= ptr->len || ! is_name_beginner (ptr->ptr[i])) + /* LABELS_WITHOUT_COLONS doesn't mean we cannot have a + colon after a label. If we do have a colon on the + first label then handle more than one label on the + line, assuming that each label has a colon. */ + if (LABELS_WITHOUT_COLONS && !had_colon) break; - i++; - while (i < ptr->len && is_part_of_name (ptr->ptr[i])) - i++; - if (i < ptr->len && is_name_ender (ptr->ptr[i])) - i++; - if (LABELS_WITHOUT_COLONS) - break; - /* Skip whitespace. */ - while (i < ptr->len && ISWHITE (ptr->ptr[i])) - i++; - /* Check for the colon. */ - if (i >= ptr->len || ptr->ptr[i] != ':') - { - i = line_start; - break; - } - i++; - line_start = i; + i = line_start; + break; } - + i++; + line_start = i; + had_colon = true; } + /* Skip trailing whitespace. */ while (i < ptr->len && ISWHITE (ptr->ptr[i])) i++; if (i < ptr->len && (ptr->ptr[i] == '.' || NO_PSEUDO_DOT - || macro_mri)) + || flag_mri)) { 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 - ? strncasecmp (ptr->ptr + i, from, from_len) == 0 + ? (len >= from_len + && strncasecmp (ptr->ptr + i, from, 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++; - 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])))) { @@ -258,6 +223,21 @@ buffer_and_nest (const char *from, const char *to, sb *ptr, break; } } + + /* PR gas/16908 + Apply .linefile directives that appear within the macro, alongside + keeping them for later expansion of the macro. */ + if (from != NULL && strcasecmp (from, "MACRO") == 0 + && len >= 8 && strncasecmp (ptr->ptr + i, "linefile", 8) == 0) + { + sb_add_char (ptr, more); + temp_ilp (sb_terminate (ptr) + i + 8); + s_linefile (0); + restore_ilp (); + line_start = ptr->len; + more = get_line (ptr); + continue; + } } /* Add the original end-of-line char to the end and keep running. */ @@ -272,8 +252,8 @@ buffer_and_nest (const char *from, const char *to, sb *ptr, /* 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])) @@ -291,29 +271,27 @@ get_token (int idx, sb *in, sb *name) } } /* Ignore trailing &. */ - if (macro_alternate && idx < in->len && in->ptr[idx] == '&') + if (flag_macro_alternate && idx < in->len && in->ptr[idx] == '&') idx++; return idx; } /* 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)) - || (in->ptr[idx] == '\'' && macro_alternate))) + || (in->ptr[idx] == '<' && (flag_macro_alternate || flag_mri)) + || (in->ptr[idx] == '\'' && flag_macro_alternate))) { if (in->ptr[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] == '!') { @@ -345,7 +323,7 @@ getstring (int idx, sb *in, sb *acc) else escaped = 0; - if (macro_alternate && in->ptr[idx] == '!') + if (flag_macro_alternate && in->ptr[idx] == '!') { idx ++; @@ -381,13 +359,13 @@ getstring (int idx, sb *in, sb *acc) /* Fetch string from the input stream, rules: 'Bxyx -> return 'Bxyza - % -> return string of decimal value of x - "" -> return string - xyx -> return xyz -*/ + % -> return string of decimal value of + "string" -> return string + (string) -> return (string-including-whitespaces) + xyx -> 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); @@ -396,37 +374,38 @@ 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])) { - 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 - && expand) + else if (in->ptr[idx] == '%' && flag_macro_alternate) { - int val; - char buf[20]; - /* 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); + /* Turn the following expression into a string. */ + expressionS ex; + char buf[64]; + + sb_terminate (in); + + temp_ilp (in->ptr + idx + 1); + expression_and_evaluate (&ex); + idx = input_line_pointer - in->ptr; + restore_ilp (); + + if (ex.X_op != O_constant) + as_bad (_("%% operator needs absolute expression")); + + sprintf (buf, "%" PRId64, (int64_t) ex.X_add_number); sb_add_string (out, buf); } else if (in->ptr[idx] == '"' - || (in->ptr[idx] == '<' && (macro_alternate || macro_mri)) - || (macro_alternate && in->ptr[idx] == '\'')) + || (in->ptr[idx] == '<' && (flag_macro_alternate || flag_mri)) + || (flag_macro_alternate && in->ptr[idx] == '\'')) { - if (macro_alternate - && ! macro_strip_at - && expand) + if (flag_macro_alternate && ! macro_strip_at && in->ptr[idx] != '<') { /* Keep the quotes. */ - sb_add_char (out, '\"'); - + sb_add_char (out, '"'); idx = getstring (idx, in, out); - sb_add_char (out, '\"'); + sb_add_char (out, '"'); } else { @@ -435,76 +414,182 @@ get_any_string (int idx, sb *in, sb *out, int expand, int pretend_quoted) } else { + char *br_buf = XNEWVEC (char, 1); + char *in_br = br_buf; + + *in_br = '\0'; while (idx < in->len - && (in->ptr[idx] == '"' - || in->ptr[idx] == '\'' - || pretend_quoted + && (*in_br || (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] != '<' + || (! flag_macro_alternate && ! flag_mri))) { - if (in->ptr[idx] == '"' - || in->ptr[idx] == '\'') + char tchar = in->ptr[idx]; + + switch (tchar) { - char tchar = in->ptr[idx]; + case '"': + case '\'': sb_add_char (out, in->ptr[idx++]); while (idx < in->len && in->ptr[idx] != tchar) sb_add_char (out, in->ptr[idx++]); if (idx == in->len) - return idx; + { + 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; } +/* 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. */ -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 = ¯o->formals; + const char *name; - macro->formal_count = 0; - macro->formal_hash = hash_new (); 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; + del_formal (formal); /* 'formal' goes out of scope. */ break; } idx = sb_skip_white (idx, in); /* This is a formal. */ + name = sb_terminate (&formal->name); + if (! flag_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. */ - 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); + 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. */ - hash_jam (macro->formal_hash, sb_terminate (&formal->name), formal); + if (str_hash_insert (macro->formal_hash, name, formal, 0) != NULL) + { + 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; + p = &formal->next; + if (formal->type == FORMAL_VARARG) + break; cidx = idx; idx = sb_skip_comma (idx, in); if (idx != cidx && idx >= in->len) @@ -512,26 +597,16 @@ do_formals (macro_entry *macro, int idx, sb *in) idx = cidx; break; } - *p = formal; - p = &formal->next; - *p = NULL; } - if (macro_mri) + if (flag_mri) { - formal_entry *formal; - const char *name; + formal_entry *formal = new_formal (); /* 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 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 @@ -540,48 +615,75 @@ do_formals (macro_entry *macro, int idx, sb *in) sb_add_string (&formal->name, name); /* Add to macro's hash table. */ - hash_jam (macro->formal_hash, name, formal); + if (str_hash_insert (macro->formal_hash, name, formal, 0) != NULL) + { + 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->next = NULL; } return idx; } -/* 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. */ +/* Free the memory allocated to a macro. */ -const char * -define_macro (int idx, sb *in, sb *label, - int (*get_line) (sb *), const char **namep) +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 (¯o->sub); + free ((char *) macro->name); + free (macro); +} + +/* Define a new macro. */ + +macro_entry * +define_macro (sb *in, sb *label, size_t (*get_line) (sb *)) { macro_entry *macro; sb name; - const char *namestr; + size_t idx; + const char *error = NULL; - macro = (macro_entry *) xmalloc (sizeof (macro_entry)); + macro = XNEW (macro_entry); sb_new (¯o->sub); sb_new (&name); + macro->file = as_where (¯o->line); macro->formal_count = 0; macro->formals = 0; + macro->formal_hash = str_htab_create (); - idx = sb_skip_white (idx, in); + idx = sb_skip_white (0, in); if (! buffer_and_nest ("MACRO", "ENDM", ¯o->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); + 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] != ')') - 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 { @@ -591,11 +693,12 @@ define_macro (int idx, sb *in, sb *label, } else { - int cidx; + size_t cidx; idx = get_token (idx, in, &name); + macro->name = sb_terminate (&name); 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) @@ -603,34 +706,39 @@ define_macro (int idx, sb *in, sb *label, 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]); - 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 (!error) + { + if (str_hash_insert (macro_hash, macro->name, macro, 0) != NULL) + error = _("Macro `%s' was already defined"); + } - if (namep != NULL) - *namep = namestr; + if (!error) + macro_defined = 1; + else + { + as_bad_where (macro->file, macro->line, error, macro->name); + free_macro (macro); + macro = NULL; + } - return NULL; + return macro; } /* 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 && in->ptr[idx] == kind - && (! macro_mri || macro_strip_at) + && (! flag_mri || macro_strip_at) && (! macro_strip_at || kind == '@')) idx++; return idx; @@ -638,11 +746,11 @@ get_apost_token (int idx, sb *in, sb *name, int kind) /* 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 src; + size_t src; formal_entry *ptr; src = get_apost_token (start, in, t, kind); @@ -653,7 +761,7 @@ sub_actual (int start, sb *in, sb *t, struct hash_control *formal_hash, && (src == start || in->ptr[src - 1] != '@')) ptr = NULL; else - ptr = (formal_entry *) hash_find (formal_hash, sb_terminate (t)); + ptr = str_hash_find (formal_hash, sb_terminate (t)); if (ptr) { if (ptr->actual.len) @@ -670,6 +778,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); + if (src != start && in->ptr[src - 1] == '&') + sb_add_char (out, '&'); } else if (copyifnotthere) { @@ -687,21 +797,22 @@ 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, - struct hash_control *formal_hash, int locals) + struct htab *formal_hash, const macro_entry *macro) { sb t; - int src = 0; - int inquote = 0; + size_t src = 0; + int inquote = 0, macro_line = 0; formal_entry *loclist = NULL; + const char *err = NULL; sb_new (&t); - while (src < in->len) + while (src < in->len && !err) { if (in->ptr[src] == '&') { sb_reset (&t); - if (macro_mri) + if (flag_mri) { if (src + 1 < in->len && in->ptr[src + 1] == '&') src = sub_actual (src + 2, in, &t, formal_hash, '\'', out, 1); @@ -710,8 +821,8 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, } else { - /* FIXME: Why do we do this? */ - /* At least in alternate mode this seems correct. */ + /* Permit macro parameter substitution delineated with + an '&' prefix and optional '&' suffix. */ src = sub_actual (src + 1, in, &t, formal_hash, '&', out, 0); } } @@ -726,16 +837,18 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, { sb_add_char (out, in->ptr[src++]); } - if (in->ptr[src] == ')') + if (src < in->len) src++; + else if (!macro) + err = _("missing `)'"); else - return _("misplaced `)'"); + as_bad_where (macro->file, macro->line + macro_line, _("missing `)'")); } else if (src < in->len && in->ptr[src] == '@') { /* Sub in the macro invocation number. */ - char buffer[10]; + char buffer[12]; src++; sprintf (buffer, "%d", macro_number); sb_add_string (out, buffer); @@ -748,7 +861,7 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, sb_add_char (out, '&'); src++; } - else if (macro_mri && src < in->len && ISALNUM (in->ptr[src])) + else if (flag_mri && src < in->len && ISALNUM (in->ptr[src])) { int ind; formal_entry *f; @@ -778,16 +891,18 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, src = sub_actual (src, in, &t, formal_hash, '\'', out, 0); } } - else if ((macro_alternate || macro_mri) + else if ((flag_macro_alternate || flag_mri) && is_name_beginner (in->ptr[src]) && (! 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 - || ! 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, @@ -796,38 +911,40 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, } else { - formal_entry *f; - 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); - ++loccnt; - sprintf (buf, IS_ELF ? ".LL%04x" : "LL%04x", loccnt); - sb_add_string (&f->actual, buf); + name = sb_terminate (&f->name); + if (str_hash_insert (formal_hash, name, f, 0) != NULL) + { + 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]; - err = hash_jam (formal_hash, sb_terminate (&f->name), f); - if (err != NULL) - return err; + f->index = LOCAL_INDEX; + f->next = loclist; + loclist = f; + + sprintf (buf, IS_ELF ? ".LL%04x" : "LL%04x", ++loccnt); + sb_add_string (&f->actual, buf); + } src = sb_skip_comma (src, in); } } } else if (in->ptr[src] == '"' - || (macro_mri && in->ptr[src] == '\'')) + || (flag_mri && in->ptr[src] == '\'')) { inquote = !inquote; sb_add_char (out, in->ptr[src++]); @@ -842,7 +959,7 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, ++src; } } - else if (macro_mri + else if (flag_mri && in->ptr[src] == '=' && src + 1 < in->len && in->ptr[src + 1] == '=') @@ -851,17 +968,17 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, sb_reset (&t); src = get_token (src + 2, in, &t); - ptr = (formal_entry *) hash_find (formal_hash, sb_terminate (&t)); + ptr = str_hash_find (formal_hash, sb_terminate (&t)); 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); @@ -880,6 +997,8 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, } else { + if (in->ptr[src] == '\n') + ++macro_line; sb_add_char (out, in->ptr[src++]); } } @@ -889,34 +1008,32 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, while (loclist != NULL) { formal_entry *f; + const char *name; 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); + str_hash_delete (formal_hash, name); + del_formal (loclist); loclist = f; } - return NULL; + if (!err && (out->len == 0 || out->ptr[out->len - 1] != '\n')) + sb_add_char (out, '\n'); + return err; } /* 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; - int is_positional = 0; int is_keyword = 0; int narg = 0; - const char *err; + const char *err = NULL; sb_new (&t); @@ -927,10 +1044,10 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out) while (f != NULL && f->index < 0) f = f->next; - if (macro_mri) + if (flag_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. @@ -940,18 +1057,14 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out) && 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; - idx = get_any_string (idx, in, &n->actual, 1, 0); + idx = get_any_string (idx, in, &n->actual); } } } @@ -960,16 +1073,16 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out) 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; while (scan < in->len && !ISSEP (in->ptr[scan]) - && !(macro_mri && in->ptr[scan] == '\'') - && (!macro_alternate && in->ptr[scan] != '=')) + && !(flag_mri && in->ptr[scan] == '\'') + && (!flag_macro_alternate && in->ptr[scan] != '=')) scan++; - if (scan < in->len && !macro_alternate && in->ptr[scan] == '=') + if (scan < in->len && !flag_macro_alternate && in->ptr[scan] == '=') { is_keyword = 1; @@ -979,42 +1092,57 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out) then the actual stuff. */ sb_reset (&t); idx = get_token (idx, in, &t); - if (in->ptr[idx] != '=') - return _("confusion in formal parameters"); + if (idx >= in->len || in->ptr[idx] != '=') + { + 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)); + ptr = str_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. */ - 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 { - /* This is a positional arg. */ - is_positional = 1; if (is_keyword) - return _("can't mix positional and keyword arguments"); + { + err = _("can't mix positional and keyword arguments"); + break; + } if (!f) { formal_entry **pf; int c; - if (!macro_mri) - return _("too many positional arguments"); + if (!flag_mri) + { + 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) @@ -1026,8 +1154,13 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out) 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 if (idx < in->len) + { + sb_add_buffer (&f->actual, in->ptr + idx, in->len - idx); + idx = in->len; + } if (f->actual.len > 0) ++narg; do @@ -1037,35 +1170,44 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out) while (f != NULL && f->index < 0); } - if (! macro_mri) + if (! flag_mri) idx = sb_skip_comma (idx, in); else { - if (in->ptr[idx] == ',') + if (idx < in->len && in->ptr[idx] == ',') ++idx; - if (ISWHITE (in->ptr[idx])) + if (idx < in->len && ISWHITE (in->ptr[idx])) break; } } - 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 (flag_mri) + { + ptr = str_hash_find (m->formal_hash, + macro_strip_at ? "$NARG" : "NARG"); + if (ptr) + { + char buffer[20]; + 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) + if (flag_mri) { formal_entry **pf; @@ -1076,20 +1218,18 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out) pf = &(*pf)->next; else { - sb_kill (&(*pf)->name); - sb_kill (&(*pf)->def); - sb_kill (&(*pf)->actual); f = (*pf)->next; - free (*pf); + del_formal (*pf); *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 @@ -1100,12 +1240,12 @@ check_macro (const char *line, sb *expand, const char **error, macro_entry **info) { const char *s; - char *copy, *cs; + char *copy, *cls; macro_entry *macro; sb line_sb; if (! is_name_beginner (*line) - && (! macro_mri || *line != '.')) + && (! flag_mri || *line != '.')) return 0; s = line + 1; @@ -1114,13 +1254,12 @@ check_macro (const char *line, sb *expand, 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 = str_hash_find (macro_hash, copy); + free (copy); if (macro == NULL) return 0; @@ -1147,7 +1286,22 @@ check_macro (const char *line, sb *expand, 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'; + + macro = str_hash_find (macro_hash, copy); + if (macro != NULL) + str_hash_delete (macro_hash, copy); + 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 @@ -1155,18 +1309,21 @@ delete_macro (const char *name) 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; - struct hash_control *h; - const char *err; + struct htab *h; + const char *err = NULL; idx = sb_skip_white (idx, in); sb_new (&sub); if (! buffer_and_nest (NULL, "ENDR", &sub, get_line)) - return _("unexpected end of file in irp or irpc"); + { + err = _("unexpected end of file in irp or irpc"); + goto out2; + } sb_new (&f.name); sb_new (&f.def); @@ -1174,15 +1331,18 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *)) idx = get_token (idx, in, &f.name); if (f.name.len == 0) - return _("missing model parameter"); + { + err = _("missing model parameter"); + goto out1; + } - h = hash_new (); - err = hash_jam (h, sb_terminate (&f.name), &f); - if (err != NULL) - return err; + h = str_htab_create (); + + str_hash_insert (h, sb_terminate (&f.name), &f, 0); f.index = 1; f.next = NULL; + f.type = FORMAL_OPTIONAL; sb_reset (out); @@ -1191,22 +1351,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); - if (err != NULL) - return err; } else { + bool in_quotes = false; + if (irpc && in->ptr[idx] == '"') - ++idx; + { + in_quotes = true; + ++idx; + } + 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] == '"') { - int nxt; + size_t nxt; + + if (irpc) + in_quotes = ! in_quotes; nxt = sb_skip_white (idx + 1, in); if (nxt >= in->len) @@ -1219,18 +1386,24 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *)) sb_add_char (&f.actual, in->ptr[idx]); ++idx; } + err = macro_expand_body (&sub, out, &f, h, 0); if (err != NULL) - return err; + break; if (!irpc) idx = sb_skip_comma (idx, in); - else + else if (! in_quotes) idx = sb_skip_white (idx, in); } } - hash_die (h); + htab_delete (h); + out1: + sb_kill (&f.actual); + sb_kill (&f.def); + sb_kill (&f.name); + out2: sb_kill (&sub); - return NULL; + return err; }