2003-08-01 Jason Eckhardt <[email protected]>

        * config/tc-i860.c: Remove SYNTAX_SVR4 macro and occurrences.
        (target_intel_syntax): Declare variable.
        (OPTION_INTEL_SYNTAX): Declare macro.
        (md_longopts): Add option -mintel-syntax.
        (md_parse_option): Set target_intel_syntax.
        (md_show_usage): Add -mintel-syntax usage.
        (md_begin): Set reg_prefix based on target_intel_syntax.
        (i860_process_insn): Skip register prefix only if there is one.
        Parse relocatable expressions in either Intel or AT&T syntax based
        on target_intel_syntax instead of the SYNTAX_SVR4 macro.
        * doc/c-i860.texi: Document -mintel-syntax option and give blurb
        about the differences in syntax.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 136a4ee3165b38873bd2e7b18af73a5a7cbf7bc0..908810a0052a98f015015057e594d43a993f225f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,18 @@
+2003-08-01  Jason Eckhardt  <[email protected]>
+
+        * config/tc-i860.c: Remove SYNTAX_SVR4 macro and occurrences.
+        (target_intel_syntax): Declare variable.
+        (OPTION_INTEL_SYNTAX): Declare macro.
+        (md_longopts): Add option -mintel-syntax.
+        (md_parse_option): Set target_intel_syntax.
+        (md_show_usage): Add -mintel-syntax usage.
+        (md_begin): Set reg_prefix based on target_intel_syntax.
+        (i860_process_insn): Skip register prefix only if there is one.
+        Parse relocatable expressions in either Intel or AT&T syntax based
+        on target_intel_syntax instead of the SYNTAX_SVR4 macro.
+        * doc/c-i860.texi: Document -mintel-syntax option and give blurb
+        about the differences in syntax.
+

 2003-08-01  Dmitry Diky  <[email protected]>
 
        * config/tc-msp430.c (msp430_srcoperand): Extend 'push' bug workaround
 2003-08-01  Dmitry Diky  <[email protected]>
 
        * config/tc-msp430.c (msp430_srcoperand): Extend 'push' bug workaround

diff --git a/gas/config/tc-i860.c b/gas/config/tc-i860.c
index d872ce6276cdee9ae46f120676e874e9ef7eb7eb..2488584f18e736ff260fff23088e9e0ac794f9aa 100644 (file)
--- a/gas/config/tc-i860.c
+++ b/gas/config/tc-i860.c
@@ -29,11 +29,6 @@
 #include "opcode/i860.h"
 #include "elf/i860.h"
 
 #include "opcode/i860.h"
 #include "elf/i860.h"
 

-/* Defined by default since this is primarily a SVR4/860 assembler.
-   However, I'm trying to leave the door open for Intel syntax. Of course,
-   if full support for anything other than SVR4 is done, then we should
-   select this based on a command-line flag.  */
-#define SYNTAX_SVR4

 
 /* The opcode hash table.  */
 static struct hash_control *op_hash = NULL;
 
 /* The opcode hash table.  */
 static struct hash_control *op_hash = NULL;


@@ -54,12 +49,8 @@ const char EXP_CHARS[] = "eE";
    As in 0f12.456 or 0d1.2345e12.  */
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
    As in 0f12.456 or 0d1.2345e12.  */
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 

-/* Register prefix.  */
-#ifdef SYNTAX_SVR4
-static const char reg_prefix = '%';
-#else
-static const char reg_prefix = 0;
-#endif
+/* Register prefix (depends on syntax).  */
+static char reg_prefix;

 
 #define MAX_FIXUPS 2
 
 
 #define MAX_FIXUPS 2
 


@@ -91,6 +82,10 @@ static int target_warn_expand = 0;
 /* If true, then XP support is enabled.  */
 static int target_xp = 0;
 
 /* If true, then XP support is enabled.  */
 static int target_xp = 0;
 

+/* If true, then Intel syntax is enabled (default to AT&T/SVR4 syntax).  */
+static int target_intel_syntax = 0;
+
+

 /* Prototypes.  */
 static void i860_process_insn (char *);
 static void s_dual (int);
 /* Prototypes.  */
 static void i860_process_insn (char *);
 static void s_dual (int);


@@ -206,6 +201,9 @@ md_begin (void)
 
   if (lose)
     as_fatal (_("Defective assembler.  No assembly attempted."));
 
   if (lose)
     as_fatal (_("Defective assembler.  No assembly attempted."));

