Skip to content

Commit

Permalink
[PPC][MC] Restore support for case-insensitive register names (#128525)
Browse files Browse the repository at this point in the history
Lowercase the name before calling MatchRegisterName(), to restore
support for using `%R3` instead of `%r3` and similar, matching the GNU
assembler.

Fixes #126786.
  • Loading branch information
nikic authored Feb 24, 2025
1 parent 20fd7f0 commit f1252f5
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
13 changes: 8 additions & 5 deletions llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,10 @@ MCRegister PPCAsmParser::matchRegisterName(int64_t &IntVal) {
if (!getParser().getTok().is(AsmToken::Identifier))
return MCRegister();

StringRef Name = getParser().getTok().getString();
// MatchRegisterName() expects lower-case registers, but we want to support
// case-insensitive spelling.
std::string NameBuf = getParser().getTok().getString().lower();
StringRef Name(NameBuf);
MCRegister RegNo = MatchRegisterName(Name);
if (!RegNo)
return RegNo;
Expand All @@ -1329,15 +1332,15 @@ MCRegister PPCAsmParser::matchRegisterName(int64_t &IntVal) {

// MatchRegisterName doesn't seem to have special handling for 64bit vs 32bit
// register types.
if (Name.equals_insensitive("lr")) {
if (Name == "lr") {
RegNo = isPPC64() ? PPC::LR8 : PPC::LR;
IntVal = 8;
} else if (Name.equals_insensitive("ctr")) {
} else if (Name == "ctr") {
RegNo = isPPC64() ? PPC::CTR8 : PPC::CTR;
IntVal = 9;
} else if (Name.equals_insensitive("vrsave"))
} else if (Name == "vrsave")
IntVal = 256;
else if (Name.starts_with_insensitive("r"))
else if (Name.starts_with("r"))
RegNo = isPPC64() ? XRegs[IntVal] : RRegs[IntVal];

getParser().Lex();
Expand Down
11 changes: 11 additions & 0 deletions llvm/test/MC/PowerPC/case-insensitive-regs.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# RUN: llvm-mc -triple powerpc64le-unknown-unknown %s 2>&1 | FileCheck %s

# Test that upper case registers are accepted.

# CHECK-LABEL: test:
# CHECK-NEXT: ld 1, 0(3)
# CHECK-NEXT: blr

test:
ld %R1, 0(%R3)
blr

0 comments on commit f1252f5

Please sign in to comment.