projects
/
b43-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssb-sprom: Put SPROM data in a master table and add Rev. 8
[b43-tools.git]
/
assembler
/
scanner.l
diff --git
a/assembler/scanner.l
b/assembler/scanner.l
index 1fa83d564b7e95183da999039edecb5b15ba954c..b135552a31a389259fc25c3c6b669c93f613c4f1 100644
(file)
--- a/
assembler/scanner.l
+++ b/
assembler/scanner.l
@@
-48,10
+48,10
@@
NEWLINE ((\r)|(\n)|(\r\n))
{WS}+ { update_lineinfo(); /* whitespace */ }
{NEWLINE} { cur_lineinfo.lineno++; update_lineinfo(); }
{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; }
^{WS}*"%"{WS}*arch { update_lineinfo(); return ASM_ARCH; }
^{WS}*"%"{WS}*start { update_lineinfo(); return ASM_START; }
+"%"{WS}*assert { update_lineinfo(); return ASM_ASSERT; }
^{WS}*\.text{WS}*$ { update_lineinfo(); return SECTION_TEXT; }
^{WS}*\.initvals/\({IDENTIFIER}\) { update_lineinfo(); return SECTION_IVALS; }
^{WS}*\.text{WS}*$ { update_lineinfo(); return SECTION_TEXT; }
^{WS}*\.initvals/\({IDENTIFIER}\) { update_lineinfo(); return SECTION_IVALS; }
@@
-62,11
+62,16
@@
off/[0-6] { update_lineinfo(); return OFFR; }
lr/[0-3] { update_lineinfo(); return LR; }
, { update_lineinfo(); return COMMA; }
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; }
\) { update_lineinfo(); return PAREN_CLOSE; }
\[ { update_lineinfo(); return BRACK_OPEN; }
\] { update_lineinfo(); return BRACK_CLOSE; }
\( { update_lineinfo(); return PAREN_OPEN; }
\) { update_lineinfo(); return PAREN_CLOSE; }
+== { update_lineinfo(); return EQUAL; }
+!= { update_lineinfo(); return NOT_EQUAL; }
+\|\| { update_lineinfo(); return LOGICAL_OR; }
+\&\& { update_lineinfo(); return LOGICAL_AND; }
\+ { update_lineinfo(); return PLUS; }
\- { update_lineinfo(); return MINUS; }
\* { update_lineinfo(); return MULTIPLY; }
\+ { update_lineinfo(); return PLUS; }
\- { update_lineinfo(); return MINUS; }
\* { update_lineinfo(); return MULTIPLY; }
@@
-137,6
+142,7
@@
phy { update_lineinfo(); return IVAL_PHY; }
radio { update_lineinfo(); return IVAL_RADIO; }
shm16 { update_lineinfo(); return IVAL_SHM16; }
shm32 { update_lineinfo(); return IVAL_SHM32; }
radio { update_lineinfo(); return IVAL_RADIO; }
shm16 { update_lineinfo(); return IVAL_SHM16; }
shm32 { update_lineinfo(); return IVAL_SHM32; }
+tram { update_lineinfo(); return IVAL_TRAM; }
@[0-9a-fA-F]{3,3} { update_lineinfo(); return RAW_CODE; }
@[0-9a-fA-F]{3,3} { update_lineinfo(); return RAW_CODE; }
@@
-149,6
+155,7
@@
shm32 { update_lineinfo(); return IVAL_SHM32; }
%%
struct lineinfo cur_lineinfo;
%%
struct lineinfo cur_lineinfo;
+//FIXME The linenumber sometimes is wrong.
static void interpret_cppinfo(const char *str)
{
static void interpret_cppinfo(const char *str)
{
@@
-175,7
+182,7
@@
static void interpret_cppinfo(const char *str)
memset(tmp, 0, sizeof(tmp));
memcpy(tmp, str, min(sizeof(tmp) - 1,
(int)(found - str)));
memset(tmp, 0, sizeof(tmp));
memcpy(tmp, str, min(sizeof(tmp) - 1,
(int)(found - str)));
- cur_lineinfo.lineno = strtoul(tmp, NULL, 10);
+ cur_lineinfo.lineno = strtoul(tmp, NULL, 10)
- 1
;
str = found;
str++;
str = found;
str++;