+
+  /* Set the register prefix for either Intel or AT&T/SVR4 syntax.  */
+  reg_prefix = target_intel_syntax ? 0 : '%';

 }
 
 /* This is the core of the machine-dependent assembler.  STR points to a
 }
 
 /* This is the core of the machine-dependent assembler.  STR points to a


@@ -524,7 +522,7 @@ i860_process_insn (char *str)
              /* Check for register prefix if necessary.  */
              if (reg_prefix && *s != reg_prefix)
                goto error;
              /* Check for register prefix if necessary.  */
              if (reg_prefix && *s != reg_prefix)
                goto error;

-             else
+             else if (reg_prefix)

                s++;
 
              switch (*s)
                s++;
 
              switch (*s)


@@ -596,7 +594,7 @@ i860_process_insn (char *str)
              /* Check for register prefix if necessary.  */
              if (reg_prefix && *s != reg_prefix)
                goto error;
              /* Check for register prefix if necessary.  */
              if (reg_prefix && *s != reg_prefix)
                goto error;

-             else
+             else if (reg_prefix)

                s++;
 
              if (*s++ == 'f' && ISDIGIT (*s))
                s++;
 
              if (*s++ == 'f' && ISDIGIT (*s))


@@ -645,7 +643,7 @@ i860_process_insn (char *str)
              /* Check for register prefix if necessary.  */
              if (reg_prefix && *s != reg_prefix)
                goto error;
              /* Check for register prefix if necessary.  */
              if (reg_prefix && *s != reg_prefix)
                goto error;

-             else
+             else if (reg_prefix)

                s++;
 
              if (strncmp (s, "fir", 3) == 0)
                s++;
 
              if (strncmp (s, "fir", 3) == 0)


@@ -804,92 +802,97 @@ i860_process_insn (char *str)
                 SVR4 syntax. The Intel syntax is "ha%immediate"
                 whereas SVR4 syntax is "[immediate]@ha".  */
            immediate:
                 SVR4 syntax. The Intel syntax is "ha%immediate"
                 whereas SVR4 syntax is "[immediate]@ha".  */
            immediate:

-#ifdef SYNTAX_SVR4
-             if (*s == ' ')
-               s++;
-
-             /* Note that if i860_get_expression() fails, we will still
-                have created U entries in the symbol table for the
-                'symbols' in the input string.  Try not to create U
-                symbols for registers, etc.  */
-             if (! i860_get_expression (s))
-               s = expr_end;
-             else
-               goto error;
-
-             if (strncmp (s, "@ha", 3) == 0)
-               {
-                 the_insn.fi[fc].fup |= OP_SEL_HA;
-                 s += 3;
-               }
-             else if (strncmp (s, "@h", 2) == 0)
+             if (target_intel_syntax == 0)

                {
                {

-                 the_insn.fi[fc].fup |= OP_SEL_H;
-                 s += 2;
-               }
-             else if (strncmp (s, "@l", 2) == 0)
-               {
-                 the_insn.fi[fc].fup |= OP_SEL_L;
-                 s += 2;
-               }
-             else if (strncmp (s, "@gotoff", 7) == 0
-                      || strncmp (s, "@GOTOFF", 7) == 0)
-               {
-                 as_bad (_("Assembler does not yet support PIC"));
-                 the_insn.fi[fc].fup |= OP_SEL_GOTOFF;
-                 s += 7;
-               }
-             else if (strncmp (s, "@got", 4) == 0
-                      || strncmp (s, "@GOT", 4) == 0)
-               {
-                 as_bad (_("Assembler does not yet support PIC"));
-                 the_insn.fi[fc].fup |= OP_SEL_GOT;
-                 s += 4;
-               }
-             else if (strncmp (s, "@plt", 4) == 0
-                      || strncmp (s, "@PLT", 4) == 0)
-               {
-                 as_bad (_("Assembler does not yet support PIC"));
-                 the_insn.fi[fc].fup |= OP_SEL_PLT;
-                 s += 4;
-               }
+                 /* AT&T/SVR4 syntax.  */
+                 if (*s == ' ')
+                   s++;
+
+                 /* Note that if i860_get_expression() fails, we will still
+                    have created U entries in the symbol table for the
+                    'symbols' in the input string.  Try not to create U
+                    symbols for registers, etc.  */
+                 if (! i860_get_expression (s))
+                   s = expr_end;
+                 else
+                   goto error;
+
+                 if (strncmp (s, "@ha", 3) == 0)
+                   {
+                     the_insn.fi[fc].fup |= OP_SEL_HA;
+                     s += 3;
+                   }
+                 else if (strncmp (s, "@h", 2) == 0)
+                   {
+                     the_insn.fi[fc].fup |= OP_SEL_H;
+                     s += 2;
+                   }
+                 else if (strncmp (s, "@l", 2) == 0)
+                   {
+                     the_insn.fi[fc].fup |= OP_SEL_L;
+                     s += 2;
+                   }
+                 else if (strncmp (s, "@gotoff", 7) == 0
+                          || strncmp (s, "@GOTOFF", 7) == 0)
+                   {
+                     as_bad (_("Assembler does not yet support PIC"));
+                     the_insn.fi[fc].fup |= OP_SEL_GOTOFF;
+                     s += 7;
+                   }
+                 else if (strncmp (s, "@got", 4) == 0
+                          || strncmp (s, "@GOT", 4) == 0)
+                   {
+                     as_bad (_("Assembler does not yet support PIC"));
+                     the_insn.fi[fc].fup |= OP_SEL_GOT;
+                     s += 4;
+                   }
+                 else if (strncmp (s, "@plt", 4) == 0
+                          || strncmp (s, "@PLT", 4) == 0)
+                   {
+                     as_bad (_("Assembler does not yet support PIC"));
+                     the_insn.fi[fc].fup |= OP_SEL_PLT;
+                     s += 4;
+                   }

 
 

-             the_insn.expand = insn->expand;
-              fc++;
+                 the_insn.expand = insn->expand;
+                  fc++;

               
               

-             continue;
-#else /* ! SYNTAX_SVR4 */
-             if (*s == ' ')
-               s++;
-             if (strncmp (s, "ha%", 3) == 0)
-               {
-                 the_insn.fi[fc].fup |= OP_SEL_HA;
-                 s += 3;
-               }
-             else if (strncmp (s, "h%", 2) == 0)
-               {
-                 the_insn.fi[fc].fup |= OP_SEL_H;
-                 s += 2;
+                 continue;

                }
                }

-             else if (strncmp (s, "l%", 2) == 0)
+             else

                {
                {

-                 the_insn.fi[fc].fup |= OP_SEL_L;
-                 s += 2;
+                 /* Intel syntax.  */
+                 if (*s == ' ')
+                   s++;
+                 if (strncmp (s, "ha%", 3) == 0)
+                   {
+                     the_insn.fi[fc].fup |= OP_SEL_HA;
+                     s += 3;
+                   }
+                 else if (strncmp (s, "h%", 2) == 0)
+                   {
+                     the_insn.fi[fc].fup |= OP_SEL_H;
+                     s += 2;
+                   }
+                 else if (strncmp (s, "l%", 2) == 0)
+                   {
+                     the_insn.fi[fc].fup |= OP_SEL_L;
+                     s += 2;
+                   }
+                 the_insn.expand = insn->expand;
+
+                 /* Note that if i860_get_expression() fails, we will still
+                    have created U entries in the symbol table for the
+                    'symbols' in the input string.  Try not to create U
+                    symbols for registers, etc.  */
+                 if (! i860_get_expression (s))
+                   s = expr_end;
+                 else
+                   goto error;
+
+                  fc++;
+                 continue;

                }
                }

-             the_insn.expand = insn->expand;
-
-             /* Note that if i860_get_expression() fails, we will still
-                have created U entries in the symbol table for the
-                'symbols' in the input string.  Try not to create U
-                symbols for registers, etc.  */
-             if (! i860_get_expression (s))
-               s = expr_end;
-             else
-               goto error;
-
-              fc++;
-             continue;
-#endif /* SYNTAX_SVR4 */

              break;
 
            default:
              break;
 
            default:


@@ -1060,12 +1063,14 @@ const char *md_shortopts = "";
 #define OPTION_EL              (OPTION_MD_BASE + 1)
 #define OPTION_WARN_EXPAND     (OPTION_MD_BASE + 2)
 #define OPTION_XP              (OPTION_MD_BASE + 3)
 #define OPTION_EL              (OPTION_MD_BASE + 1)
 #define OPTION_WARN_EXPAND     (OPTION_MD_BASE + 2)
 #define OPTION_XP              (OPTION_MD_BASE + 3)

+#define OPTION_INTEL_SYNTAX    (OPTION_MD_BASE + 4)

 
 struct option md_longopts[] = {
   { "EB",          no_argument, NULL, OPTION_EB },
   { "EL",          no_argument, NULL, OPTION_EL },
   { "mwarn-expand", no_argument, NULL, OPTION_WARN_EXPAND },
   { "mxp",         no_argument, NULL, OPTION_XP },
 
 struct option md_longopts[] = {
   { "EB",          no_argument, NULL, OPTION_EB },
   { "EL",          no_argument, NULL, OPTION_EL },
   { "mwarn-expand", no_argument, NULL, OPTION_WARN_EXPAND },
   { "mxp",         no_argument, NULL, OPTION_XP },

+  { "mintel-syntax",no_argument, NULL, OPTION_INTEL_SYNTAX },

   { NULL,          no_argument, NULL, 0 }
 };
 size_t md_longopts_size = sizeof (md_longopts);
   { NULL,          no_argument, NULL, 0 }
 };
 size_t md_longopts_size = sizeof (md_longopts);


