ARM: further improve deprecated diagnosis (LDM)

The ARM ARM states:
  LDM/LDMIA/LDMFD:
    The SP can be in the list. However, ARM deprecates using these instructions
    with SP in the list.

    ARM deprecates using these instructions with both the LR and the PC in the
    list.

  LDMDA/LDMFA/LDMDB/LDMEA/LDMIB/LDMED:
    The SP can be in the list. However, instructions that include the SP in the
    list are deprecated.

    Instructions that include both the LR and the PC in the list are deprecated.

  POP:
    The SP can only be in the list before ARMv7. ARM deprecates any use of ARM
    instructions that include the SP, and the value of the SP after such an
    instruction is UNKNOWN.

    ARM deprecates the use of this instruction with both the LR and the PC in
    the list.

Attempt to diagnose use of deprecated forms of these instructions.  This mirrors
the previous changes to diagnose use of the deprecated forms of STM in ARM mode.

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

diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td
index db58ea8fca2cb18caa7c42a2c0168c07fb330d17..3d9a1106a83c5d63fbcef96018d2ae71f3aadf98 100644 (file)
--- a/lib/Target/ARM/ARMInstrInfo.td
+++ b/lib/Target/ARM/ARMInstrInfo.td
@@ -3163,7 +3163,7 @@ let hasSideEffects = 0 in {
 
 let mayLoad = 1, hasExtraDefRegAllocReq = 1 in
 defm LDM : arm_ldst_mult<"ldm", "", 1, 0, LdStMulFrm, IIC_iLoad_m,
-                         IIC_iLoad_mu>;
+                         IIC_iLoad_mu>, ComplexDeprecationPredicate<"ARMLoad">;
 
 let mayStore = 1, hasExtraSrcRegAllocReq = 1 in
 defm STM : arm_ldst_mult<"stm", "", 0, 0, LdStMulFrm, IIC_iStore_m,

diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index ecc7f0b1650e149b9b3c7203ac3ac45f58dea406..2cbc071f74e9438c81ddb684469ebf03ca1680cf 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -92,6 +92,38 @@ static bool getARMStoreDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
   return false;
 }
 
+static bool getARMLoadDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
+                                      std::string &Info) {
+  if (STI.getFeatureBits() & llvm::ARM::ModeThumb)
+    return false;
+
+  assert(MI.getNumOperands() >= 4 && "expected >= 4 arguments");
+  bool ListContainsPC = false, ListContainsLR = false;
+  for (unsigned OI = 4, OE = MI.getNumOperands(); OI < OE; ++OI) {
+    assert(MI.getOperand(OI).isReg() && "expected register");
+    switch (MI.getOperand(OI).getReg()) {
+    default:
+      break;
+    case ARM::LR:
+      ListContainsLR = true;
+      break;
+    case ARM::PC:
+      ListContainsPC = true;
+      break;
+    case ARM::SP:
+      Info = "use of SP in the list is deprecated";
+      return true;
+    }
+  }
+
+  if (ListContainsPC && ListContainsLR) {
+    Info = "use of LR and PC simultaneously in the list is deprecated";
+    return true;
+  }
+
+  return false;
+}
+
 #define GET_INSTRINFO_MC_DESC
 #include "ARMGenInstrInfo.inc"
 

