From 8175bda3dbbadc3d5c831342dd817d62be926355 Mon Sep 17 00:00:00 2001 From: Amaury de la Vieuville Date: Mon, 24 Jun 2013 09:14:54 +0000 Subject: [PATCH] ARM: rGPR is meant to be unpredictable, not undefined llvm-svn: 184706 --- llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 7 +++++-- llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt | 2 +- llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index bc874f4b46ad..6aaf4c06b3c5 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -916,8 +916,11 @@ static DecodeStatus DecodetcGPRRegisterClass(MCInst &Inst, unsigned RegNo, static DecodeStatus DecoderGPRRegisterClass(MCInst &Inst, unsigned RegNo, uint64_t Address, const void *Decoder) { - if (RegNo == 13 || RegNo == 15) return MCDisassembler::Fail; - return DecodeGPRRegisterClass(Inst, RegNo, Address, Decoder); + DecodeStatus S = MCDisassembler::Success; + if (RegNo == 13 || RegNo == 15) + S = MCDisassembler::SoftFail; + Check(S, DecodeGPRRegisterClass(Inst, RegNo, Address, Decoder)); + return S; } static const uint16_t SPRDecoderTable[] = { diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt index 4df5309b1366..0fb14de84acc 100644 --- a/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt +++ b/llvm/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt @@ -1,4 +1,4 @@ -# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "invalid instruction encoding" +# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "potentially undefined" # Opcode=1930 Name=t2LDRD_PRE Format=ARM_FORMAT_THUMBFRM(25) # 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 diff --git a/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt b/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt index 64ba3685cd9b..f969b3a509ea 100644 --- a/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt +++ b/llvm/test/MC/Disassembler/ARM/invalid-t2STRD_PRE-thumb.txt @@ -1,5 +1,4 @@ -# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "invalid instruction encoding" -# XFAIL: * +# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 2>&1 | grep "potentially undefined" # Opcode=2124 Name=t2STRD_PRE Format=ARM_FORMAT_THUMBFRM(25) # 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0