Skip to content

[RISCV] Don't allow '-' after 'ra' in Zcmp/Xqccmp register list. #134182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2025
Merged

[RISCV] Don't allow '-' after 'ra' in Zcmp/Xqccmp register list. #134182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2612,46 +2612,46 @@ ParseStatus RISCVAsmParser::parseRegListCommon(OperandVector &Operands,
return Error(getLoc(),
"continuous register list must start from 's0' or 'x8'");
getLexer().Lex(); // eat reg
}

// parse case like -s1
if (parseOptionalToken(AsmToken::Minus)) {
StringRef EndName = getLexer().getTok().getIdentifier();
// FIXME: the register mapping and checks of RVE is wrong
RegEnd = matchRegisterNameHelper(EndName);
if (!(RegEnd == RISCV::X9 ||
(RegEnd >= RISCV::X18 && RegEnd <= RISCV::X27)))
return Error(getLoc(), "invalid register");
getLexer().Lex();
}

// parse extra part like ', x18[-x20]' for XRegList
if (parseOptionalToken(AsmToken::Comma)) {
if (RegEnd != RISCV::X9)
return Error(
getLoc(),
"first contiguous registers pair of register list must be 'x8-x9'");
// parse case like -s1
if (parseOptionalToken(AsmToken::Minus)) {
StringRef EndName = getLexer().getTok().getIdentifier();
// FIXME: the register mapping and checks of RVE is wrong
RegEnd = matchRegisterNameHelper(EndName);
if (!(RegEnd == RISCV::X9 ||
(RegEnd >= RISCV::X18 && RegEnd <= RISCV::X27)))
return Error(getLoc(), "invalid register");
getLexer().Lex();
}

// parse ', x18' for extra part
if (getLexer().isNot(AsmToken::Identifier) || IsRVE)
return Error(getLoc(), "invalid register");
StringRef EndName = getLexer().getTok().getIdentifier();
RegEnd = MatchRegisterName(EndName);
if (RegEnd != RISCV::X18)
return Error(getLoc(),
"second contiguous registers pair of register list "
"must start from 'x18'");
getLexer().Lex();
// parse extra part like ', x18[-x20]' for XRegList
if (parseOptionalToken(AsmToken::Comma)) {
if (RegEnd != RISCV::X9)
return Error(
getLoc(),
"first contiguous registers pair of register list must be 'x8-x9'");

// parse '-x20' for extra part
if (parseOptionalToken(AsmToken::Minus)) {
// parse ', x18' for extra part
if (getLexer().isNot(AsmToken::Identifier) || IsRVE)
return Error(getLoc(), "invalid register");
EndName = getLexer().getTok().getIdentifier();
StringRef EndName = getLexer().getTok().getIdentifier();
RegEnd = MatchRegisterName(EndName);
if (!(RegEnd >= RISCV::X19 && RegEnd <= RISCV::X27))
return Error(getLoc(), "invalid register");
if (RegEnd != RISCV::X18)
return Error(getLoc(),
"second contiguous registers pair of register list "
"must start from 'x18'");
getLexer().Lex();

// parse '-x20' for extra part
if (parseOptionalToken(AsmToken::Minus)) {
if (getLexer().isNot(AsmToken::Identifier) || IsRVE)
return Error(getLoc(), "invalid register");
EndName = getLexer().getTok().getIdentifier();
RegEnd = MatchRegisterName(EndName);
if (!(RegEnd >= RISCV::X19 && RegEnd <= RISCV::X27))
return Error(getLoc(), "invalid register");
getLexer().Lex();
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions llvm/test/MC/RISCV/rv64zcmp-invalid.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ cm.pop {ra}, -x1

# CHECK-ERROR: :[[@LINE+1]]:15: error: stack adjustment is invalid for this instruction and register list
cm.push {ra}, x1

# CHECK-ERROR: :[[@LINE+1]]:12: error: register list must end with '}'
cm.push {x1-x9}, -32
Loading