diff options
| -rw-r--r-- | clang/include/clang/Basic/TargetInfo.h | 2 | ||||
| -rw-r--r-- | clang/lib/Basic/TargetInfo.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h index 633bacf196a..00edc57547d 100644 --- a/clang/include/clang/Basic/TargetInfo.h +++ b/clang/include/clang/Basic/TargetInfo.h @@ -263,7 +263,7 @@ protected: unsigned &NumNames) const = 0; virtual void getGCCRegAliases(const GCCRegAlias *&Aliases, unsigned &NumAliases) const = 0; - virtual bool validateAsmConstraint(char c, + virtual bool validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &info) const= 0; }; diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp index 82b6c190cda..923a75d6228 100644 --- a/clang/lib/Basic/TargetInfo.cpp +++ b/clang/lib/Basic/TargetInfo.cpp @@ -180,7 +180,7 @@ bool TargetInfo::validateOutputConstraint(const char *Name, while (*Name) { switch (*Name) { default: - if (!validateAsmConstraint(*Name, info)) { + if (!validateAsmConstraint(Name, info)) { // FIXME: We temporarily return false // so we can add more constraints as we hit it. // Eventually, an unknown constraint should just be treated as 'g'. @@ -258,7 +258,7 @@ bool TargetInfo::validateInputConstraint(const char *Name, // The constraint should have the same info as the respective // output constraint. info = (ConstraintInfo)(info|OutputConstraints[i]); - } else if (!validateAsmConstraint(*Name, info)) { + } else if (!validateAsmConstraint(Name, info)) { // FIXME: This error return is in place temporarily so we can // add more constraints as we hit it. Eventually, an unknown // constraint should just be treated as 'g'. diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 1aa82829bbe..ef17d2d3421 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -279,9 +279,9 @@ public: unsigned &NumNames) const; virtual void getGCCRegAliases(const GCCRegAlias *&Aliases, unsigned &NumAliases) const; - virtual bool validateAsmConstraint(char c, + virtual bool validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &info) const { - switch (c) { + switch (*Name) { default: return false; case 'O': // Zero return true; @@ -491,7 +491,7 @@ public: Aliases = GCCRegAliases; NumAliases = llvm::array_lengthof(GCCRegAliases); } - virtual bool validateAsmConstraint(char c, + virtual bool validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &info) const; virtual std::string convertConstraint(const char Constraint) const; virtual const char *getClobbers() const { @@ -500,9 +500,9 @@ public: }; bool -X86TargetInfo::validateAsmConstraint(char c, +X86TargetInfo::validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &info) const { - switch (c) { + switch (*Name) { default: return false; case 'a': // eax. case 'b': // ebx. @@ -782,10 +782,10 @@ public: Aliases = 0; NumAliases = 0; } - virtual bool validateAsmConstraint(char c, + virtual bool validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &info) const { // FIXME: Check if this is complete - switch (c) { + switch (*Name) { default: case 'l': // r0-r7 case 'h': // r8-r15 @@ -847,7 +847,7 @@ public: unsigned &NumNames) const; virtual void getGCCRegAliases(const GCCRegAlias *&Aliases, unsigned &NumAliases) const; - virtual bool validateAsmConstraint(char c, + virtual bool validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &info) const { // FIXME: Implement! return false; @@ -958,7 +958,7 @@ namespace { virtual const char *getTargetPrefix() const {return "";} virtual void getGCCRegNames(const char * const *&Names, unsigned &NumNames) const {} - virtual bool validateAsmConstraint(char c, + virtual bool validateAsmConstraint(const char *&Name, TargetInfo::ConstraintInfo &info) const { return true; } |
