diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2011-08-26 18:21:36 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2011-08-26 18:21:36 +0000 |
| commit | 86ce852a15f0c66601dcaf55644d8c4ec268906f (patch) | |
| tree | 06883d96d5eab85c484fca5ceef8a5a48835d058 /lib/Target/ARM/Disassembler/ARMDisassembler.cpp | |
| parent | 96425c846494c1c20a4c931f4783571295ab170c (diff) | |
ARMDisassembler: Always return a size, even when disassembling fails.
This should fix PR10772.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138636 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
| -rw-r--r-- | lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 3fd06a998b..7652e8031e 100644 --- a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -262,8 +262,10 @@ DecodeStatus ARMDisassembler::getInstruction(MCInst &MI, uint64_t &Size, uint8_t bytes[4]; // We want to read exactly 4 bytes of data. - if (Region.readBytes(Address, 4, (uint8_t*)bytes, NULL) == -1) + if (Region.readBytes(Address, 4, (uint8_t*)bytes, NULL) == -1) { + Size = 0; return Fail; + } // Encoded as a small-endian 32-bit word in the stream. uint32_t insn = (bytes[3] << 24) | @@ -329,6 +331,7 @@ DecodeStatus ARMDisassembler::getInstruction(MCInst &MI, uint64_t &Size, MI.clear(); + Size = 0; return Fail; } @@ -442,8 +445,10 @@ DecodeStatus ThumbDisassembler::getInstruction(MCInst &MI, uint64_t &Size, uint8_t bytes[4]; // We want to read exactly 2 bytes of data. - if (Region.readBytes(Address, 2, (uint8_t*)bytes, NULL) == -1) + if (Region.readBytes(Address, 2, (uint8_t*)bytes, NULL) == -1) { + Size = 0; return Fail; + } uint16_t insn16 = (bytes[1] << 8) | bytes[0]; DecodeStatus result = decodeThumbInstruction16(MI, insn16, Address, this); @@ -492,8 +497,10 @@ DecodeStatus ThumbDisassembler::getInstruction(MCInst &MI, uint64_t &Size, } // We want to read exactly 4 bytes of data. - if (Region.readBytes(Address, 4, (uint8_t*)bytes, NULL) == -1) + if (Region.readBytes(Address, 4, (uint8_t*)bytes, NULL) == -1) { + Size = 0; return Fail; + } uint32_t insn32 = (bytes[3] << 8) | (bytes[2] << 0) | @@ -568,6 +575,7 @@ DecodeStatus ThumbDisassembler::getInstruction(MCInst &MI, uint64_t &Size, } } + Size = 0; return Fail; } |