X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fscanner.l;h=11f38907da743740a13996007436eb4fdfb5bafe;hb=e21b92e66ad6c143da489331d4d56abfa2092160;hp=a9928da083850235afb3a9d300150c66b10d2315;hpb=7ff7a760aa92b63ed4af8aabddb621cc9483e67f;p=b43-tools.git

diff --git a/assembler/scanner.l b/assembler/scanner.l
index a9928da..11f3890 100644
--- a/assembler/scanner.l
+++ b/assembler/scanner.l
@@ -127,7 +127,9 @@ jext			{ update_lineinfo(); return OP_JEXT; }
 jnext			{ update_lineinfo(); return OP_JNEXT; }
 
 call			{ update_lineinfo(); return OP_CALL; }
+calls			{ update_lineinfo(); return OP_CALLS; }
 ret			{ update_lineinfo(); return OP_RET; }
+rets			{ update_lineinfo(); return OP_RETS; }
 
 tkiph			{ update_lineinfo(); return OP_TKIPH; }
 tkiphs			{ update_lineinfo(); return OP_TKIPHS; }
@@ -144,7 +146,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; }
@@ -181,7 +183,7 @@ static void interpret_cppinfo(const char *str)
 		goto error;
 	memset(tmp, 0, sizeof(tmp));
 	memcpy(tmp, str, min(sizeof(tmp) - 1,
-			     (int)(found - str)));
+			     (size_t)(found - str)));
 	cur_lineinfo.lineno = strtoul(tmp, NULL, 10) - 1;
 	str = found;
 	str++;
@@ -198,7 +200,7 @@ static void interpret_cppinfo(const char *str)
 	memset(cur_lineinfo.file, 0, sizeof(cur_lineinfo.file));
 	memcpy(cur_lineinfo.file, str,
 	       min(sizeof(cur_lineinfo.file) - 1,
-		   (int)(found - str)));
+		   (size_t)(found - str)));
 
 	return;
 error: