This is an archive of the discontinued LLVM Phabricator instance.

Differential D67526

[RISCV][NFC] Use NoRegister instead of 0 literal
ClosedPublic

Authored by luismarques on Sep 12 2019, 3:10 PM.

Details

Reviewers
asb
lenary
Commits
rG6cf896b284bb: [RISCV][NFC] Use NoRegister instead of 0 literal
rL372120: [RISCV][NFC] Use NoRegister instead of 0 literal
Summary

Trivial cleanup.

Diff Detail

Event Timeline

luismarques created this revision.Sep 12 2019, 3:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 12 2019, 3:10 PM
Herald added subscribers: llvm-commits, pzheng, s.egerton and 23 others. · View Herald Transcript
lenary accepted this revision.Sep 16 2019, 10:16 AM

LGTM

This revision is now accepted and ready to land.Sep 16 2019, 10:16 AM
luismarques updated this revision to Diff 220493.Sep 17 2019, 6:23 AM

Rebased on master.

Harbormaster completed remote builds in B38204: Diff 220493.Sep 17 2019, 6:25 AM
Closed by commit rL372120: [RISCV][NFC] Use NoRegister instead of 0 literal (authored by luismarques). · Explain WhySep 17 2019, 6:32 AM
This revision was automatically updated to reflect the committed changes.
grimar added a subscriber: grimar.Sep 17 2019, 7:05 AM

It broke BB: http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/19706/steps/build-unified-tree/logs/stdio

Revision Contents

PathSize
llvm/
lib/
Target/
RISCV/
AsmParser/
8 lines

Diff 220493

llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp

Show First 20 Lines • Show All 980 Lines • ▼ Show 20 Lines
// Attempts to match Name as a register (either using the default name or // Attempts to match Name as a register (either using the default name or
// alternative ABI names), setting RegNo to the matching register. Upon // alternative ABI names), setting RegNo to the matching register. Upon
// failure, returns true and sets RegNo to 0. If IsRV32E then registers // failure, returns true and sets RegNo to 0. If IsRV32E then registers
// x16-x31 will be rejected. // x16-x31 will be rejected.
static bool matchRegisterNameHelper(bool IsRV32E, Register &RegNo, static bool matchRegisterNameHelper(bool IsRV32E, Register &RegNo,
StringRef Name) { StringRef Name) {
RegNo = MatchRegisterName(Name); RegNo = MatchRegisterName(Name);
if (RegNo == 0) if (RegNo == NoRegister)
RegNo = MatchRegisterAltName(Name); RegNo = MatchRegisterAltName(Name);
if (IsRV32E && RegNo >= RISCV::X16 && RegNo <= RISCV::X31) if (IsRV32E && RegNo >= RISCV::X16 && RegNo <= RISCV::X31)
RegNo = 0; RegNo = NoRegister;
return RegNo == 0; return RegNo == NoRegister;
} }
bool RISCVAsmParser::ParseRegister(unsigned &RegNo, SMLoc &StartLoc, bool RISCVAsmParser::ParseRegister(unsigned &RegNo, SMLoc &StartLoc,
SMLoc &EndLoc) { SMLoc &EndLoc) {
const AsmToken &Tok = getParser().getTok(); const AsmToken &Tok = getParser().getTok();
StartLoc = Tok.getLoc(); StartLoc = Tok.getLoc();
EndLoc = Tok.getEndLoc(); EndLoc = Tok.getEndLoc();
RegNo = 0; RegNo = 0;
Show All 29 Lines default:
if (HadParens) if (HadParens)
getLexer().UnLex(LParen); getLexer().UnLex(LParen);
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
case AsmToken::Identifier: case AsmToken::Identifier:
StringRef Name = getLexer().getTok().getIdentifier(); StringRef Name = getLexer().getTok().getIdentifier();
Register RegNo; Register RegNo;
matchRegisterNameHelper(isRV32E(), RegNo, Name); matchRegisterNameHelper(isRV32E(), RegNo, Name);
if (RegNo == 0) { if (RegNo == NoRegister) {
if (HadParens) if (HadParens)
getLexer().UnLex(LParen); getLexer().UnLex(LParen);
return MatchOperand_NoMatch; return MatchOperand_NoMatch;
} }
if (HadParens) if (HadParens)
Operands.push_back(RISCVOperand::createToken("(", FirstS, isRV64())); Operands.push_back(RISCVOperand::createToken("(", FirstS, isRV64()));
SMLoc S = getLoc(); SMLoc S = getLoc();
SMLoc E = SMLoc::getFromPointer(S.getPointer() - 1); SMLoc E = SMLoc::getFromPointer(S.getPointer() - 1);
▲ Show 20 Lines • Show All 828 Lines • Show Last 20 Lines