[cfe-commits] r44311 - in /cfe/trunk: Basic/TargetInfo.cpp Sema/SemaStmt.cpp include/clang/Basic/DiagnosticKinds.def include/clang/Basic/TargetInfo.h test/Sema/asm.c
Anders Carlsson
andersca at mac.com
Sat Nov 24 16:25:21 PST 2007
Author: andersca
Date: Sat Nov 24 18:25:21 2007
New Revision: 44311
URL: http://llvm.org/viewvc/llvm-project?rev=44311&view=rev
Log:
Check that the clobber registers are valid.
Modified:
cfe/trunk/Basic/TargetInfo.cpp
cfe/trunk/Sema/SemaStmt.cpp
cfe/trunk/include/clang/Basic/DiagnosticKinds.def
cfe/trunk/include/clang/Basic/TargetInfo.h
cfe/trunk/test/Sema/asm.c
Modified: cfe/trunk/Basic/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Basic/TargetInfo.cpp?rev=44311&r1=44310&r2=44311&view=diff
==============================================================================
--- cfe/trunk/Basic/TargetInfo.cpp (original)
+++ cfe/trunk/Basic/TargetInfo.cpp Sat Nov 24 18:25:21 2007
@@ -14,8 +14,9 @@
#include "clang/Basic/TargetInfo.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/AST/Builtins.h"
-#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/APFloat.h"
+#include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/STLExtras.h"
#include <set>
using namespace clang;
@@ -270,6 +271,46 @@
/// is a valid register name according to GCC. This is used by Sema for
/// inline asm statements.
bool TargetInfo::isValidGCCRegisterName(const char *Name) const {
- // FIXME: Implement this.
+ const char * const *Names;
+ unsigned NumNames;
+
+ // Get rid of any register prefix.
+ if (Name[0] == '%' || Name[0] == '#')
+ Name++;
+
+ if (strcmp(Name, "memory") == 0 ||
+ strcmp(Name, "cc") == 0)
+ return true;
+
+ PrimaryTarget->getGCCRegNames(Names, NumNames);
+
+ // If we have a number it maps to an entry in the register name array.
+ if (isdigit(Name[0])) {
+ char *End;
+ int n = (int)strtol(Name, &End, 0);
+ if (*End == 0)
+ return n >= 0 && (unsigned)n < NumNames;
+ }
+
+ // Check register names.
+ for (unsigned i = 0; i < NumNames; i++) {
+ if (strcmp(Name, Names[i]) == 0)
+ return true;
+ }
+
+ // Now check aliases.
+ const TargetInfoImpl::GCCRegAlias *Aliases;
+ unsigned NumAliases;
+
+ PrimaryTarget->getGCCRegAliases(Aliases, NumAliases);
+ for (unsigned i = 0; i < NumAliases; i++) {
+ for (unsigned j = 0 ; j < llvm::array_lengthof(Aliases[i].Aliases); j++) {
+ if (!Aliases[i].Aliases[j])
+ break;
+ if (strcmp(Aliases[i].Aliases[j], Name) == 0)
+ return true;
+ }
+ }
+
return false;
}
Modified: cfe/trunk/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaStmt.cpp?rev=44311&r1=44310&r2=44311&view=diff
==============================================================================
--- cfe/trunk/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/Sema/SemaStmt.cpp Sat Nov 24 18:25:21 2007
@@ -16,8 +16,10 @@
#include "clang/AST/Expr.h"
#include "clang/AST/Stmt.h"
#include "clang/Parse/Scope.h"
+#include "clang/Basic/TargetInfo.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LangOptions.h"
+#include "llvm/ADT/SmallString.h"
using namespace clang;
Sema::StmtResult Sema::ActOnExprStmt(ExprTy *expr) {
@@ -691,6 +693,25 @@
}
}
+ // Check that the clobbers are valid.
+ for (unsigned i = 0; i < NumClobbers; i++) {
+ StringLiteral *Literal = cast<StringLiteral>((Expr *)Clobbers[i]);
+ assert(!Literal->isWide() && "Clobber strings should not be wide!");
+
+ llvm::SmallString<16> Clobber(Literal->getStrData(),
+ Literal->getStrData() +
+ Literal->getByteLength());
+
+ if (!Context.Target.isValidGCCRegisterName(Clobber.c_str())) {
+ Diag(Literal->getLocStart(),
+ diag::err_unknown_register_name_in_asm,
+ Clobber.c_str());
+
+ // FIXME: We currently leak memory here.
+ return true;
+ }
+ }
+
return new AsmStmt(AsmLoc,
IsVolatile,
NumOutputs,
Modified: cfe/trunk/include/clang/Basic/DiagnosticKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticKinds.def?rev=44311&r1=44310&r2=44311&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticKinds.def Sat Nov 24 18:25:21 2007
@@ -793,7 +793,9 @@
"invalid lvalue in asm output")
DIAG(err_invalid_type_in_asm_input, ERROR,
"invalid type '%0' in asm input")
-
+DIAG(err_unknown_register_name_in_asm, ERROR,
+ "unknown register name '%0' in asm")
+
// CHECK: printf format string errors
DIAG(warn_printf_not_string_constant, WARNING,
"format string is not a string literal (potentially insecure)")
Modified: cfe/trunk/include/clang/Basic/TargetInfo.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TargetInfo.h?rev=44311&r1=44310&r2=44311&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TargetInfo.h (original)
+++ cfe/trunk/include/clang/Basic/TargetInfo.h Sat Nov 24 18:25:21 2007
@@ -278,7 +278,7 @@
}
virtual void getGCCRegNames(const char * const *&Names,
- unsigned &NumNames) const = 0;
+ unsigned &NumNames) const = 0;
struct GCCRegAlias {
const char * const Aliases[5];
Modified: cfe/trunk/test/Sema/asm.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/asm.c?rev=44311&r1=44310&r2=44311&view=diff
==============================================================================
--- cfe/trunk/test/Sema/asm.c (original)
+++ cfe/trunk/test/Sema/asm.c Sat Nov 24 18:25:21 2007
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang %s -arch=i386 -verify -fsyntax-only
void
f()
@@ -12,3 +12,16 @@
asm ("foo\n" : "=a" (i + 2)); // expected-error {{invalid lvalue in asm output}}
}
+
+void
+clobbers()
+{
+ asm ("nop" : : : "ax", "#ax", "%ax");
+ asm ("nop" : : : "eax", "rax", "ah", "al");
+ asm ("nop" : : : "0", "%0", "#0");
+ asm ("nop" : : : "foo"); // expected-error {{unknown register name 'foo' in asm}}
+ asm ("nop" : : : "52");
+ asm ("nop" : : : "53"); // expected-error {{unknown register name '53' in asm}}
+ asm ("nop" : : : "-1"); // expected-error {{unknown register name '-1' in asm}}
+ asm ("nop" : : : "+1"); // expected-error {{unknown register name '+1' in asm}}
+}
More information about the cfe-commits
mailing list