diff options
author | Renato Golin <renato.golin@linaro.org> | 2016-09-15 18:10:44 +0000 |
---|---|---|
committer | Renato Golin <renato.golin@linaro.org> | 2016-09-15 18:10:44 +0000 |
commit | 69e56220929e4bffe0cd01251f47e1540809c3d9 (patch) | |
tree | ed07f5753bcc2f22e05b6b9fb8b141ab072de4a4 | |
parent | 7d62f518b6ddf94966c97430fd7c6bb62d24cdb6 (diff) | |
download | llvm-69e56220929e4bffe0cd01251f47e1540809c3d9.tar.gz |
[3.9.1] Merging r281319 [ARM] Support ldr.w in pseudo instruction ldr rd,=immediate
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_39@281634 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Target/ARM/ARMInstrThumb2.td | 4 | ||||
-rw-r--r-- | lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 3 | ||||
-rw-r--r-- | test/MC/ARM/ldr-pseudo-wide.s | 71 |
3 files changed, 78 insertions, 0 deletions
diff --git a/lib/Target/ARM/ARMInstrThumb2.td b/lib/Target/ARM/ARMInstrThumb2.td index fe699b284882..db8b9fb923bf 100644 --- a/lib/Target/ARM/ARMInstrThumb2.td +++ b/lib/Target/ARM/ARMInstrThumb2.td @@ -4819,6 +4819,10 @@ def : t2InstAlias<"add${p} $Rd, pc, $imm", def t2LDRConstPool : t2AsmPseudo<"ldr${p} $Rt, $immediate", (ins GPRnopc:$Rt, const_pool_asm_imm:$immediate, pred:$p)>; +// Version w/ the .w suffix. +def : t2InstAlias<"ldr${p}.w $Rt, $immediate", + (t2LDRConstPool GPRnopc:$Rt, + const_pool_asm_imm:$immediate, pred:$p)>; // PLD/PLDW/PLI with alternate literal form. def : t2InstAlias<"pld${p} $addr", diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index 7d49302f9a96..f5de8a3cd25e 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -6933,6 +6933,9 @@ bool ARMAsmParser::processInstruction(MCInst &Inst, else if (Inst.getOpcode() == ARM::t2LDRConstPool) TmpInst.setOpcode(ARM::t2LDRpci); const ARMOperand &PoolOperand = + (static_cast<ARMOperand &>(*Operands[2]).isToken() && + static_cast<ARMOperand &>(*Operands[2]).getToken() == ".w") ? + static_cast<ARMOperand &>(*Operands[4]) : static_cast<ARMOperand &>(*Operands[3]); const MCExpr *SubExprVal = PoolOperand.getConstantPoolImm(); // If SubExprVal is a constant we may be able to use a MOV diff --git a/test/MC/ARM/ldr-pseudo-wide.s b/test/MC/ARM/ldr-pseudo-wide.s new file mode 100644 index 000000000000..ae1799f706ac --- /dev/null +++ b/test/MC/ARM/ldr-pseudo-wide.s @@ -0,0 +1,71 @@ +@ Test case for PR30352 +@ Check that ldr.w is: +@ accepted and ignored for ARM +@ accepted and propagated for Thumb2 +@ rejected as needing Thumb2 for Thumb + +@RUN: llvm-mc -triple armv5-unknown-linux-gnueabi %s | FileCheck --check-prefix=CHECK-ARM --check-prefix=CHECK %s +@RUN: llvm-mc -triple armv7-base-apple-darwin %s | FileCheck --check-prefix=CHECK-DARWIN-ARM --check-prefix=CHECK-DARWIN %s +@RUN: llvm-mc -triple thumbv7-unknown-linux-gnueabi %s | FileCheck --check-prefix=CHECK-THUMB2 --check-prefix=CHECK %s +@RUN: llvm-mc -triple thumbv7-base-apple-darwin %s | FileCheck --check-prefix=CHECK-DARWIN-THUMB2 --check-prefix=CHECK-DARWIN %s +@RUN: not llvm-mc -triple thumbv6-unknown-linux-gnueabi %s 2>&1 | FileCheck --check-prefix=CHECK-THUMB %s +@RUN: not llvm-mc -triple thumbv6-base-apple-darwin %s 2>&1 | FileCheck --check-prefix=CHECK-THUMB %s +@ CHECK-LABEL: f1: +f1: + ldr r0, =0x10002 +@ CHECK-ARM: ldr r0, .Ltmp[[TMP0:[0-9]+]] +@ CHECK-DARWIN-ARM: ldr r0, Ltmp0 +@ CHECK-THUMB2: ldr r0, .Ltmp[[TMP0:[0-9]+]] +@ CHECK-DARWIN-THUMB2: ldr r0, Ltmp0 + + ldr.w r0, =0x10002 +@ CHECK-ARM: ldr r0, .Ltmp[[TMP1:[0-9]+]] +@ CHECK-DARWIN-ARM: ldr r0, Ltmp1 +@ CHECK-THUMB2: ldr.w r0, .Ltmp[[TMP1:[0-9]+]] +@ CHECK-DARWIN-THUMB2: ldr.w r0, Ltmp1 +@ CHECK-THUMB: error: instruction requires: thumb2 +@ CHECK-THUMB-NEXT: ldr.w r0, =0x10002 + +@ CHECK-LABEL: f2: +f2: + ldr r0, =foo +@ CHECK-ARM: ldr r0, .Ltmp[[TMP2:[0-9]+]] +@ CHECK-DARWIN-ARM: ldr r0, Ltmp2 +@ CHECK-THUMB2: ldr r0, .Ltmp[[TMP2:[0-9]+]] +@ CHECK-DARWIN-THUMB2: ldr r0, Ltmp2 + + ldr.w r0, =foo +@ CHECK-ARM: ldr r0, .Ltmp[[TMP3:[0-9]+]] +@ CHECK-DARWIN-ARM: ldr r0, Ltmp3 +@ CHECK-THUMB2: ldr.w r0, .Ltmp[[TMP3:[0-9]+]] +@ CHECK-DARWIN-THUMB2: ldr.w r0, Ltmp3 +@ CHECK-THUMB: error: instruction requires: thumb2 +@ CHECK-THUMB-NEXT: ldr.w r0, =foo + +@ CHECK-LABEL: f3: +f3: + ldr.w r1, =0x1 +@ CHECK-ARM: mov r1, #1 +@ CHECK-DARWIN-ARM: mov r1, #1 +@ CHECK-THUMB2: mov.w r1, #1 +@ CHECK-DARWIN-THUMB2: mov.w r1, #1 +@ CHECK-THUMB: error: instruction requires: thumb2 +@ CHECK-THUMB-NEXT: ldr.w r1, =0x1 + +@ CHECK: .Ltmp0: +@ CHECK-NEXT: .long 65538 +@ CHECK: .Ltmp1: +@ CHECK-NEXT: .long 65538 +@ CHECK: .Ltmp2: +@ CHECK-NEXT: .long foo +@ CHECK: .Ltmp3: +@ CHECK-NEXT: .long foo + +@ CHECK-DARWIN: Ltmp0: +@ CHECK-DARWIN-NEXT: .long 65538 +@ CHECK-DARWIN: Ltmp1: +@ CHECK-DARWIN-NEXT: .long 65538 +@ CHECK-DARWIN: Ltmp2: +@ CHECK-DARWIN-NEXT: .long foo +@ CHECK-DARWIN: Ltmp3: +@ CHECK-DARWIN-NEXT: .long foo |