maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Even more AsmStmt cleanup. 

llvm-svn: 94921
This commit is contained in:
Anders Carlsson 2010-01-30 20:38:10 +00:00
parent 087bc13d96
commit 66de081f39
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/include/clang/AST/Stmt.h
View File

@ -1215,7 +1215,7 @@ public:
/// getOutputConstraint - Return the constraint string for the specified
/// output operand. All output constraints are known to be non-empty (either
/// '=' or '+').
std::string getOutputConstraint(unsigned i) const;
llvm::StringRef getOutputConstraint(unsigned i) const;
const StringLiteral *getOutputConstraintLiteral(unsigned i) const {
return Constraints[i];
@ -1252,7 +1252,7 @@ public:
/// getInputConstraint - Return the specified input constraint. Unlike output
/// constraints, these can be empty.
std::string getInputConstraint(unsigned i) const;
llvm::StringRef getInputConstraint(unsigned i) const;
const StringLiteral *getInputConstraintLiteral(unsigned i) const {
return Constraints[i + NumOutputs];
@ -1267,7 +1267,8 @@ public:
return const_cast<AsmStmt*>(this)->getInputExpr(i);
}
void setOutputsAndInputsAndClobbers(const std::string *Names,
void setOutputsAndInputsAndClobbers(ASTContext &C,
const std::string *Names,
StringLiteral **Constraints,
Stmt **Exprs,
unsigned NumOutputs,
@ -1280,7 +1281,7 @@ public:
/// getNamedOperand - Given a symbolic operand reference like %[foo],
/// translate this into a numeric value needed to reference the same operand.
/// This returns -1 if the operand name is invalid.
int getNamedOperand(const std::string &SymbolicName) const;
int getNamedOperand(llvm::StringRef SymbolicName) const;
unsigned getNumClobbers() const { return Clobbers.size(); }
StringLiteral *getClobber(unsigned i) { return Clobbers[i]; }

17
clang/lib/AST/Stmt.cpp
View File

@ -132,9 +132,8 @@ Expr *AsmStmt::getOutputExpr(unsigned i) {
/// getOutputConstraint - Return the constraint string for the specified
/// output operand. All output constraints are known to be non-empty (either
/// '=' or '+').
std::string AsmStmt::getOutputConstraint(unsigned i) const {
return std::string(Constraints[i]->getStrData(),
Constraints[i]->getByteLength());
llvm::StringRef AsmStmt::getOutputConstraint(unsigned i) const {
return getOutputConstraintLiteral(i)->getString();
}
/// getNumPlusOperands - Return the number of output operands that have a "+"
@ -153,13 +152,13 @@ Expr *AsmStmt::getInputExpr(unsigned i) {
/// getInputConstraint - Return the specified input constraint. Unlike output
/// constraints, these can be empty.
std::string AsmStmt::getInputConstraint(unsigned i) const {
return std::string(Constraints[i + NumOutputs]->getStrData(),
Constraints[i + NumOutputs]->getByteLength());
llvm::StringRef AsmStmt::getInputConstraint(unsigned i) const {
return getInputConstraintLiteral(i)->getString();
}
void AsmStmt::setOutputsAndInputsAndClobbers(const std::string *Names,
void AsmStmt::setOutputsAndInputsAndClobbers(ASTContext &C,
const std::string *Names,
StringLiteral **Constraints,
Stmt **Exprs,
unsigned NumOutputs,
@ -183,7 +182,7 @@ void AsmStmt::setOutputsAndInputsAndClobbers(const std::string *Names,
/// getNamedOperand - Given a symbolic operand reference like %[foo],
/// translate this into a numeric value needed to reference the same operand.
/// This returns -1 if the operand name is invalid.
int AsmStmt::getNamedOperand(const std::string &SymbolicName) const {
int AsmStmt::getNamedOperand(llvm::StringRef SymbolicName) const {
unsigned NumPlusOperands = 0;
// Check if this is an output operand.
@ -311,7 +310,7 @@ unsigned AsmStmt::AnalyzeAsmString(llvm::SmallVectorImpl<AsmStringPiece>&Pieces,
if (NameEnd == CurPtr)
return diag::err_asm_empty_symbolic_operand_name;
std::string SymbolicName(CurPtr, NameEnd);
llvm::StringRef SymbolicName(CurPtr, NameEnd - CurPtr - 1);
int N = getNamedOperand(SymbolicName);
if (N == -1) {

3
clang/lib/Frontend/PCHReaderStmt.cpp
View File

@ -331,7 +331,8 @@ unsigned PCHStmtReader::VisitAsmStmt(AsmStmt *S) {
for (unsigned I = 0; I != NumClobbers; ++I)
Clobbers.push_back(cast_or_null<StringLiteral>(StmtStack[StackIdx++]));
S->setOutputsAndInputsAndClobbers(Names.data(), Constraints.data(),
S->setOutputsAndInputsAndClobbers(*Reader.getContext(),
Names.data(), Constraints.data(),
Exprs.data(), NumOutputs, NumInputs,
Clobbers.data(), NumClobbers);