X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=assembler%2Fscanner.l;h=a9928da083850235afb3a9d300150c66b10d2315;hb=7ff7a760aa92b63ed4af8aabddb621cc9483e67f;hp=6fb3599c0ac16586568ed71cceee80990d8d79ec;hpb=3bd4f014e1ae2af49b2cbdd94a86c07559aacbce;p=b43-tools.git

diff --git a/assembler/scanner.l b/assembler/scanner.l
index 6fb3599..a9928da 100644
--- a/assembler/scanner.l
+++ b/assembler/scanner.l
@@ -51,12 +51,12 @@ NEWLINE		((\r)|(\n)|(\r\n))
 
 ^{WS}*"%"{WS}*arch	{ update_lineinfo(); return ASM_ARCH; }
 ^{WS}*"%"{WS}*start	{ update_lineinfo(); return ASM_START; }
-^{WS}*"%"{WS}*assert	{ update_lineinfo(); return ASM_ASSERT; }
+"%"{WS}*assert		{ update_lineinfo(); return ASM_ASSERT; }
 
 ^{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,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; }
+tram			{ update_lineinfo(); return IVAL_TRAM; }
 
 @[0-9a-fA-F]{3,3}	{ update_lineinfo(); return RAW_CODE; }