b43-asm: Terminate instructions with ; instead of |

This removes support for assembly comments with ";"
Use C/C++ style comments, please
/* comment */
// comment
The preprocessor will take care of them.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

diff --git a/assembler/b43-asm b/assembler/b43-asm
index f910a6b0f3ec846c3ca08d82c3f1b503e3723e99..2fbccce35f9e1d1447af5fee8232cbd51587e9b0 100755 (executable)
--- a/assembler/b43-asm
+++ b/assembler/b43-asm
@@ -48,4 +48,4 @@ if [ "$infile" != "-" ]; then
        fi
 fi
 
-$CPP -traditional-cpp "$infile" | $B43_ASM "-" "$outfile" $@
+$CPP -x c++ -traditional-cpp "$infile" | $B43_ASM "-" "$outfile" $@

diff --git a/assembler/parser.y b/assembler/parser.y
index c589195369c2ce536afecff77a8a460031238326..5e256abb45506d5d57dea26385af676e9c4eddc5 100644 (file)
--- a/assembler/parser.y
+++ b/assembler/parser.y
@@ -38,7 +38,7 @@ extern struct initvals_sect *cur_initvals_sect;
 
 %token SECTION_TEXT SECTION_IVALS
 
-%token ASM_ARCH ASM_START SPR GPR OFFR LR COMMA BRACK_OPEN BRACK_CLOSE PAREN_OPEN PAREN_CLOSE HEXNUM DECNUM ARCH_NEWWORLD ARCH_OLDWORLD LABEL IDENT LABELREF
+%token ASM_ARCH ASM_START SPR GPR OFFR LR COMMA SEMICOLON BRACK_OPEN BRACK_CLOSE PAREN_OPEN PAREN_CLOSE HEXNUM DECNUM ARCH_NEWWORLD ARCH_OLDWORLD LABEL IDENT LABELREF
 
 %token PLUS MINUS MULTIPLY DIVIDE BITW_OR BITW_AND BITW_XOR BITW_NOT LEFTSHIFT RIGHTSHIFT
 
@@ -72,9 +72,9 @@ line  : line_terminator {
          }
        ;
 
-/* Allow terminating lines with the "|" char */
+/* Allow terminating lines with the ";" char */
 line_terminator : /* Nothing */
-               | BITW_OR line_terminator
+               | SEMICOLON line_terminator
                ;
 
 section_switch : SECTION_TEXT {

diff --git a/assembler/scanner.l b/assembler/scanner.l
index 1fa83d564b7e95183da999039edecb5b15ba954c..bb866a93d1c7d302959d1e3617274dfb8a574414 100644 (file)
--- a/assembler/scanner.l
+++ b/assembler/scanner.l
@@ -48,7 +48,6 @@ NEWLINE               ((\r)|(\n)|(\r\n))
 
 {WS}+                  { update_lineinfo(); /* whitespace */ }
 {NEWLINE}              { cur_lineinfo.lineno++; update_lineinfo(); }
-;.*$                   { update_lineinfo(); /* comment */ }
 
 ^{WS}*"%"{WS}*arch     { update_lineinfo(); return ASM_ARCH; }
 ^{WS}*"%"{WS}*start    { update_lineinfo(); return ASM_START; }
@@ -62,6 +61,7 @@ off/[0-6]             { update_lineinfo(); return OFFR; }
 lr/[0-3]               { update_lineinfo(); return LR; }
 
 ,                      { update_lineinfo(); return COMMA; }
+;                      { update_lineinfo(); return SEMICOLON; }
 \[                     { update_lineinfo(); return BRACK_OPEN; }
 \]                     { update_lineinfo(); return BRACK_CLOSE; }
 \(                     { update_lineinfo(); return PAREN_OPEN; }