[cfe-commits] r133226 - in /cfe/trunk: lib/CodeGen/CGStmt.cpp test/CodeGen/arm-asm-variable.c

[Eric Christopher]

Author: echristo
Date: Thu Jun 16 20:53:34 2011
New Revision: 133226

URL: http://llvm.org/viewvc/llvm-project?rev=133226&view=rev
Log:
Check the specific target to figure out if a constraint is a valid
register constraint. Note that we're not checking if the register itself
is valid for the constraint.

Fixes rdar://9382985

Added:
    cfe/trunk/test/CodeGen/arm-asm-variable.c
Modified:
    cfe/trunk/lib/CodeGen/CGStmt.cpp

Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=133226&r1=133225&r2=133226&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Thu Jun 16 20:53:34 2011
@@ -1278,8 +1278,11 @@
     return Constraint;
   llvm::StringRef Register = Attr->getLabel();
   assert(Target.isValidGCCRegisterName(Register));
-  // FIXME: We should check which registers are compatible with "r" or "x".
-  if (Constraint != "r" && Constraint != "x") {
+  // We're using validateOutputConstraint here because we only care if
+  // this is a register constraint.
+  TargetInfo::ConstraintInfo Info(Constraint, "");
+  if (Target.validateOutputConstraint(Info) &&
+      !Info.allowsRegister()) {
     CGM.ErrorUnsupported(&Stmt, "__asm__");
     return Constraint;
   }

Added: cfe/trunk/test/CodeGen/arm-asm-variable.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/arm-asm-variable.c?rev=133226&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/arm-asm-variable.c (added)
+++ cfe/trunk/test/CodeGen/arm-asm-variable.c Thu Jun 16 20:53:34 2011
@@ -0,0 +1,26 @@
+// RUN: %clang_cc1 -triple armv7-apple-darwin9 -emit-llvm -w -o - %s | FileCheck %s
+#include <stdint.h>
+
+#define ldrex_func(p, rl, rh) \
+  __asm__ __volatile__( \
+		       "ldrexd%[_rl], %[_rh], [%[_p]]" \
+		       : [_rl] "=&r" (rl), [_rh] "=&r" (rh) \
+		       : [_p] "p" (p) : "memory")
+
+int64_t foo(int64_t v, volatile int64_t *p)
+{
+  register uint32_t rl asm("r1");
+  register uint32_t rh asm("r2");
+
+  int64_t r;
+  uint32_t t;
+
+  __asm__ __volatile__(							\
+		       "ldrexd%[_rl], %[_rh], [%[_p]]"			\
+		       : [_rl] "=&r" (rl), [_rh] "=&r" (rh)		\
+		       : [_p] "p" (p) : "memory");
+
+  // CHECK: %0 = call %0 asm sideeffect "ldrexd$0, $1, [$2]", "={r1},={r2},r,~{memory}"(i64* %tmp)
+
+  return r;
+}