From: Bob Wilson <bob.wilson@apple.com>
Date: Fri, 28 Jan 2011 17:50:30 +0000 (+0000)
Subject: PR9030: Fix disassembly of ARM "mov pc, lr" instruction.
X-Git-Tag: android-x86-6.0-r1~1002^2~834
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d11c57a93753e7fd9fdac110e81c88eb56a847e4;p=android-x86%2Fexternal-llvm.git

PR9030: Fix disassembly of ARM "mov pc, lr" instruction.
Patch by Jyun-Yan You.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@124492 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp b/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
index 752e2855dcd..45c6c300aa1 100644
--- a/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
+++ b/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
@@ -801,8 +801,8 @@ static bool DisassembleBrMiscFrm(MCInst &MI, unsigned Opcode, uint32_t insn,
 
   OpIdx = 0;
 
-  // BX_RET has only two predicate operands, do an early return.
-  if (Opcode == ARM::BX_RET)
+  // BX_RET and MOVPCLR have only two predicate operands; do an early return.
+  if (Opcode == ARM::BX_RET || Opcode == ARM::MOVPCLR)
     return true;
 
   // BLXr9 and BX take one GPR reg.
diff --git a/test/MC/Disassembler/ARM/arm-tests.txt b/test/MC/Disassembler/ARM/arm-tests.txt
index e5952f075f4..07d349fc3b8 100644
--- a/test/MC/Disassembler/ARM/arm-tests.txt
+++ b/test/MC/Disassembler/ARM/arm-tests.txt
@@ -9,6 +9,9 @@
 # CHECK:	bfi	r8, r0, #16, #1
 0x10 0x88 0xd0 0xe7
 
+# CHECK:	mov	pc, lr
+0x0e 0xf0 0xa0 0xe1
+
 # CHECK:	cmn	r0, #1
 0x01 0x00 0x70 0xe3