diff options
author | Quentin Colombet <qcolombet@apple.com> | 2013-05-24 22:51:52 +0000 |
---|---|---|
committer | Quentin Colombet <qcolombet@apple.com> | 2013-05-24 22:51:52 +0000 |
commit | f482805c285351648cbd2052ccf6b817b726fb0e (patch) | |
tree | 3a2acfbd646f1afb70d4bd1ae8a8e4103baf0f08 /llvm/lib/MC/MCDisassembler | |
parent | 251f49657897b38603d5aaac7f81d61228fe5728 (diff) | |
download | bcm5719-llvm-f482805c285351648cbd2052ccf6b817b726fb0e.tar.gz bcm5719-llvm-f482805c285351648cbd2052ccf6b817b726fb0e.zip |
Follow up of the introduction of MCSymbolizer.
- Ressurect old MCDisassemble API to soften transition.
- Extend MCTargetDesc to set target specific symbolizer.
llvm-svn: 182688
Diffstat (limited to 'llvm/lib/MC/MCDisassembler')
-rw-r--r-- | llvm/lib/MC/MCDisassembler/Disassembler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCDisassembler/Disassembler.cpp b/llvm/lib/MC/MCDisassembler/Disassembler.cpp index ba769369614..67dc136d416 100644 --- a/llvm/lib/MC/MCDisassembler/Disassembler.cpp +++ b/llvm/lib/MC/MCDisassembler/Disassembler.cpp @@ -18,6 +18,7 @@ #include "llvm/MC/MCRegisterInfo.h" #include "llvm/MC/MCRelocationInfo.h" #include "llvm/MC/MCSubtargetInfo.h" +#include "llvm/MC/MCSymbolizer.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryObject.h" #include "llvm/Support/TargetRegistry.h" @@ -80,9 +81,12 @@ LLVMDisasmContextRef LLVMCreateDisasmCPU(const char *Triple, const char *CPU, if (!RelInfo) return 0; + OwningPtr<MCSymbolizer> Symbolizer( + TheTarget->createMCSymbolizer(Triple, GetOpInfo, SymbolLookUp, DisInfo, + Ctx, RelInfo.take())); + DisAsm->setSymbolizer(Symbolizer); DisAsm->setupForSymbolicDisassembly(GetOpInfo, SymbolLookUp, DisInfo, Ctx, RelInfo); - // Set up the instruction printer. int AsmPrinterVariant = MAI->getAssemblerDialect(); MCInstPrinter *IP = TheTarget->createMCInstPrinter(AsmPrinterVariant, |