Skip to content

Commit 75c59c3

Browse files
committed
Update ARMConstantTweak to not be greedy and only match exact instruction names
1 parent 4e98212 commit 75c59c3

File tree

4 files changed

+1527
-1468
lines changed

4 files changed

+1527
-1468
lines changed

util/fipstools/delocate/delocate.peg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RegisterOrConstant <- (('%'[[A-Z]][[A-Z0-9]]*) /
8787
('#(' [0-9]+ ')') /
8888
ARMRegister)
8989
![fb:(+\-]
90-
ARMConstantTweak <- ((([us] "xt" [xwhb]) / "lsl" / "lsr" / "ror" / "rol" / "asr" / "asl") (WS '#'? Offset)?)/
90+
ARMConstantTweak <- ((([us] "xt" [xwhb]) / ("lsl" / "lsr" / "ror" / "rol" / "asr" / "asl") ![A-Za-z0-9_]) (WS '#'? Offset)?) /
9191
"mul vl" # multiply offset by the hardware's vector length
9292
ARMRegister <- "sp" / ([xwdqshb] [0-9] [0-9]? !(ARMRegisterBoundary)) / "xzr" / "wzr" / "NZCV" / ARMVectorRegister / SVE2PredicateRegister /
9393
('{' WS? ARMVectorRegister WS? ([,\-] WS? ARMVectorRegister)* WS? '}' ('[' [0-9] [0-9]? ']')? )

0 commit comments

Comments
 (0)