@@ -1091,6 +1096,10 @@ md_parse_option (int c, char *arg ATTRIBUTE_UNUSED)
       target_xp = 1;
       break;
 
       target_xp = 1;
       break;
 

+    case OPTION_INTEL_SYNTAX:
+      target_intel_syntax = 1;
+      break;
+

 #ifdef OBJ_ELF
     /* SVR4 argument compatibility (-V): print version ID.  */
     case 'V':
 #ifdef OBJ_ELF
     /* SVR4 argument compatibility (-V): print version ID.  */
     case 'V':


@@ -1117,7 +1126,8 @@ md_show_usage (FILE *stream)
   -EL                    generate code for little endian mode (default)\n\
   -EB                    generate code for big endian mode\n\
   -mwarn-expand                  warn if pseudo operations are expanded\n\
   -EL                    generate code for little endian mode (default)\n\
   -EB                    generate code for big endian mode\n\
   -mwarn-expand                  warn if pseudo operations are expanded\n\

-  -mxp                   enable i860XP support (disabled by default)\n"));
+  -mxp                   enable i860XP support (disabled by default)\n\
+  -mintel-syntax         enable Intel syntax (default to AT&T/SVR4)\n"));

 #ifdef OBJ_ELF
   /* SVR4 compatibility flags.  */
   fprintf (stream, _("\
 #ifdef OBJ_ELF
   /* SVR4 compatibility flags.  */
   fprintf (stream, _("\

diff --git a/gas/doc/c-i860.texi b/gas/doc/c-i860.texi
index 01c89e7ca81fc6233529a19581c32ccec0a9d1ad..9f868c975a910fd99ecf231cdeb8a2eac1a7be12 100644 (file)
--- a/gas/doc/c-i860.texi
+++ b/gas/doc/c-i860.texi
@@ -13,10 +13,7 @@
 
 @ignore
 @c FIXME: This is basically a stub for i860. There is tons more information
 
 @ignore
 @c FIXME: This is basically a stub for i860. There is tons more information

-that I will add later ([email protected]). The assembler is still being
-written. The i860 assembler that existed previously was never finished
-and doesn't even build. Further, its not BFD_ASSEMBLER and it doesn't
-do ELF (it doesn't do anything, but you get the point).
+that I will add later ([email protected]).

 @end ignore
 
 @cindex i860 support
 @end ignore
 
 @cindex i860 support


@@ -36,6 +33,13 @@ support SVR4 PIC (i.e., @code{@@GOT, @@GOTOFF, @@PLT}).
 Like the SVR4/860 assembler, the output object format is ELF32. Currently,
 this is the only supported object format. If there is sufficient interest,
 other formats such as COFF may be implemented.
 Like the SVR4/860 assembler, the output object format is ELF32. Currently,
 this is the only supported object format. If there is sufficient interest,
 other formats such as COFF may be implemented.

+
+Both the Intel and AT&T/SVR4 syntaxes are supported, with the latter
+being the default.  One difference is that AT&T syntax requires the '%'
+prefix on register names while Intel syntax does not.  Another difference
+is in the specification of relocatable expressions.  The Intel syntax
+is @code{ha%expression} whereas the SVR4 syntax is @code{[expression]@@ha}
+(and similarly for the "l" and "h" selectors).

 @node Options-i860
 @section i860 Command-line Options
 @subsection SVR4 compatibility options 
 @node Options-i860
 @section i860 Command-line Options
 @subsection SVR4 compatibility options 


@@ -66,6 +70,9 @@ where @code{gcc} may emit these pseudo-instructions.
 Enable support for the i860XP instructions and control registers.  By default,
 this option is disabled so that only the base instruction set (i.e., i860XR)
 is supported.
 Enable support for the i860XP instructions and control registers.  By default,
 this option is disabled so that only the base instruction set (i.e., i860XR)
 is supported.

+@item -mintel-syntax
+The i860 assembler defaults to AT&T/SVR4 syntax.  This option enables the
+Intel syntax.

 @end table
 
 @node Directives-i860
 @end table
 
 @node Directives-i860