X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fscanner.l;h=80b204f6df33d3af0398838217c51e8fc29b9e19;hb=24bd77160095f5cebc08260bdb58eadd1dac3e4f;hp=b135552a31a389259fc25c3c6b669c93f613c4f1;hpb=949f7affad6c3948d20c6d3dabb866143000e89d;p=b43-tools.git diff --git a/assembler/scanner.l b/assembler/scanner.l index b135552..80b204f 100644 --- 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; } @@ -144,7 +144,7 @@ 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; }