Use the verbose asm flag instead of a new flag for decoding the LSDA.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133292 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2011-06-17 20:55:01 +00:00
parent da26ad501b
commit e266ce6c6e
7 changed files with 11 additions and 25 deletions

View File

@ -557,8 +557,7 @@ namespace llvm {
MCInstPrinter *InstPrint = 0,
MCCodeEmitter *CE = 0,
TargetAsmBackend *TAB = 0,
bool ShowInst = false,
bool DecodeLSDA = false);
bool ShowInst = false);
/// createMachOStreamer - Create a machine code streamer which will generate
/// Mach-O format object files.

View File

@ -47,8 +47,7 @@ namespace llvm {
MCInstPrinter *InstPrint,
MCCodeEmitter *CE,
TargetAsmBackend *TAB,
bool ShowInst,
bool DecodeLSDA);
bool ShowInst);
/// Target - Wrapper for Target specific information.
///
@ -101,8 +100,7 @@ namespace llvm {
MCInstPrinter *InstPrint,
MCCodeEmitter *CE,
TargetAsmBackend *TAB,
bool ShowInst,
bool DecodeLSDA);
bool ShowInst);
private:
/// Next - The next registered target in the linked list, maintained by the
@ -336,11 +334,10 @@ namespace llvm {
MCInstPrinter *InstPrint,
MCCodeEmitter *CE,
TargetAsmBackend *TAB,
bool ShowInst,
bool DecodeLSDA) const {
bool ShowInst) const {
// AsmStreamerCtorFn is default to llvm::createAsmStreamer
return AsmStreamerCtorFn(Ctx, OS, isVerboseAsm, useLoc, useCFI,
InstPrint, CE, TAB, ShowInst, DecodeLSDA);
InstPrint, CE, TAB, ShowInst);
}
/// @}

View File

@ -72,8 +72,6 @@ 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<bool> DecodeMCLSDA("decode-mc-lsda", cl::Hidden,
cl::desc("Print LSDA in human readable format in .s output"));
static cl::opt<bool> EnableMCLogging("enable-mc-api-logging", cl::Hidden,
cl::desc("Enable MC API logging"));
static cl::opt<bool> VerifyMachineCode("verify-machineinstrs", cl::Hidden,
@ -154,8 +152,7 @@ bool LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM,
hasMCUseCFI(),
InstPrinter,
MCE, TAB,
ShowMCInst,
DecodeMCLSDA);
ShowMCInst);
AsmStreamer.reset(S);
break;
}

View File

@ -1605,8 +1605,8 @@ MCStreamer *llvm::createAsmStreamer(MCContext &Context,
bool isVerboseAsm, bool useLoc,
bool useCFI, MCInstPrinter *IP,
MCCodeEmitter *CE, TargetAsmBackend *TAB,
bool ShowInst, bool DecodeLSDA) {
if (DecodeLSDA)
bool ShowInst) {
if (isVerboseAsm)
return new MCLSDADecoderAsmStreamer(Context, OS, isVerboseAsm, useLoc,
useCFI, IP, CE, TAB, ShowInst);

View File

@ -533,8 +533,7 @@ namespace llvm {
bool isVerboseAsm, bool useLoc, bool useCFI,
MCInstPrinter *IP,
MCCodeEmitter *CE, TargetAsmBackend *TAB,
bool ShowInst,
bool /*DecodeLSDA*/) {
bool ShowInst) {
return new PTXMCAsmStreamer(Context, OS, isVerboseAsm, useLoc,
IP, CE, ShowInst);
}

View File

@ -27,8 +27,7 @@ namespace llvm {
MCInstPrinter *InstPrint,
MCCodeEmitter *CE,
TargetAsmBackend *TAB,
bool ShowInst,
bool DecodeLSDA);
bool ShowInst);
}
extern "C" void LLVMInitializePTXTarget() {

View File

@ -61,10 +61,6 @@ static cl::opt<bool>
ShowInstOperands("show-inst-operands",
cl::desc("Show instructions operands as parsed"));
static cl::opt<bool>
DecodeLSDA("decode-lsda",
cl::desc("Print LSDA in human readable format"));
static cl::opt<unsigned>
OutputAsmVariant("output-asm-variant",
cl::desc("Syntax variant to use for output printing"));
@ -361,8 +357,7 @@ static int AssembleInput(const char *ProgName) {
Str.reset(TheTarget->createAsmStreamer(Ctx, FOS, /*asmverbose*/true,
/*useLoc*/ true,
/*useCFI*/ true, IP, CE, TAB,
ShowInst,
DecodeLSDA));
ShowInst));
} else if (FileType == OFT_Null) {
Str.reset(createNullStreamer(Ctx));
} else {