6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 04:33:05 +00:00
Code Issues Projects Releases Wiki Activity

Fixed the arm disassembly of invalid BFI instructions to not build a bad MCInst

Browse Source 
which would then cause an assert when printed.  rdar://11437956


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168960 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kevin Enderby 2012-11-29 23:47:11 +00:00
parent 5cf823cd82
commit 1c83093cd5
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Target/ARM/Disassembler/ARMDisassembler.cpp
View File

@ -1281,7 +1281,13 @@ static DecodeStatus DecodeBitfieldMaskOperand(MCInst &Inst, unsigned Val,
unsigned lsb = fieldFromInstruction(Val, 0, 5);
DecodeStatus S = MCDisassembler::Success;
if (lsb > msb) Check(S, MCDisassembler::SoftFail);
if (lsb > msb) {
Check(S, MCDisassembler::SoftFail);
// The check above will cause the warning for the "potentially undefined
// instruction encoding" but we can't build a bad MCOperand value here
// with a lsb > msb or else printing the MCInst will cause a crash.
lsb = msb;
}
uint32_t msb_mask = 0xFFFFFFFF;
if (msb != 31) msb_mask = (1U << (msb+1)) - 1;

11
test/MC/Disassembler/ARM/unpredictable-BFI.txt Normal file
View File

@ -0,0 +1,11 @@
# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 2>&1 | FileCheck %s
# rdar://11437956
# CHECK: warning: invalid instruction encoding
# CHECK: 0x90 0x00 0xc0 0xe7
0x90 0x00 0xc0 0xe7
# CHECK: warning: invalid instruction encoding
# CHECK: 0x90 0x01 0xc0 0xe7
0x90 0x01 0xc0 0xe7