diff --git a/test/MC/ARM/arm-load-store-multiple-deprecated.s b/test/MC/ARM/arm-load-store-multiple-deprecated.s
new file mode 100644 (file)
index 0000000..9354822
--- /dev/null
+++ b/test/MC/ARM/arm-load-store-multiple-deprecated.s
@@ -0,0 +1,222 @@
+@ RUN: llvm-mc -triple armv6t2-linux-eabi -filetype asm -o - %s 2>&1 \
+@ RUN:   | FileCheck %s
+
+@ RUN: not llvm-mc -triple armv7-linux-eabi -filetype asm -o - %s 2>&1 \
+@ RUN:   | FileCheck %s -check-prefix CHECK -check-prefix CHECK-V7
+
+       .syntax unified
+       .arm
+
+       .global stm
+       .type stm,%function
+stm:
+       stm sp!, {r0, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stm sp!, {r0, pc}
+@ CHECK: ^
+       stm r0!, {r0, sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stm r0!, {r0, sp}
+@ CHECK: ^
+       stm r1!, {r0, sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stm r1!, {r0, sp, pc}
+@ CHECK: ^
+       stm r2!, {sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stm r2!, {sp, pc}
+@ CHECK: ^
+       stm sp!, {pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stm sp!, {pc}
+@ CHECK: ^
+       stm r0!, {sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stm r0!, {sp}
+@ CHECK: ^
+
+       .global stmda
+       .type stmda,%function
+stmda:
+       stmda sp!, {r0, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmda sp!, {r0, pc}
+@ CHECK: ^
+       stmda r0!, {r0, sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmda r0!, {r0, sp}
+@ CHECK: ^
+       stmda r1!, {r0, sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmda r1!, {r0, sp, pc}
+@ CHECK: ^
+       stmda r2!, {sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmda r2!, {sp, pc}
+@ CHECK: ^
+       stmda sp!, {pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmda sp!, {pc}
+@ CHECK: ^
+       stmda r0!, {sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmda r0!, {sp}
+@ CHECK: ^
+
+       .global stmdb
+       .type stmdb,%function
+stmdb:
+       stmdb sp!, {r0, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmdb sp!, {r0, pc}
+@ CHECK: ^
+       stmdb r0!, {r0, sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmdb r0!, {r0, sp}
+@ CHECK: ^
+       stmdb r1!, {r0, sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmdb r1!, {r0, sp, pc}
+@ CHECK: ^
+       stmdb r2!, {sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmdb r2!, {sp, pc}
+@ CHECK: ^
+       stmdb sp!, {pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmdb sp!, {pc}
+@ CHECK: ^
+       stmdb r0!, {sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmdb r0!, {sp}
+@ CHECK: ^
+
+       .global stmib
+       .type stmib,%function
+stmib:
+       stmib sp!, {r0, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmib sp!, {r0, pc}
+@ CHECK: ^
+       stmib r0!, {r0, sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmib r0!, {r0, sp}
+@ CHECK: ^
+       stmib r1!, {r0, sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmib r1!, {r0, sp, pc}
+@ CHECK: ^
+       stmib r2!, {sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmib r2!, {sp, pc}
+@ CHECK: ^
+       stmib sp!, {pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmib sp!, {pc}
+@ CHECK: ^
+       stmib r0!, {sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: stmib r0!, {sp}
+@ CHECK: ^
+
+
+       .global push
+       .type push,%function
+push:
+       push {r0, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: push {r0, pc}
+@ CHECK: ^
+       push {r0, sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: push {r0, sp}
+@ CHECK: ^
+       push {r0, sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: push {r0, sp, pc}
+@ CHECK: ^
+       push {sp, pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: push {sp, pc}
+@ CHECK: ^
+       push {pc}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: push {pc}
+@ CHECK: ^
+       push {sp}
+@ CHECK: warning: use of SP or PC in the list is deprecated
+@ CHECK: push {sp}
+@ CHECK: ^
+
+       .global ldm
+       .type ldm,%function
+ldm:
+       ldm r0!, {r1, sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldm r0!, {sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldm r0!, {r1, lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+       ldm r0!, {lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+
+       .global ldmda
+       .type ldmda,%function
+ldmda:
+       ldmda r0!, {r1, sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldmda r0!, {sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldmda r0!, {r1, lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+       ldmda r0!, {lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+
+       .global ldmdb
+       .type ldmdb,%function
+ldmdb:
+       ldmdb r0!, {r1, sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldmdb r0!, {sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldmdb r0!, {r1, lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+       ldmdb r0!, {lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+
+       .global ldmib
+       .type ldmib,%function
+ldmib:
+       ldmib r0!, {r1, sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldmib r0!, {sp}
+@ CHECK: warning: use of SP in the list is deprecated
+       ldmib r0!, {r1, lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+       ldmib r0!, {lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+
+       .global pop
+       .type pop,%function
+pop:
+       pop {r0, sp}
+@ CHECK: warning: use of SP in the list is deprecated
+@ CHECK-V7: error: writeback register not allowed in register list
+       pop {sp}
+@ CHECK: warning: use of SP in the list is deprecated
+@ CHECK-V7: error: writeback register not allowed in register list
+       pop {r0, lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+       pop {lr, pc}
+@ CHECK: warning: use of LR and PC simultaneously in the list is deprecated
+
+       .global valid
+       .type valid,%function
+valid:
+       stmdaeq r0, {r0}
+@ CHECK: stmdaeq r0, {r0}
+       ldmdaeq r0, {r0}
+@ CHECK: ldmdaeq r0, {r0}
+       pop {r0, pc}
+@ CHECK: pop {r0, pc}
+

diff --git a/test/MC/ARM/arm-store-deprecated.s b/test/MC/ARM/arm-store-deprecated.s
deleted file mode 100644 (file)
index 8a598ab..0000000
--- a/test/MC/ARM/arm-store-deprecated.s
+++ /dev/null
@@ -1,153 +0,0 @@
-@ RUN: llvm-mc -triple armv7-linux-eabi -filetype asm -o /dev/null %s 2>&1 \
-@ RUN:   | FileCheck %s
-
-       .syntax unified
-       .arm
-
-       .global stm
-       .type stm,%function
-stm:
-       stm sp!, {r0, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stm sp!, {r0, pc}
-@ CHECK: ^
-       stm r0!, {r0, sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stm r0!, {r0, sp}
-@ CHECK: ^
-       stm r1!, {r0, sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stm r1!, {r0, sp, pc}
-@ CHECK: ^
-       stm r2!, {sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stm r2!, {sp, pc}
-@ CHECK: ^
-       stm sp!, {pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stm sp!, {pc}
-@ CHECK: ^
-       stm r0!, {sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stm r0!, {sp}
-@ CHECK: ^
-
-       .global stmda
-       .type stmda,%function
-stmda:
-       stmda sp!, {r0, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmda sp!, {r0, pc}
-@ CHECK: ^
-       stmda r0!, {r0, sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmda r0!, {r0, sp}
-@ CHECK: ^
-       stmda r1!, {r0, sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmda r1!, {r0, sp, pc}
-@ CHECK: ^
-       stmda r2!, {sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmda r2!, {sp, pc}
-@ CHECK: ^
-       stmda sp!, {pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmda sp!, {pc}
-@ CHECK: ^
-       stmda r0!, {sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmda r0!, {sp}
-@ CHECK: ^
-
-       .global stmdb
-       .type stmdb,%function
-stmdb:
-       stmdb sp!, {r0, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmdb sp!, {r0, pc}
-@ CHECK: ^
-       stmdb r0!, {r0, sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmdb r0!, {r0, sp}
-@ CHECK: ^
-       stmdb r1!, {r0, sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmdb r1!, {r0, sp, pc}
-@ CHECK: ^
-       stmdb r2!, {sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmdb r2!, {sp, pc}
-@ CHECK: ^
-       stmdb sp!, {pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmdb sp!, {pc}
-@ CHECK: ^
-       stmdb r0!, {sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmdb r0!, {sp}
-@ CHECK: ^
-
-       .global stmib
-       .type stmib,%function
-stmib:
-       stmib sp!, {r0, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmib sp!, {r0, pc}
-@ CHECK: ^
-       stmib r0!, {r0, sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmib r0!, {r0, sp}
-@ CHECK: ^
-       stmib r1!, {r0, sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmib r1!, {r0, sp, pc}
-@ CHECK: ^
-       stmib r2!, {sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmib r2!, {sp, pc}
-@ CHECK: ^
-       stmib sp!, {pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmib sp!, {pc}
-@ CHECK: ^
-       stmib r0!, {sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: stmib r0!, {sp}
-@ CHECK: ^
-
-
-       .global push
-       .type push,%function
-push:
-       push {r0, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: push {r0, pc}
-@ CHECK: ^
-       push {r0, sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: push {r0, sp}
-@ CHECK: ^
-       push {r0, sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: push {r0, sp, pc}
-@ CHECK: ^
-       push {sp, pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: push {sp, pc}
-@ CHECK: ^
-       push {pc}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: push {pc}
-@ CHECK: ^
-       push {sp}
-@ CHECK: warning: use of SP or PC in the list is deprecated
-@ CHECK: push {sp}
-@ CHECK: ^
-
-       .global single
-       .type single,%function
-single:
-       stmdaeq r0, {r0}
-@ CHECK-NOT: warning
-