diff options
author | Eric Christopher <echristo@gmail.com> | 2014-05-15 23:27:49 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2014-05-15 23:27:49 +0000 |
commit | 6d22500de37947705c62068471fe56b4a19ec608 (patch) | |
tree | 924a878adfdb6af2095c63e6135c66315926b9e8 | |
parent | 8fde27bceb0ab80157d99d34ebeba25c2fe414c9 (diff) | |
download | llvm-6d22500de37947705c62068471fe56b4a19ec608.tar.gz llvm-6d22500de37947705c62068471fe56b4a19ec608.tar.bz2 llvm-6d22500de37947705c62068471fe56b4a19ec608.tar.xz |
Move more MC options into the MCTargetOptions structure.
No functional change.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208932 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/MC/MCTargetOptions.h | 7 | ||||
-rw-r--r-- | include/llvm/MC/MCTargetOptionsCommandFlags.h | 7 | ||||
-rw-r--r-- | lib/CodeGen/LLVMTargetMachine.cpp | 16 | ||||
-rw-r--r-- | lib/MC/MCTargetOptions.cpp | 3 |
4 files changed, 18 insertions, 15 deletions
diff --git a/include/llvm/MC/MCTargetOptions.h b/include/llvm/MC/MCTargetOptions.h index 225ed7d85f..ad34958ae3 100644 --- a/include/llvm/MC/MCTargetOptions.h +++ b/include/llvm/MC/MCTargetOptions.h @@ -26,7 +26,8 @@ public: unsigned MCNoExecStack : 1; unsigned MCSaveTempLabels : 1; unsigned MCUseDwarfDirectory : 1; - + unsigned ShowMCEncoding : 1; + unsigned ShowMCInst : 1; MCTargetOptions(); }; @@ -36,7 +37,9 @@ inline bool operator==(const MCTargetOptions &LHS, const MCTargetOptions &RHS) { ARE_EQUAL(MCRelaxAll) && ARE_EQUAL(MCNoExecStack) && ARE_EQUAL(MCSaveTempLabels) && - ARE_EQUAL(MCUseDwarfDirectory)); + ARE_EQUAL(MCUseDwarfDirectory) && + ARE_EQUAL(ShowMCEncoding) && + ARE_EQUAL(ShowMCInst)); #undef ARE_EQUAL } diff --git a/include/llvm/MC/MCTargetOptionsCommandFlags.h b/include/llvm/MC/MCTargetOptionsCommandFlags.h index 8968f9919f..1edf8f75b1 100644 --- a/include/llvm/MC/MCTargetOptionsCommandFlags.h +++ b/include/llvm/MC/MCTargetOptionsCommandFlags.h @@ -42,6 +42,11 @@ cl::opt<bool> NoExecStack("mc-no-exec-stack", cl::opt<bool> SaveTempLabels("L", cl::desc("Don't discard temporary labels")); +cl::opt<bool> ShowMCEncoding("show-mc-encoding", cl::Hidden, + cl::desc("Show encoding in .s output")); +cl::opt<bool> ShowMCInst("show-mc-inst", cl::Hidden, + cl::desc("Show instruction structure in .s output")); + static inline MCTargetOptions InitMCTargetOptionsFromFlags() { MCTargetOptions Options; Options.SanitizeAddress = @@ -50,6 +55,8 @@ static inline MCTargetOptions InitMCTargetOptionsFromFlags() { Options.MCUseDwarfDirectory = EnableDwarfDirectory; Options.MCNoExecStack = NoExecStack; Options.MCSaveTempLabels = SaveTempLabels; + Options.ShowMCEncoding = ShowMCEncoding; + Options.ShowMCInst = ShowMCInst; return Options; } diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp index 85d10953d9..f453c627be 100644 --- a/lib/CodeGen/LLVMTargetMachine.cpp +++ b/lib/CodeGen/LLVMTargetMachine.cpp @@ -43,11 +43,6 @@ static cl::opt<cl::boolOrDefault> EnableFastISelOption("fast-isel", cl::Hidden, cl::desc("Enable the \"fast\" instruction selector")); -static cl::opt<bool> ShowMCEncoding("show-mc-encoding", cl::Hidden, - cl::desc("Show encoding in .s output")); -static cl::opt<bool> ShowMCInst("show-mc-inst", cl::Hidden, - cl::desc("Show instruction structure in .s output")); - static cl::opt<cl::boolOrDefault> AsmVerbose("asm-verbose", cl::desc("Add comments to directives."), cl::init(cl::BOU_UNSET)); @@ -186,17 +181,14 @@ bool LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM, // Create a code emitter if asked to show the encoding. MCCodeEmitter *MCE = nullptr; - if (ShowMCEncoding) + if (Options.MCOptions.ShowMCEncoding) MCE = getTarget().createMCCodeEmitter(MII, MRI, STI, *Context); MCAsmBackend *MAB = getTarget().createMCAsmBackend(MRI, getTargetTriple(), TargetCPU); - MCStreamer *S = getTarget().createAsmStreamer(*Context, Out, - getVerboseAsm(), - hasMCUseDwarfDirectory(), - InstPrinter, - MCE, MAB, - ShowMCInst); + MCStreamer *S = getTarget().createAsmStreamer( + *Context, Out, getVerboseAsm(), hasMCUseDwarfDirectory(), InstPrinter, + MCE, MAB, Options.MCOptions.ShowMCInst); AsmStreamer.reset(S); break; } diff --git a/lib/MC/MCTargetOptions.cpp b/lib/MC/MCTargetOptions.cpp index 0bcfce9eac..e1b6a5889d 100644 --- a/lib/MC/MCTargetOptions.cpp +++ b/lib/MC/MCTargetOptions.cpp @@ -13,6 +13,7 @@ namespace llvm { MCTargetOptions::MCTargetOptions() : SanitizeAddress(false), MCRelaxAll(false), MCNoExecStack(false), - MCSaveTempLabels(false), MCUseDwarfDirectory(false) {} + MCSaveTempLabels(false), MCUseDwarfDirectory(false), + ShowMCEncoding(false), ShowMCInst(false) {} } // end namespace llvm |