Merging r217254:

------------------------------------------------------------------------
r217254 | tomatabacu | 2014-09-05 16:43:21 +0100 (Fri, 05 Sep 2014) | 9 lines

[mips] Rename data members and member functions in MipsAssemblerOptions.

Summary: Use the naming convention from the LLVM Coding Standards.

Reviewers: dsanders

Reviewed By: dsanders

Differential Revision: http://reviews.llvm.org/D4972
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_35@232054 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Sanders 2015-03-12 16:23:09 +00:00
parent 937fd80523
commit a581c51915

View File

@ -38,23 +38,23 @@ class MCInstrInfo;
namespace { namespace {
class MipsAssemblerOptions { class MipsAssemblerOptions {
public: public:
MipsAssemblerOptions() : aTReg(1), reorder(true), macro(true) {} MipsAssemblerOptions() : ATReg(1), Reorder(true), Macro(true) {}
unsigned getATRegNum() { return aTReg; } unsigned getATRegNum() { return ATReg; }
bool setATReg(unsigned Reg); bool setATReg(unsigned Reg);
bool isReorder() { return reorder; } bool isReorder() { return Reorder; }
void setReorder() { reorder = true; } void setReorder() { Reorder = true; }
void setNoreorder() { reorder = false; } void setNoReorder() { Reorder = false; }
bool isMacro() { return macro; } bool isMacro() { return Macro; }
void setMacro() { macro = true; } void setMacro() { Macro = true; }
void setNomacro() { macro = false; } void setNoMacro() { Macro = false; }
private: private:
unsigned aTReg; unsigned ATReg;
bool reorder; bool Reorder;
bool macro; bool Macro;
}; };
} }
@ -1568,7 +1568,7 @@ bool MipsAssemblerOptions::setATReg(unsigned Reg) {
if (Reg > 31) if (Reg > 31)
return false; return false;
aTReg = Reg; ATReg = Reg;
return true; return true;
} }
@ -2409,7 +2409,7 @@ bool MipsAsmParser::parseSetNoReorderDirective() {
reportParseError("unexpected token in statement"); reportParseError("unexpected token in statement");
return false; return false;
} }
Options.setNoreorder(); Options.setNoReorder();
getTargetStreamer().emitDirectiveSetNoReorder(); getTargetStreamer().emitDirectiveSetNoReorder();
Parser.Lex(); // Consume the EndOfStatement. Parser.Lex(); // Consume the EndOfStatement.
return false; return false;
@ -2438,7 +2438,7 @@ bool MipsAsmParser::parseSetNoMacroDirective() {
reportParseError("`noreorder' must be set before `nomacro'"); reportParseError("`noreorder' must be set before `nomacro'");
return false; return false;
} }
Options.setNomacro(); Options.setNoMacro();
Parser.Lex(); // Consume the EndOfStatement. Parser.Lex(); // Consume the EndOfStatement.
return false; return false;
} }