x86/Intel: drop pointless special casing of LxS

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

diff --git a/gas/macro.h b/gas/macro.h
index b9dc2d031eb2669a35833357d582e82da5c9d1f5..cefdd1f7c9f9fd211a5b6c1a78b9247cb0058fa0 100644 (file)
--- a/gas/macro.h
+++ b/gas/macro.h
@@ -1,6 +1,5 @@
-/* macro.h - header file for macro support for gas and gasp
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000
-   Free Software Foundation, Inc.
+/* macro.h - header file for macro support for gas
+   Copyright (C) 1994-2019 Free Software Foundation, Inc.

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


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

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

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


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

-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 #ifndef MACRO_H
 
 #define MACRO_H
 
 
 #ifndef MACRO_H
 
 #define MACRO_H
 

-#include "ansidecl.h"
-#include "sb.h"
-

 /* Structures used to store macros.
 
    Each macro knows its name and included text.  It gets built with a
    list of formal arguments, and also keeps a hash table which points
    into the list to speed up formal search.  Each formal knows its
    name and its default value.  Each time the macro is expanded, the
 /* Structures used to store macros.
 
    Each macro knows its name and included text.  It gets built with a
    list of formal arguments, and also keeps a hash table which points
    into the list to speed up formal search.  Each formal knows its
    name and its default value.  Each time the macro is expanded, the

-   formals get the actual values attatched to them.  */
+   formals get the actual values attached to them.  */
+
+enum formal_type
+  {
+    FORMAL_OPTIONAL,
+    FORMAL_REQUIRED,
+    FORMAL_VARARG
+  };

 
 

-/* describe the formal arguments to a macro */
+/* Describe the formal arguments to a macro.  */

 
 typedef struct formal_struct {
 
 typedef struct formal_struct {

-  struct formal_struct *next;  /* next formal in list */
-  sb name;                     /* name of the formal */
-  sb def;                      /* the default value */
-  sb actual;                   /* the actual argument (changed on each expansion) */
-  int index;                   /* the index of the formal 0..formal_count-1 */
+  struct formal_struct *next;  /* Next formal in list.  */
+  sb name;                     /* Name of the formal.  */
+  sb def;                      /* The default value.  */
+  sb actual;                   /* The actual argument (changed on each expansion).  */
+  int index;                   /* The index of the formal 0..formal_count - 1.  */
+  enum formal_type type;       /* The kind of the formal.  */

 } formal_entry;
 
 /* Other values found in the index field of a formal_entry.  */
 } formal_entry;
 
 /* Other values found in the index field of a formal_entry.  */


@@ -52,13 +56,17 @@ typedef struct formal_struct {
 #define NARG_INDEX (-2)
 #define LOCAL_INDEX (-3)
 
 #define NARG_INDEX (-2)
 #define LOCAL_INDEX (-3)
 

-/* describe the macro.  */
-
-typedef struct macro_struct {
-  sb sub;                      /* substitution text.  */
-  int formal_count;            /* number of formal args.  */
-  formal_entry *formals;       /* pointer to list of formal_structs */
-  struct hash_control *formal_hash; /* hash table of formals.  */
+/* Describe the macro.  */
+
+typedef struct macro_struct
+{
+  sb sub;                              /* Substitution text.  */
+  int formal_count;                    /* Number of formal args.  */
+  formal_entry *formals;               /* Pointer to list of formal_structs.  */
+  struct hash_control *formal_hash;    /* Hash table of formals.  */
+  const char *name;                    /* Macro name.  */
+  const char *file;                            /* File the macro was defined in.  */
+  unsigned int line;                   /* Line number of definition.  */

 } macro_entry;
 
 /* Whether any macros have been defined.  */
 } macro_entry;
 
 /* Whether any macros have been defined.  */


@@ -69,19 +77,20 @@ extern int macro_defined;
 
 extern int macro_nest;
 
 
 extern int macro_nest;
 

-extern int buffer_and_nest
-  PARAMS ((const char *, const char *, sb *, int (*) PARAMS ((sb *))));
-extern void macro_init
-  PARAMS ((int alternate, int mri, int strip_at,
-          int (*) PARAMS ((const char *, int, sb *, int *))));
-extern void macro_mri_mode PARAMS ((int));
-extern const char *define_macro
-  PARAMS ((int idx, sb *in, sb *label, int (*get_line) PARAMS ((sb *)),
-          const char **namep));
-extern int check_macro PARAMS ((const char *, sb *, int, const char **,
-                               macro_entry **));
-extern void delete_macro PARAMS ((const char *));
-extern const char *expand_irp
-  PARAMS ((int, int, sb *, sb *, int (*) PARAMS ((sb *)), int));
+/* The macro hash table.  */
+
+extern struct hash_control *macro_hash;
+
+extern int buffer_and_nest (const char *, const char *, sb *,
+                           size_t (*) (sb *));
+extern void macro_init (int, int, int,
+                       size_t (*) (const char *, size_t, sb *, offsetT *));
+extern void macro_set_alternate (int);
+extern void macro_mri_mode (int);
+extern const char *define_macro (size_t, sb *, sb *, size_t (*) (sb *),
+                                const char *, unsigned int, const char **);
+extern int check_macro (const char *, sb *, const char **, macro_entry **);
+extern void delete_macro (const char *);
+extern const char *expand_irp (int, size_t, sb *, sb *, size_t (*) (sb *));

 
 #endif
 
 #endif