Skip to content

[PowerPC] Update matchRegisterName() to return MCRegister instead of bool #111186

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 5 commits into from
Oct 8, 2024
Merged

[PowerPC] Update matchRegisterName() to return MCRegister instead of bool #111186

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e2b9b2
[PowerPC] Update matchRegisterName() to return MCRegister instead of …
lei137 Aug 23, 2024
bd13ac2
restore define
lei137 Oct 4, 2024
14ff64c
fix code format
lei137 Oct 4, 2024
c9a2cbe
as per review comment
lei137 Oct 7, 2024
bd3645f
simplify expr
lei137 Oct 7, 2024
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
21 changes: 10 additions & 11 deletions llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class PPCAsmParser : public MCTargetAsmParser {

bool isPPC64() const { return IsPPC64; }

bool matchRegisterName(MCRegister &RegNo, int64_t &IntVal);
MCRegister matchRegisterName(int64_t &IntVal);

bool parseRegister(MCRegister &Reg, SMLoc &StartLoc, SMLoc &EndLoc) override;
ParseStatus tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
Expand Down Expand Up @@ -1291,13 +1291,14 @@ bool PPCAsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
llvm_unreachable("Implement any new match types added!");
}

bool PPCAsmParser::matchRegisterName(MCRegister &RegNo, int64_t &IntVal) {
MCRegister PPCAsmParser::matchRegisterName(int64_t &IntVal) {
if (getParser().getTok().is(AsmToken::Percent))
getParser().Lex(); // Eat the '%'.

if (!getParser().getTok().is(AsmToken::Identifier))
return true;
return MCRegister();

MCRegister RegNo;
StringRef Name = getParser().getTok().getString();
if (Name.equals_insensitive("lr")) {
RegNo = isPPC64() ? PPC::LR8 : PPC::LR;
Expand Down Expand Up @@ -1345,9 +1346,10 @@ bool PPCAsmParser::matchRegisterName(MCRegister &RegNo, int64_t &IntVal) {
!Name.substr(3).getAsInteger(10, IntVal) && IntVal < 8) {
RegNo = DMRRegs[IntVal];
} else
return true;
return MCRegister();

getParser().Lex();
return false;
return RegNo;
}

bool PPCAsmParser::parseRegister(MCRegister &Reg, SMLoc &StartLoc,
Expand All @@ -1362,9 +1364,8 @@ ParseStatus PPCAsmParser::tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
const AsmToken &Tok = getParser().getTok();
StartLoc = Tok.getLoc();
EndLoc = Tok.getEndLoc();
Reg = PPC::NoRegister;
int64_t IntVal;
if (matchRegisterName(Reg, IntVal))
if (!(Reg = matchRegisterName(IntVal)))
return ParseStatus::NoMatch;
return ParseStatus::Success;
}
Expand Down Expand Up @@ -1541,9 +1542,8 @@ bool PPCAsmParser::parseOperand(OperandVector &Operands) {
// Special handling for register names. These are interpreted
// as immediates corresponding to the register number.
case AsmToken::Percent: {
MCRegister RegNo;
int64_t IntVal;
if (matchRegisterName(RegNo, IntVal))
if (!matchRegisterName(IntVal))
return Error(S, "invalid register name");

Operands.push_back(PPCOperand::CreateImm(IntVal, S, E, isPPC64()));
Expand Down Expand Up @@ -1627,8 +1627,7 @@ bool PPCAsmParser::parseOperand(OperandVector &Operands) {
int64_t IntVal;
switch (getLexer().getKind()) {
case AsmToken::Percent: {
MCRegister RegNo;
if (matchRegisterName(RegNo, IntVal))
if (!matchRegisterName(IntVal))
return Error(S, "invalid register name");
break;
}
Expand Down
Loading