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

third_party/yasm/patched-yasm/modules/parsers/gas/gas-parser.h

-/* $Id: gas-parser.h 2167 2009-01-02 08:36:09Z peter $
+/* $Id: gas-parser.h 2279 2010-01-19 07:57:43Z peter $
  * GAS-compatible parser header file
  *
  *  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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 45 matching lines @@
     yasm_floatnum *flt;
     yasm_bytecode *bc;
     uintptr_t arch_data;
     struct {
         char *contents;
         size_t len;
     } str;
 } yystype;
 #define YYSTYPE yystype
 
-typedef struct gas_rept_line {
-    STAILQ_ENTRY(gas_rept_line) link;
-    YYCTYPE *data;              /* line characters */
-    size_t len;                 /* length of data */
-} gas_rept_line;
-
-typedef struct gas_rept {
-    STAILQ_HEAD(reptlinelist, gas_rept_line) lines;     /* repeated lines */
-    unsigned long startline;    /* line number of rept directive */
-    unsigned long numrept;      /* number of repititions to generate */
-    unsigned long numdone;      /* number of repititions executed so far */
-    /*@null@*/ gas_rept_line *line;     /* next line to repeat */
-    size_t linepos;             /* position to start pulling chars from line */
-    int ended;                  /* seen endr directive yet? */
-
-    YYCTYPE *oldbuf;            /* saved previous fill buffer */
-    size_t oldbuflen;           /* previous fill buffer length */
-    size_t oldbufpos;           /* position in previous fill buffer */
-} gas_rept;
-
 enum gas_parser_state {
     INITIAL,
     COMMENT,
     SECTION_DIRECTIVE,
     NASM_FILENAME
 };
 
 typedef struct yasm_parser_gas {
     /*@only@*/ yasm_object *object;
 
@@ skipping 30 matching lines @@
 
     int token;          /* enum tokentype or any character */
     yystype tokval;
     char tokch;         /* first character of token */
 
     /* one token of lookahead; used sparingly */
     int peek_token;     /* NONE if none */
     yystype peek_tokval;
     char peek_tokch;
 
-    /*@null@*/ gas_rept *rept;
-
     /* Index of local labels; what's stored here is the /next/ index,
      * so these are all 0 at start.
      */
     unsigned long local[10];
 
     /* Parser-handled directives HAMT lookup */
     HAMT *dirs;
 
+    int intel_syntax;
+
     int is_nasm_preproc;
     int is_cpp_preproc;
 } yasm_parser_gas;
 
 /* shorter access names to commonly used parser_gas fields */
 #define p_object        (parser_gas->object)
 #define p_symtab        (parser_gas->object->symtab)
 #define cursect         (parser_gas->object->cur_section)
 #define curtok          (parser_gas->token)
 #define curval          (parser_gas->tokval)
@@ skipping 10 matching lines @@
 #define LABEL_val               (curval.str.contents)
 #define LABEL_len               (curval.str.len)
 
 #define cur_line        (yasm_linemap_get_current(parser_gas->linemap))
 
 #define p_expr_new(l,o,r)       yasm_expr_create(o,l,r,cur_line)
 #define p_expr_new_tree(l,o,r)  yasm_expr_create_tree(l,o,r,cur_line)
 #define p_expr_new_branch(o,r)  yasm_expr_create_branch(o,r,cur_line)
 #define p_expr_new_ident(r)     yasm_expr_create_ident(r,cur_line)
 
+yasm_bytecode *parse_instr_intel(yasm_parser_gas *parser_gas);
+
 void gas_parser_parse(yasm_parser_gas *parser_gas);
 void gas_parser_cleanup(yasm_parser_gas *parser_gas);
 int gas_parser_lex(YYSTYPE *lvalp, yasm_parser_gas *parser_gas);
 
 #endif