[llvm] 18225c7 - [ARM] Use MCRegister in 2 functions in ARMTargetStreamer. NFC
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 20 23:00:01 PDT 2024
Author: Craig Topper
Date: 2024-09-20T22:59:48-07:00
New Revision: 18225c783a00bde62f19a177a57de388e20c2bba
URL: https://github.com/llvm/llvm-project/commit/18225c783a00bde62f19a177a57de388e20c2bba
DIFF: https://github.com/llvm/llvm-project/commit/18225c783a00bde62f19a177a57de388e20c2bba.diff
LOG: [ARM] Use MCRegister in 2 functions in ARMTargetStreamer. NFC
Added:
Modified:
llvm/include/llvm/MC/MCStreamer.h
llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCStreamer.h b/llvm/include/llvm/MC/MCStreamer.h
index e5d9dbbac8dba5..707aecc5dc578e 100644
--- a/llvm/include/llvm/MC/MCStreamer.h
+++ b/llvm/include/llvm/MC/MCStreamer.h
@@ -144,9 +144,9 @@ class ARMTargetStreamer : public MCTargetStreamer {
virtual void emitPersonality(const MCSymbol *Personality);
virtual void emitPersonalityIndex(unsigned Index);
virtual void emitHandlerData();
- virtual void emitSetFP(unsigned FpReg, unsigned SpReg,
+ virtual void emitSetFP(MCRegister FpReg, MCRegister SpReg,
int64_t Offset = 0);
- virtual void emitMovSP(unsigned Reg, int64_t Offset = 0);
+ virtual void emitMovSP(MCRegister Reg, int64_t Offset = 0);
virtual void emitPad(int64_t Offset);
virtual void emitRegSave(const SmallVectorImpl<MCRegister> &RegList,
bool isVector);
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 7d74f86c164fc7..9d639635425c2c 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -113,7 +113,7 @@ class UnwindContext {
Locs PersonalityLocs;
Locs PersonalityIndexLocs;
Locs HandlerDataLocs;
- int FPReg;
+ MCRegister FPReg;
public:
UnwindContext(MCAsmParser &P) : Parser(P), FPReg(ARM::SP) {}
@@ -132,8 +132,8 @@ class UnwindContext {
void recordHandlerData(SMLoc L) { HandlerDataLocs.push_back(L); }
void recordPersonalityIndex(SMLoc L) { PersonalityIndexLocs.push_back(L); }
- void saveFPReg(int Reg) { FPReg = Reg; }
- int getFPReg() const { return FPReg; }
+ void saveFPReg(MCRegister Reg) { FPReg = Reg; }
+ MCRegister getFPReg() const { return FPReg; }
void emitFnStartLocNotes() const {
for (const SMLoc &Loc : FnStartLocs)
@@ -12115,8 +12115,7 @@ bool ARMAsmParser::parseDirectiveSetFP(SMLoc L) {
if (Parser.parseEOL())
return true;
- getTargetStreamer().emitSetFP(static_cast<unsigned>(FPReg),
- static_cast<unsigned>(SPReg), Offset);
+ getTargetStreamer().emitSetFP(FPReg, SPReg, Offset);
return false;
}
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
index ff2b557090bc72..e7587145b46f2a 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
@@ -80,8 +80,9 @@ class ARMTargetAsmStreamer : public ARMTargetStreamer {
void emitPersonality(const MCSymbol *Personality) override;
void emitPersonalityIndex(unsigned Index) override;
void emitHandlerData() override;
- void emitSetFP(unsigned FpReg, unsigned SpReg, int64_t Offset = 0) override;
- void emitMovSP(unsigned Reg, int64_t Offset = 0) override;
+ void emitSetFP(MCRegister FpReg, MCRegister SpReg,
+ int64_t Offset = 0) override;
+ void emitMovSP(MCRegister Reg, int64_t Offset = 0) override;
void emitPad(int64_t Offset) override;
void emitRegSave(const SmallVectorImpl<MCRegister> &RegList,
bool isVector) override;
@@ -139,7 +140,7 @@ void ARMTargetAsmStreamer::emitPersonalityIndex(unsigned Index) {
void ARMTargetAsmStreamer::emitHandlerData() { OS << "\t.handlerdata\n"; }
-void ARMTargetAsmStreamer::emitSetFP(unsigned FpReg, unsigned SpReg,
+void ARMTargetAsmStreamer::emitSetFP(MCRegister FpReg, MCRegister SpReg,
int64_t Offset) {
OS << "\t.setfp\t";
InstPrinter.printRegName(OS, FpReg);
@@ -150,7 +151,7 @@ void ARMTargetAsmStreamer::emitSetFP(unsigned FpReg, unsigned SpReg,
OS << '\n';
}
-void ARMTargetAsmStreamer::emitMovSP(unsigned Reg, int64_t Offset) {
+void ARMTargetAsmStreamer::emitMovSP(MCRegister Reg, int64_t Offset) {
assert((Reg != ARM::SP && Reg != ARM::PC) &&
"the operand of .movsp cannot be either sp or pc");
@@ -401,8 +402,9 @@ class ARMTargetELFStreamer : public ARMTargetStreamer {
void emitPersonality(const MCSymbol *Personality) override;
void emitPersonalityIndex(unsigned Index) override;
void emitHandlerData() override;
- void emitSetFP(unsigned FpReg, unsigned SpReg, int64_t Offset = 0) override;
- void emitMovSP(unsigned Reg, int64_t Offset = 0) override;
+ void emitSetFP(MCRegister FpReg, MCRegister SpReg,
+ int64_t Offset = 0) override;
+ void emitMovSP(MCRegister Reg, int64_t Offset = 0) override;
void emitPad(int64_t Offset) override;
void emitRegSave(const SmallVectorImpl<MCRegister> &RegList,
bool isVector) override;
@@ -469,8 +471,8 @@ class ARMELFStreamer : public MCELFStreamer {
void emitPersonality(const MCSymbol *Per);
void emitPersonalityIndex(unsigned index);
void emitHandlerData();
- void emitSetFP(unsigned NewFpReg, unsigned NewSpReg, int64_t Offset = 0);
- void emitMovSP(unsigned Reg, int64_t Offset = 0);
+ void emitSetFP(MCRegister NewFpReg, MCRegister NewSpReg, int64_t Offset = 0);
+ void emitMovSP(MCRegister Reg, int64_t Offset = 0);
void emitPad(int64_t Offset);
void emitRegSave(const SmallVectorImpl<MCRegister> &RegList, bool isVector);
void emitUnwindRaw(int64_t Offset, const SmallVectorImpl<uint8_t> &Opcodes);
@@ -721,7 +723,7 @@ class ARMELFStreamer : public MCELFStreamer {
MCSymbol *FnStart;
const MCSymbol *Personality;
unsigned PersonalityIndex;
- unsigned FPReg; // Frame pointer register
+ MCRegister FPReg; // Frame pointer register
int64_t FPOffset; // Offset: (final frame pointer) - (initial $sp)
int64_t SPOffset; // Offset: (final $sp) - (initial $sp)
int64_t PendingOffset; // Offset: (final $sp) - (emitted $sp)
@@ -753,12 +755,12 @@ void ARMTargetELFStreamer::emitHandlerData() {
getStreamer().emitHandlerData();
}
-void ARMTargetELFStreamer::emitSetFP(unsigned FpReg, unsigned SpReg,
+void ARMTargetELFStreamer::emitSetFP(MCRegister FpReg, MCRegister SpReg,
int64_t Offset) {
getStreamer().emitSetFP(FpReg, SpReg, Offset);
}
-void ARMTargetELFStreamer::emitMovSP(unsigned Reg, int64_t Offset) {
+void ARMTargetELFStreamer::emitMovSP(MCRegister Reg, int64_t Offset) {
getStreamer().emitMovSP(Reg, Offset);
}
@@ -1373,7 +1375,7 @@ void ARMELFStreamer::emitPersonalityIndex(unsigned Index) {
PersonalityIndex = Index;
}
-void ARMELFStreamer::emitSetFP(unsigned NewFPReg, unsigned NewSPReg,
+void ARMELFStreamer::emitSetFP(MCRegister NewFPReg, MCRegister NewSPReg,
int64_t Offset) {
assert((NewSPReg == ARM::SP || NewSPReg == FPReg) &&
"the operand of .setfp directive should be either $sp or $fp");
@@ -1387,7 +1389,7 @@ void ARMELFStreamer::emitSetFP(unsigned NewFPReg, unsigned NewSPReg,
FPOffset += Offset;
}
-void ARMELFStreamer::emitMovSP(unsigned Reg, int64_t Offset) {
+void ARMELFStreamer::emitMovSP(MCRegister Reg, int64_t Offset) {
assert((Reg != ARM::SP && Reg != ARM::PC) &&
"the operand of .movsp cannot be either sp or pc");
assert(FPReg == ARM::SP && "current FP must be SP");
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp
index d550b70d8e5919..84a0fb44c9acdf 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp
@@ -92,9 +92,9 @@ void ARMTargetStreamer::emitCantUnwind() {}
void ARMTargetStreamer::emitPersonality(const MCSymbol *Personality) {}
void ARMTargetStreamer::emitPersonalityIndex(unsigned Index) {}
void ARMTargetStreamer::emitHandlerData() {}
-void ARMTargetStreamer::emitSetFP(unsigned FpReg, unsigned SpReg,
+void ARMTargetStreamer::emitSetFP(MCRegister FpReg, MCRegister SpReg,
int64_t Offset) {}
-void ARMTargetStreamer::emitMovSP(unsigned Reg, int64_t Offset) {}
+void ARMTargetStreamer::emitMovSP(MCRegister Reg, int64_t Offset) {}
void ARMTargetStreamer::emitPad(int64_t Offset) {}
void ARMTargetStreamer::emitRegSave(const SmallVectorImpl<MCRegister> &RegList,
bool isVector) {}
More information about the llvm-commits
mailing list