Bugfixes for edis. Code to initialize instruction
state was being executed too lazily, and the LLVM
assembly syntax for the disassembler was not being
written into the proper disassembler state variable.
llvm-svn: 100830
diff --git a/llvm/tools/edis/EDDisassembler.cpp b/llvm/tools/edis/EDDisassembler.cpp
index 072df82..ed7dfb1 100644
--- a/llvm/tools/edis/EDDisassembler.cpp
+++ b/llvm/tools/edis/EDDisassembler.cpp
@@ -171,9 +171,9 @@
const char *triple = infoMap->String;
- int syntaxVariant = getLLVMSyntaxVariant(key.Arch, key.Syntax);
+ LLVMSyntaxVariant = getLLVMSyntaxVariant(key.Arch, key.Syntax);
- if (syntaxVariant < 0)
+ if (LLVMSyntaxVariant < 0)
return;
std::string tripleString(triple);
@@ -210,7 +210,7 @@
InstString.reset(new std::string);
InstStream.reset(new raw_string_ostream(*InstString));
- InstPrinter.reset(Tgt->createMCInstPrinter(syntaxVariant, *AsmInfo));
+ InstPrinter.reset(Tgt->createMCInstPrinter(LLVMSyntaxVariant, *AsmInfo));
if (!InstPrinter)
return;