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 | de7cbbfcce5c068f0699bdcb6dac093c0c91ba6f (patch) | |
| tree | 5ab055706a3d1e3379dd568d4ee386fa2563f518 /lib/MC/MCDisassembler | |
| parent | fce7b6b5d9905bf35641ee7f001b6b66dbc26c2d (diff) | |
| download | llvm-de7cbbfcce5c068f0699bdcb6dac093c0c91ba6f.tar.gz llvm-de7cbbfcce5c068f0699bdcb6dac093c0c91ba6f.tar.bz2 llvm-de7cbbfcce5c068f0699bdcb6dac093c0c91ba6f.tar.xz | |
Follow up of the introduction of MCSymbolizer.
- Ressurect old MCDisassemble API to soften transition.
- Extend MCTargetDesc to set target specific symbolizer.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182688 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCDisassembler')
| -rw-r--r-- | lib/MC/MCDisassembler/Disassembler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/MC/MCDisassembler/Disassembler.cpp b/lib/MC/MCDisassembler/Disassembler.cpp index ba76936961..67dc136d41 100644 --- a/lib/MC/MCDisassembler/Disassembler.cpp +++ b/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, |