Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

third_party/yasm/patched-yasm/modules/parsers/gas/gas-parse.c

 /*
  * GAS-compatible parser
  *
  *  Copyright (C) 2005-2007  Peter Johnson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 10 matching lines @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-RCSID("$Id: gas-parse.c 2169 2009-01-02 20:46:57Z peter $");
+RCSID("$Id: gas-parse.c 2279 2010-01-19 07:57:43Z peter $");
 
 #include <libyasm.h>
 
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
 
 #include "modules/parsers/gas/gas-parser.h"
 
 typedef struct dir_lookup {
@@ skipping 272 matching lines @@
         while (curtok != '\n')
             get_next_token();
 
         return;
     }
 
     filename = STRING_val.contents;
     get_next_token();
 
     /* Set linemap. */
-    yasm_linemap_set(parser_gas->linemap, filename, line, 1);
+    yasm_linemap_set(parser_gas->linemap, filename, 0, line, 1);
 
     /*
         The first line marker in the file (which should be on the first line
         of the file) will give us the name of the source file. This information
         needs to be passed on to the debug format module.
     */
     if (parser_gas->seen_line_marker == 0) {
         parser_gas->seen_line_marker = 1;
 
         yasm_vps_initialize(&vps);
@@ skipping 87 matching lines @@
     parser_gas->state = NASM_FILENAME;
     get_next_token(); /* INTNUM */
     if (!expect(STRING)) {
         parser_gas->state = INITIAL;
         return;
     }
 
     filename = STRING_val.contents;
 
     /* Set linemap. */
-    yasm_linemap_set(parser_gas->linemap, filename, line, incr);
+    yasm_linemap_set(parser_gas->linemap, filename, 0, line, incr);
 
     /*
         The first line marker in the file (which should be on the first line
         of the file) will give us the name of the source file. This information
         needs to be passed on to the debug format module.
     */
     if (parser_gas->seen_line_marker == 0) {
         parser_gas->seen_line_marker = 1;
 
         yasm_vps_initialize(&vps);
@@ skipping 22 matching lines @@
                        N_("line number is negative"));
         return NULL;
     }
 
     parser_gas->dir_line = yasm_intnum_get_uint(INTNUM_val);
     yasm_intnum_destroy(INTNUM_val);
     get_next_token(); /* INTNUM */
 
     if (parser_gas->dir_fileline == 3) {
         /* Have both file and line */
-        yasm_linemap_set(parser_gas->linemap, NULL,
+        yasm_linemap_set(parser_gas->linemap, NULL, 0,
                          parser_gas->dir_line, 1);
     } else if (parser_gas->dir_fileline == 1) {
         /* Had previous file directive only */
         parser_gas->dir_fileline = 3;
-        yasm_linemap_set(parser_gas->linemap, parser_gas->dir_file,
+        yasm_linemap_set(parser_gas->linemap, parser_gas->dir_file, 0,
                          parser_gas->dir_line, 1);
     } else {
         /* Didn't see file yet */
         parser_gas->dir_fileline = 2;
     }
     return NULL;
 }
 
-/* Macro directives */
-
-static yasm_bytecode *
-dir_rept(yasm_parser_gas *parser_gas, unsigned int param)
-{
-    yasm_intnum *intn;
-    yasm_expr *e = parse_expr(parser_gas);
-
-    if (!e) {
-        yasm_error_set(YASM_ERROR_SYNTAX,
-                       N_("expression expected after `%s'"),
-                       ".rept");
-        return NULL;
-    }
-    intn = yasm_expr_get_intnum(&e, 0);
-
-    if (!intn) {
-        yasm_error_set(YASM_ERROR_NOT_ABSOLUTE,
-                       N_("rept expression not absolute"));
-    } else if (yasm_intnum_sign(intn) < 0) {
-        yasm_error_set(YASM_ERROR_VALUE,
-                       N_("rept expression is negative"));
-    } else {
-        gas_rept *rept = yasm_xmalloc(sizeof(gas_rept));
-        STAILQ_INIT(&rept->lines);
-        rept->startline = cur_line;
-        rept->numrept = yasm_intnum_get_uint(intn);
-        rept->numdone = 0;
-        rept->line = NULL;
-        rept->linepos = 0;
-        rept->ended = 0;
-        rept->oldbuf = NULL;
-        rept->oldbuflen = 0;
-        rept->oldbufpos = 0;
-        parser_gas->rept = rept;
-    }
-    return NULL;
-}
-
-static yasm_bytecode *
-dir_endr(yasm_parser_gas *parser_gas, unsigned int param)
-{
-    /* Shouldn't ever get here unless we didn't get a DIR_REPT first */
-    yasm_error_set(YASM_ERROR_SYNTAX, N_("endr without matching rept"));
-    return NULL;
-}
-
 /* Alignment directives */
 
 static yasm_bytecode *
 dir_align(yasm_parser_gas *parser_gas, unsigned int param)
 {
     yasm_expr *bound, *fill=NULL, *maxskip=NULL;
 
     bound = parse_expr(parser_gas);
     if (!bound) {
         yasm_error_set(YASM_ERROR_SYNTAX,
@@ skipping 324 matching lines @@
         char *filename = STRING_val.contents;
 
         get_next_token(); /* STRING */
         if (parser_gas->dir_fileline == 3) {
             /* Have both file and line */
             const char *old_fn;
             unsigned long old_line;
 
             yasm_linemap_lookup(parser_gas->linemap, cur_line, &old_fn,
                                 &old_line);
-            yasm_linemap_set(parser_gas->linemap, filename, old_line,
+            yasm_linemap_set(parser_gas->linemap, filename, 0, old_line,
                              1);
         } else if (parser_gas->dir_fileline == 2) {
             /* Had previous line directive only */
             parser_gas->dir_fileline = 3;
-            yasm_linemap_set(parser_gas->linemap, filename,
+            yasm_linemap_set(parser_gas->linemap, filename, 0,
                              parser_gas->dir_line, 1);
         } else {
             /* Didn't see line yet, save file */
             parser_gas->dir_fileline = 1;
             if (parser_gas->dir_file)
                 yasm_xfree(parser_gas->dir_file);
             parser_gas->dir_file = yasm__xstrdup(filename);
         }
 
         /* Pass change along to debug format */
@@ skipping 25 matching lines @@
     yasm_vps_append(&vps, vp);
     get_next_token(); /* STRING */
 
     yasm_object_directive(p_object, ".file", "gas", &vps, NULL,
                           cur_line);
 
     yasm_vps_delete(&vps);
     return NULL;
 }
 
+
+static yasm_bytecode *
+dir_intel_syntax(yasm_parser_gas *parser_gas, unsigned int param)
+{
+    parser_gas->intel_syntax = 1;
+
+    do {
+        destroy_curtok();
+        get_next_token();
+    } while (!is_eol());
+    return NULL;
+}
+
+static yasm_bytecode *
+dir_att_syntax(yasm_parser_gas *parser_gas, unsigned int param)
+{
+    parser_gas->intel_syntax = 0;
+    return NULL;
+}
+
 static yasm_bytecode *
 parse_instr(yasm_parser_gas *parser_gas)
 {
     yasm_bytecode *bc;
     char *id;
     size_t id_len;
     uintptr_t prefix;
 
+    if (parser_gas->intel_syntax) {
+        bc = parse_instr_intel(parser_gas);
+        if (bc) {
+            yasm_warn_disable(YASM_WARN_UNREC_CHAR);
+             do {
+                destroy_curtok();
+                get_next_token();
+            } while (!is_eol());
+            yasm_warn_enable(YASM_WARN_UNREC_CHAR);
+        }
+        return bc;
+    }
+
     if (curtok != ID)
         return NULL;
 
     id = ID_val;
     id_len = ID_len;
 
     /* instructions/prefixes must start with a letter */
     if (!isalpha(id[0]))
         return NULL;
 
@@ skipping 759 matching lines @@
     /* floating point data declaration directives */
     {".float",      dir_data,   4,  INITIAL},
     {".single",     dir_data,   4,  INITIAL},
     {".double",     dir_data,   8,  INITIAL},
     {".tfloat",     dir_data,   10, INITIAL},
     /* section directives */
     {".bss",        dir_bss_section,    0,  INITIAL},
     {".data",       dir_data_section,   0,  INITIAL},
     {".text",       dir_text_section,   0,  INITIAL},
     {".section",    dir_section,        0, SECTION_DIRECTIVE},
-    /* macro directives */
-    {".rept",       dir_rept,   0,  INITIAL},
-    {".endr",       dir_endr,   0,  INITIAL},
     /* empty space/fill directives */
     {".skip",       dir_skip,   0,  INITIAL},
     {".space",      dir_skip,   0,  INITIAL},
     {".fill",       dir_fill,   0,  INITIAL},
     {".zero",       dir_zero,   0,  INITIAL},
+    /* syntax directives */
+    {".intel_syntax", dir_intel_syntax, 0, INITIAL},
+    {".att_syntax",   dir_att_syntax,   0, INITIAL},    
     /* other directives */
     {".equ",        dir_equ,    0,  INITIAL},
     {".file",       dir_file,   0,  INITIAL},
     {".line",       dir_line,   0,  INITIAL},
     {".set",        dir_equ,    0,  INITIAL}
 };
 
 static void
 no_delete(void *data)
 {
@@ skipping 38 matching lines @@
         if (parser_gas->save_input)
             yasm_linemap_add_source(parser_gas->linemap,
                 temp_bc,
                 (char *)parser_gas->save_line[parser_gas->save_last ^ 1]);
         yasm_linemap_goto_next(parser_gas->linemap);
         parser_gas->dir_line++; /* keep track for .line followed by .file */
     }
 
     HAMT_destroy(parser_gas->dirs, no_delete);
 }