summaryrefslogtreecommitdiff
path: root/assembler/lex.l
diff options
context:
space:
mode:
Diffstat (limited to 'assembler/lex.l')
-rw-r--r--assembler/lex.l12
1 files changed, 10 insertions, 2 deletions
diff --git a/assembler/lex.l b/assembler/lex.l
index 5deb3c95..e971360d 100644
--- a/assembler/lex.l
+++ b/assembler/lex.l
@@ -136,8 +136,16 @@ int saved_state = INITIAL;
yylval.integer = atoi(yytext + 1);
return NOTIFYREG;
}
-"f"[0-9]+ {
- yylval.integer = atoi(yytext + 1);
+ /* Unlike other registers, flagreg returns the subreg number in the lvalue
+ * rather than the reg number, to avoid a shift/reduce conflict in the
+ * predicate control.
+ */
+"f0.[0-9]+" {
+ yylval.integer = atoi(yytext + 3);
+ return FLAGREG;
+}
+"f0" {
+ yylval.integer = 0;
return FLAGREG;
}
[gr][0-9]+ {