[ms-inline asm] Remove a bunch of parsing code from the front-end, which will be
reimplemented in the AsmParser where it belongs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165752 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp
index 9b6b6c9..fbd85215 100644
--- a/lib/Sema/SemaStmtAsm.cpp
+++ b/lib/Sema/SemaStmtAsm.cpp
@@ -331,28 +331,6 @@
return Ret;
}
-// Check to see if the expression is a substring of the asm operand.
-static StringRef getMSInlineAsmExprName(StringRef Name) {
- // Strip off the size directives.
- // E.g., DWORD PTR [V] -> V
- if (Name.startswith("BYTE") || Name.startswith("byte") ||
- Name.startswith("WORD") || Name.startswith("word") ||
- Name.startswith("DWORD") || Name.startswith("dword") ||
- Name.startswith("QWORD") || Name.startswith("qword") ||
- Name.startswith("XWORD") || Name.startswith("xword") ||
- Name.startswith("XMMWORD") || Name.startswith("xmmword") ||
- Name.startswith("YMMWORD") || Name.startswith("ymmword")) {
- std::pair< StringRef, StringRef > SplitName = Name.split(' ');
- assert((SplitName.second.startswith("PTR") ||
- SplitName.second.startswith("ptr")) &&
- "Expected PTR/ptr!");
- SplitName = SplitName.second.split('[');
- SplitName = SplitName.second.split(']');
- return SplitName.first;
- }
- return Name;
-}
-
// getSpelling - Get the spelling of the AsmTok token.
static StringRef getSpelling(Sema &SemaRef, Token AsmTok) {
StringRef Asm;
@@ -387,8 +365,7 @@
return false;
for (unsigned i = 1, e = Pieces.size(); i != e; ++i) {
- StringRef Op = getMSInlineAsmExprName(Pieces[i]);
- if (!TI.isValidGCCRegisterName(Op))
+ if (!TI.isValidGCCRegisterName(Pieces[i]))
return false;
}
return true;
@@ -604,13 +581,7 @@
}
// Expr/Input or Output.
- StringRef Name = getMSInlineAsmExprName(Pieces[StrIdx][i]);
-
- // The expr may be a register.
- // E.g., DWORD PTR [eax]
- if (Context.getTargetInfo().isValidGCCRegisterName(Name))
- continue;
-
+ StringRef Name = Pieces[StrIdx][i];
if (IdentifierInfo *II = &Context.Idents.get(Name)) {
CXXScopeSpec SS;
UnqualifiedId Id;
@@ -669,26 +640,6 @@
Pieces[StrIdx][j] = OutputExprNames[i];
break;
}
- // Check to see if the expression is a substring of the asm piece.
- std::pair< StringRef, StringRef > Split = Pieces[StrIdx][j].split(' ');
- bool isKeyword = llvm::StringSwitch<bool>(Split.first)
- .Cases("BYTE", "byte", "WORD", "word", "DWORD", true)
- .Cases("dword", "QWORD", "qword", "XWORD", "xword", true)
- .Cases("XMMWORD", "xmmword", "YMMWORD", "ymmword", true)
- .Default(false);
- if (isKeyword &&
- Split.second.find_first_of(OutputExprNames[i]) != StringRef::npos) {
- // Is is a substring, do the replacement.
- SmallString<32> Res;
- llvm::raw_svector_ostream OS(Res);
- OS << '$' << OpNum;
- std::string piece = Pieces[StrIdx][j].str();
- size_t found = piece.find(InputExprNames[i]);
- piece.replace(found, InputExprNames[i].size(), OS.str());
- OutputExprNames[i] = piece;
- Pieces[StrIdx][j] = OutputExprNames[i];
- break;
- }
}
}
for (unsigned i = 0, e = InputExprNames.size(); i != e; ++i, ++OpNum) {
@@ -704,26 +655,6 @@
Pieces[StrIdx][j] = InputExprNames[i];
break;
}
- // Check to see if the expression is a substring of the asm piece.
- std::pair< StringRef, StringRef > Split = Pieces[StrIdx][j].split(' ');
- bool isKeyword = llvm::StringSwitch<bool>(Split.first)
- .Cases("BYTE", "byte", "WORD", "word", "DWORD", true)
- .Cases("dword", "QWORD", "qword", "XWORD", "xword", true)
- .Cases("XMMWORD", "xmmword", "YMMWORD", "ymmword", true)
- .Default(false);
- if (isKeyword &&
- Split.second.find_first_of(InputExprNames[i]) != StringRef::npos) {
- // It is a substring, do the replacement.
- SmallString<32> Res;
- llvm::raw_svector_ostream OS(Res);
- OS << '$' << OpNum;
- std::string piece = Pieces[StrIdx][j].str();
- size_t found = piece.find(InputExprNames[i]);
- piece.replace(found, InputExprNames[i].size(), OS.str());
- InputExprNames[i] = piece;
- Pieces[StrIdx][j] = InputExprNames[i];
- break;
- }
}
}