ARM: rGPR is meant to be unpredictable, not undefined

llvm-svn: 184706

diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
index bc874f4b46adb5a64cccfa83697d2315388c17d5..6aaf4c06b3c5e7fd942dad5793c08232af157cb6 100644 (file)
--- 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 4df5309b1366ca035887eaa07a47ac59f80c669b..0fb14de84acc907e9d5edbc23dc3dbc6a2e1ad53 100644 (file)
--- 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 64ba3685cd9bcbdd67cad3e717d5171b24badff7..f969b3a509ea7e93daaa837e50ad1561f9fa26a4 100644 (file)
--- 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