* gas-bison.y, gas-token.re: Support multiple instructions on a single line

with ';' separator.  List output with this is currently broken however.

* gas-semi.asm: New test for this.

svn path=/trunk/yasm/; revision=1291

diff --git a/modules/parsers/gas/gas-bison.y b/modules/parsers/gas/gas-bison.y
index 3a883335d093a3819ffd871e64becaedae7ffdf6..e81ae258138b894bbff66dd9d5df71ceff69a097 100644 (file)
--- a/modules/parsers/gas/gas-bison.y
+++ b/modules/parsers/gas/gas-bison.y
@@ -112,7 +112,7 @@ static void gas_parser_directive
 %token DIR_TFLOAT DIR_TYPE DIR_QUAD DIR_ULEB128 DIR_VALUE DIR_WEAK DIR_WORD
 %token DIR_ZERO
 
-%type <bc> line lineexp instr
+%type <bc> lineexp instr
 
 %type <str_val> expr_id label_id
 %type <ea> memaddr
@@ -130,28 +130,35 @@ static void gas_parser_directive
 %%
 input: /* empty */
     | input line    {
-       parser_gas->temp_bc =
-           yasm_section_bcs_append(parser_gas->cur_section, $2);
-       if (parser_gas->temp_bc)
-           parser_gas->prev_bc = parser_gas->temp_bc;
        if (parser_gas->save_input)
            yasm_linemap_add_source(parser_gas->linemap,
-               parser_gas->temp_bc,
+               parser_gas->prev_bc,
                parser_gas->save_line[parser_gas->save_last ^ 1]);
        yasm_linemap_goto_next(parser_gas->linemap);
     }
 ;
 
-line: '\n'             { $$ = (yasm_bytecode *)NULL; }
-    | lineexp '\n'
+line: '\n'
+    | linebcs '\n'
     | error '\n'       {
        yasm__error(cur_line,
                    N_("label or instruction expected at start of line"));
-       $$ = (yasm_bytecode *)NULL;
        yyerrok;
     }
 ;
 
+linebcs: linebc
+    | linebc ';' linebcs
+;
+
+linebc: lineexp {
+       parser_gas->temp_bc =
+           yasm_section_bcs_append(parser_gas->cur_section, $1);
+       if (parser_gas->temp_bc)
+           parser_gas->prev_bc = parser_gas->temp_bc;
+    }
+;
+
 lineexp: instr
     | label_id ':'             {
        $$ = (yasm_bytecode *)NULL;

diff --git a/modules/parsers/gas/gas-token.re b/modules/parsers/gas/gas-token.re
index 9692559e7c6ffb8be1ce156e89b0241aaecb303c..876b95ca37293f5ce763c6fddb7c0eb582719b5c 100644 (file)
--- a/modules/parsers/gas/gas-token.re
+++ b/modules/parsers/gas/gas-token.re
@@ -250,7 +250,7 @@ scan:
        ">>"                    { RETURN(RIGHT_OP); }
        "<"                     { RETURN(LEFT_OP); }
        ">"                     { RETURN(RIGHT_OP); }
-       [-+|^!*&/~$():@=,]      { RETURN(s->tok[0]); }
+       [-+|^!*&/~$():;@=,]     { RETURN(s->tok[0]); }
 
        /* arch-independent directives */
        '.2byte'        { RETURN(DIR_2BYTE); }

diff --git a/modules/parsers/gas/tests/Makefile.inc b/modules/parsers/gas/tests/Makefile.inc
index 30ca0c2b8a971647c332dad5ee78fc5a82a660f4..2a54bcc7145e7a32f405c303cfa6bf797e628f04 100644 (file)
--- a/modules/parsers/gas/tests/Makefile.inc
+++ b/modules/parsers/gas/tests/Makefile.inc
@@ -12,6 +12,9 @@ EXTRA_DIST += modules/parsers/gas/tests/datavis.hex
 EXTRA_DIST += modules/parsers/gas/tests/datavis2.asm
 EXTRA_DIST += modules/parsers/gas/tests/datavis2.errwarn
 EXTRA_DIST += modules/parsers/gas/tests/datavis2.hex
+EXTRA_DIST += modules/parsers/gas/tests/gas-semi.asm
+EXTRA_DIST += modules/parsers/gas/tests/gas-semi.errwarn
+EXTRA_DIST += modules/parsers/gas/tests/gas-semi.hex
 EXTRA_DIST += modules/parsers/gas/tests/jmpcall.asm
 EXTRA_DIST += modules/parsers/gas/tests/jmpcall.errwarn
 EXTRA_DIST += modules/parsers/gas/tests/jmpcall.hex

diff --git a/modules/parsers/gas/tests/gas-semi.asm b/modules/parsers/gas/tests/gas-semi.asm
new file mode 100644 (file)
index 0000000..49c9a21
--- /dev/null
+++ b/modules/parsers/gas/tests/gas-semi.asm
@@ -0,0 +1,5 @@
+pushl %eax;ret
+
+x: pushl %eax; ret
+y: pushl %eax; z: ret
+

diff --git a/modules/parsers/gas/tests/gas-semi.errwarn b/modules/parsers/gas/tests/gas-semi.errwarn
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modules/parsers/gas/tests/gas-semi.hex b/modules/parsers/gas/tests/gas-semi.hex
new file mode 100644 (file)
index 0000000..3a0857f
--- /dev/null
+++ b/modules/parsers/gas/tests/gas-semi.hex
@@ -0,0 +1,408 @@
+7f 
+45 
+4c 
+46 
+01 
+01 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+03 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+d0 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+34 
+00 
+00 
+00 
+00 
+00 
+28 
+00 
+05 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+50 
+c3 
+50 
+c3 
+50 
+c3 
+00 
+00 
+00 
+2e 
+74 
+65 
+78 
+74 
+00 
+2e 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+2e 
+73 
+79 
+6d 
+74 
+61 
+62 
+00 
+2e 
+73 
+68 
+73 
+74 
+72 
+74 
+61 
+62 
+00 
+00 
+00 
+00 
+00 
+2d 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+f1 
+ff 
+00 
+00 
+00 
+00 
+05 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+03 
+00 
+04 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+17 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+48 
+00 
+00 
+00 
+21 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+07 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+6c 
+00 
+00 
+00 
+03 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+0f 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+70 
+00 
+00 
+00 
+60 
+00 
+00 
+00 
+02 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+04 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+01 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+40 
+00 
+00 
+00 
+06 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+00 
+10 
+00 
+00 
+00 
+00 
+00 
+00 
+00