[llvm-commits] [llvm] r138295 - in /llvm/trunk: lib/Target/ARM/AsmParser/ARMAsmParser.cpp test/MC/ARM/thumb-diagnostics.s

[Jim Grosbach]

Author: grosbach
Date: Mon Aug 22 18:17:34 2011
New Revision: 138295

URL: http://llvm.org/viewvc/llvm-project?rev=138295&view=rev
Log:
Improve error checking for tPUSH and tPOP register lists.

Modified:
    llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
    llvm/trunk/test/MC/ARM/thumb-diagnostics.s

Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=138295&r1=138294&r2=138295&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Mon Aug 22 18:17:34 2011
@@ -3109,6 +3109,26 @@
 
     break;
   }
+  case ARM::tPOP: {
+    for (unsigned i = 2; i < Inst.getNumOperands(); ++i) {
+      unsigned Reg = Inst.getOperand(i).getReg();
+      // Anything other than a low register isn't legal here.
+      if (!isARMLowRegister(Reg) && Reg != ARM::PC)
+        return Error(Operands[2]->getStartLoc(),
+                     "registers must be in range r0-r7 or pc");
+    }
+    break;
+  }
+  case ARM::tPUSH: {
+    for (unsigned i = 2; i < Inst.getNumOperands(); ++i) {
+      unsigned Reg = Inst.getOperand(i).getReg();
+      // Anything other than a low register isn't legal here.
+      if (!isARMLowRegister(Reg) && Reg != ARM::LR)
+        return Error(Operands[2]->getStartLoc(),
+                     "registers must be in range r0-r7 or lr");
+    }
+    break;
+  }
   }
 
   return false;

Modified: llvm/trunk/test/MC/ARM/thumb-diagnostics.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/thumb-diagnostics.s?rev=138295&r1=138294&r2=138295&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/thumb-diagnostics.s (original)
+++ llvm/trunk/test/MC/ARM/thumb-diagnostics.s Mon Aug 22 18:17:34 2011
@@ -57,6 +57,18 @@
 @ CHECK-ERRORS:               ^
 
 
+@ Invalid writeback and register lists for PUSH/POP
+        pop {r1, r2, r10}
+        push {r8, r9}
+@ CHECK-ERRORS: error: registers must be in range r0-r7 or pc
+@ CHECK-ERRORS:         pop {r1, r2, r10}
+@ CHECK-ERRORS:             ^
+@ CHECK-ERRORS: error: registers must be in range r0-r7 or lr
+@ CHECK-ERRORS:         push {r8, r9}
+@ CHECK-ERRORS:              ^
+
+
+
 @ Out of range immediates for LSL instruction.
         lsls r4, r5, #-1
         lsls r4, r5, #32