aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2011-09-15 23:38:46 +0000
committerOwen Anderson <resistor@mac.com>2011-09-15 23:38:46 +0000
commita0c3b97221c8f29a123a3a2173f1550550788671 (patch)
treee50da33d9cc7d0c9dcb985bfcc91748335a5fc42 /llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
parent0d3d70a074b7029b1b712d617a21a4a9f72a2d23 (diff)
downloadllvm-a0c3b97221c8f29a123a3a2173f1550550788671.zip
llvm-a0c3b97221c8f29a123a3a2173f1550550788671.tar.gz
llvm-a0c3b97221c8f29a123a3a2173f1550550788671.tar.bz2
Don't attach annotations to MCInst's. Instead, have the disassembler return, and the printer accept, an annotation string which can be passed through if the client cares about annotations.
llvm-svn: 139876
Diffstat (limited to 'llvm/lib/MC/MCDisassembler/EDDisassembler.cpp')
-rw-r--r--llvm/lib/MC/MCDisassembler/EDDisassembler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
index 70b6300..83362a2 100644
--- a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
@@ -246,7 +246,7 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader,
MCDisassembler::DecodeStatus S;
S = Disassembler->getInstruction(*inst, byteSize, memoryObject, address,
- ErrorStream);
+ ErrorStream, nulls());
switch (S) {
case MCDisassembler::Fail:
case MCDisassembler::SoftFail:
@@ -327,7 +327,7 @@ bool EDDisassembler::registerIsProgramCounter(unsigned registerID) {
int EDDisassembler::printInst(std::string &str, MCInst &inst) {
PrinterMutex.acquire();
- InstPrinter->printInst(&inst, *InstStream);
+ InstPrinter->printInst(&inst, *InstStream, "");
InstStream->flush();
str = *InstString;
InstString->clear();