diff options
| author | James Molloy <james.molloy@arm.com> | 2011-09-01 18:02:14 +0000 |
|---|---|---|
| committer | James Molloy <james.molloy@arm.com> | 2011-09-01 18:02:14 +0000 |
| commit | c047dcade506a5acaccb1548cb83a3f85f52d71d (patch) | |
| tree | 1f78524379306a8706605360f894bbcdbace4bf2 /lib/MC/MCDisassembler/EDDisassembler.cpp | |
| parent | 7f17b5a483ea358f2b9e3958f16cf34d75d5b4da (diff) | |
Fix up r137380 based on post-commit review by Jim Grosbach.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138948 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCDisassembler/EDDisassembler.cpp')
| -rw-r--r-- | lib/MC/MCDisassembler/EDDisassembler.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/MC/MCDisassembler/EDDisassembler.cpp b/lib/MC/MCDisassembler/EDDisassembler.cpp index c3a10fa80b..227e229f09 100644 --- a/lib/MC/MCDisassembler/EDDisassembler.cpp +++ b/lib/MC/MCDisassembler/EDDisassembler.cpp @@ -239,14 +239,19 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader, MCInst* inst = new MCInst; uint64_t byteSize; - if (!Disassembler->getInstruction(*inst, - byteSize, - memoryObject, - address, - ErrorStream)) { + MCDisassembler::DecodeStatus S; + S = Disassembler->getInstruction(*inst, + byteSize, + memoryObject, + address, + ErrorStream); + switch (S) { + case MCDisassembler::Fail: + case MCDisassembler::SoftFail: + // FIXME: Do something different on soft failure mode? delete inst; return NULL; - } else { + case MCDisassembler::Success: { const llvm::EDInstInfo *thisInstInfo = NULL; if (InstInfos) { @@ -256,6 +261,7 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader, EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo); return sdInst; } + } } void EDDisassembler::initMaps(const MCRegisterInfo ®isterInfo) { |