assembler/disassembler: Fix indirect mem addressing for r15

[b43-tools.git] / assembler / scanner.l

diff --git a/assembler/scanner.l b/assembler/scanner.l
index 5013d0e94e4e0a430fcab9f357624686cd2a7888..80b204f6df33d3af0398838217c51e8fc29b9e19 100644 (file)
--- a/assembler/scanner.l
+++ b/assembler/scanner.l
@@ -56,7 +56,7 @@ NEWLINE               ((\r)|(\n)|(\r\n))
 ^{WS}*\.text{WS}*$                     { update_lineinfo(); return SECTION_TEXT; }
 ^{WS}*\.initvals/\({IDENTIFIER}\)      { update_lineinfo(); return SECTION_IVALS; }
 
-spr[0-9a-fA-F]{3,3}    { update_lineinfo(); return SPR; }
+spr[0-9a-fA-F]{1,4}    { update_lineinfo(); return SPR; }
 r/([0-9]|([1-5][0-9])|(6[0-3]))        { update_lineinfo(); return GPR; }
 off/[0-6]              { update_lineinfo(); return OFFR; }
 lr/[0-3]               { update_lineinfo(); return LR; }
@@ -142,8 +142,9 @@ phy                 { update_lineinfo(); return IVAL_PHY; }
 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]{1,4}      { update_lineinfo(); return RAW_CODE; }
 
 0x[0-9a-fA-F]+         { update_lineinfo(); return HEXNUM; }
 -?[0-9]+               { update_lineinfo(); return DECNUM; }