maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

ARMDisassembler: Always return a size, even when disassembling fails. 

This should fix PR10772.

llvm-svn: 138636
This commit is contained in:
Benjamin Kramer 2011-08-26 18:21:36 +00:00
parent a01bcbfc80
commit aa38dbadca
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
View File

@ -262,8 +262,10 @@ DecodeStatus ARMDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
uint8_t bytes[4]; uint8_t bytes[4];
// We want to read exactly 4 bytes of data. // 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; return Fail;
}
// Encoded as a small-endian 32-bit word in the stream. // Encoded as a small-endian 32-bit word in the stream.
uint32_t insn = (bytes[3] << 24) | uint32_t insn = (bytes[3] << 24) |
@ -329,6 +331,7 @@ DecodeStatus ARMDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
MI.clear(); MI.clear();
Size = 0;
return Fail; return Fail;
} }
@ -442,8 +445,10 @@ DecodeStatus ThumbDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
uint8_t bytes[4]; uint8_t bytes[4];
// We want to read exactly 2 bytes of data. // 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; return Fail;
}
uint16_t insn16 = (bytes[1] << 8) | bytes[0]; uint16_t insn16 = (bytes[1] << 8) | bytes[0];
DecodeStatus result = decodeThumbInstruction16(MI, insn16, Address, this); 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. // 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; return Fail;
}
uint32_t insn32 = (bytes[3] << 8) | uint32_t insn32 = (bytes[3] << 8) |
(bytes[2] << 0) | (bytes[2] << 0) |
@ -568,6 +575,7 @@ DecodeStatus ThumbDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
} }
} }
Size = 0;
return Fail; return Fail;
} }