Skip to content

Commit

Permalink
[mips] Rename emit and parse functions for the .cpload assembler dire…
Browse files Browse the repository at this point in the history
…ctive. NFC.

Summary: It's better if we have a consistent name for .cpload-related functions.

Reviewers: dsanders

Reviewed By: dsanders

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D5437

llvm-svn: 218768
  • Loading branch information
Toma Tabacu committed Oct 1, 2014
1 parent 3a35d8f commit c4c202a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
Expand Up @@ -180,7 +180,7 @@ class MipsAsmParser : public MCTargetAsmParser {
bool parseSetMips0Directive();
bool parseSetArchDirective();
bool parseSetFeature(uint64_t Feature);
bool parseDirectiveCPLoad(SMLoc Loc);
bool parseDirectiveCpLoad(SMLoc Loc);
bool parseDirectiveCPSetup();
bool parseDirectiveNaN();
bool parseDirectiveSet();
Expand Down Expand Up @@ -2888,7 +2888,7 @@ bool MipsAsmParser::eatComma(StringRef ErrorStr) {
return true;
}

bool MipsAsmParser::parseDirectiveCPLoad(SMLoc Loc) {
bool MipsAsmParser::parseDirectiveCpLoad(SMLoc Loc) {
if (AssemblerOptions.back()->isReorder())
Warning(Loc, ".cpload in reorder section");

Expand All @@ -2907,7 +2907,7 @@ bool MipsAsmParser::parseDirectiveCPLoad(SMLoc Loc) {
return false;
}

getTargetStreamer().emitDirectiveCpload(RegOpnd.getGPR32Reg());
getTargetStreamer().emitDirectiveCpLoad(RegOpnd.getGPR32Reg());
return false;
}

Expand Down Expand Up @@ -3298,7 +3298,7 @@ bool MipsAsmParser::ParseDirective(AsmToken DirectiveID) {
StringRef IDVal = DirectiveID.getString();

if (IDVal == ".cpload")
return parseDirectiveCPLoad(DirectiveID.getLoc());
return parseDirectiveCpLoad(DirectiveID.getLoc());
if (IDVal == ".dword") {
parseDataDirective(8, DirectiveID.getLoc());
return false;
Expand Down
6 changes: 3 additions & 3 deletions llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp
Expand Up @@ -75,7 +75,7 @@ void MipsTargetStreamer::emitDirectiveSetPop() {}
void MipsTargetStreamer::emitDirectiveSetPush() {}
void MipsTargetStreamer::emitDirectiveSetDsp() { forbidModuleDirective(); }
void MipsTargetStreamer::emitDirectiveSetNoDsp() { forbidModuleDirective(); }
void MipsTargetStreamer::emitDirectiveCpload(unsigned RegNo) {}
void MipsTargetStreamer::emitDirectiveCpLoad(unsigned RegNo) {}
void MipsTargetStreamer::emitDirectiveCpsetup(unsigned RegNo, int RegOrOffset,
const MCSymbol &Sym, bool IsReg) {
}
Expand Down Expand Up @@ -278,7 +278,7 @@ void MipsTargetAsmStreamer::emitFMask(unsigned FPUBitmask,
OS << "," << FPUTopSavedRegOff << '\n';
}

void MipsTargetAsmStreamer::emitDirectiveCpload(unsigned RegNo) {
void MipsTargetAsmStreamer::emitDirectiveCpLoad(unsigned RegNo) {
OS << "\t.cpload\t$"
<< StringRef(MipsInstPrinter::getRegisterName(RegNo)).lower() << "\n";
forbidModuleDirective();
Expand Down Expand Up @@ -597,7 +597,7 @@ void MipsTargetELFStreamer::emitFMask(unsigned FPUBitmask,
FPROffset = FPUTopSavedRegOff;
}

void MipsTargetELFStreamer::emitDirectiveCpload(unsigned RegNo) {
void MipsTargetELFStreamer::emitDirectiveCpLoad(unsigned RegNo) {
// .cpload $reg
// This directive expands to:
// lui $gp, %hi(_gp_disp)
Expand Down
6 changes: 3 additions & 3 deletions llvm/lib/Target/Mips/MipsTargetStreamer.h
Expand Up @@ -67,7 +67,7 @@ class MipsTargetStreamer : public MCTargetStreamer {
virtual void emitDirectiveSetPush();

// PIC support
virtual void emitDirectiveCpload(unsigned RegNo);
virtual void emitDirectiveCpLoad(unsigned RegNo);
virtual void emitDirectiveCpsetup(unsigned RegNo, int RegOrOffset,
const MCSymbol &Sym, bool IsReg);

Expand Down Expand Up @@ -171,7 +171,7 @@ class MipsTargetAsmStreamer : public MipsTargetStreamer {
void emitDirectiveSetPush() override;

// PIC support
void emitDirectiveCpload(unsigned RegNo) override;
void emitDirectiveCpLoad(unsigned RegNo) override;
void emitDirectiveCpsetup(unsigned RegNo, int RegOrOffset,
const MCSymbol &Sym, bool IsReg) override;

Expand Down Expand Up @@ -217,7 +217,7 @@ class MipsTargetELFStreamer : public MipsTargetStreamer {
void emitFMask(unsigned FPUBitmask, int FPUTopSavedRegOff) override;

// PIC support
void emitDirectiveCpload(unsigned RegNo) override;
void emitDirectiveCpLoad(unsigned RegNo) override;
void emitDirectiveCpsetup(unsigned RegNo, int RegOrOffset,
const MCSymbol &Sym, bool IsReg) override;

Expand Down

0 comments on commit c4c202a

Please sign in to comment.