From f44082091c5517a3275c57a8b58e36987c8227f0 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Wed, 24 Aug 2011 22:40:22 +0000 Subject: Perform more thorough checking of t2IT mask parameters, which fixes all remaining crashers when disassembling the entire 16-bit instruction space. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138507 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'lib/Target/ARM/Disassembler/ARMDisassembler.cpp') diff --git a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index e22126956e..83a8f80060 100644 --- a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -230,6 +230,8 @@ static DecodeStatus DecodeThumbBLTargetOperand(llvm::MCInst &Inst, unsigned Val, uint64_t Address, const void *Decoder); static DecodeStatus DecodeITCond(llvm::MCInst &Inst, unsigned Val, uint64_t Address, const void *Decoder); +static DecodeStatus DecodeITMask(llvm::MCInst &Inst, unsigned Val, + uint64_t Address, const void *Decoder); #include "ARMGenDisassemblerTables.inc" #include "ARMGenInstrInfo.inc" @@ -3304,3 +3306,14 @@ static DecodeStatus DecodeITCond(llvm::MCInst &Inst, unsigned Cond, return S; } +static DecodeStatus DecodeITMask(llvm::MCInst &Inst, unsigned Mask, + uint64_t Address, const void *Decoder) { + DecodeStatus S = Success; + if (Mask == 0) { + Mask = 0x8; + CHECK(S, Unpredictable); + } + Inst.addOperand(MCOperand::CreateImm(Mask)); + return S; +} + -- cgit v1.2.3-18-g5258