projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ms-inline asm] Emit an error for unsupported SIZE and LENGTH directives.
[oota-llvm.git]
/
lib
/
Target
/
X86
/
AsmParser
/
X86AsmLexer.cpp
diff --git
a/lib/Target/X86/AsmParser/X86AsmLexer.cpp
b/lib/Target/X86/AsmParser/X86AsmLexer.cpp
index 26797ab353b62b9de61adabc38bd4b05376587ef..2794e60df238ec8cb5b56ae90ce1b021d7085ec5 100644
(file)
--- a/
lib/Target/X86/AsmParser/X86AsmLexer.cpp
+++ b/
lib/Target/X86/AsmParser/X86AsmLexer.cpp
@@
-7,20
+7,19
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Target/TargetAsmLexer.h"
-#include "llvm/Target/TargetRegistry.h"
+#include "MCTargetDesc/X86BaseInfo.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCParser/MCAsmLexer.h"
#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
-#include "X86.h"
+#include "llvm/MC/MCTargetAsmLexer.h"
+#include "llvm/Support/TargetRegistry.h"
+#include "llvm/ADT/SmallVector.h"
using namespace llvm;
namespace {
using namespace llvm;
namespace {
-class X86AsmLexer : public TargetAsmLexer {
+class X86AsmLexer : public
MC
TargetAsmLexer {
const MCAsmInfo &AsmInfo;
bool tentativeIsValid;
const MCAsmInfo &AsmInfo;
bool tentativeIsValid;
@@
-60,14
+59,15
@@
protected:
}
}
public:
}
}
public:
- X86AsmLexer(const Target &T, const MCAsmInfo &MAI)
- : TargetAsmLexer(T), AsmInfo(MAI), tentativeIsValid(false) {
+ X86AsmLexer(const Target &T, const MC
RegisterInfo &MRI, const MC
AsmInfo &MAI)
+ :
MC
TargetAsmLexer(T), AsmInfo(MAI), tentativeIsValid(false) {
}
};
}
};
-}
+}
// end anonymous namespace
-static unsigned MatchRegisterName(StringRef Name);
+#define GET_REGISTER_MATCHER
+#include "X86GenAsmMatcher.inc"
AsmToken X86AsmLexer::LexTokenATT() {
AsmToken lexedToken = lexDefinite();
AsmToken X86AsmLexer::LexTokenATT() {
AsmToken lexedToken = lexDefinite();
@@
-143,11
+143,7
@@
AsmToken X86AsmLexer::LexTokenIntel() {
SetError(Lexer->getErrLoc(), Lexer->getErr());
return lexedToken;
case AsmToken::Identifier: {
SetError(Lexer->getErrLoc(), Lexer->getErr());
return lexedToken;
case AsmToken::Identifier: {
- std::string upperCase = lexedToken.getString().str();
- std::string lowerCase = LowercaseString(upperCase);
- StringRef lowerRef(lowerCase);
-
- unsigned regID = MatchRegisterName(lowerRef);
+ unsigned regID = MatchRegisterName(lexedToken.getString().lower());
if (regID)
return AsmToken(AsmToken::Register,
if (regID)
return AsmToken(AsmToken::Register,
@@
-159,10
+155,6
@@
AsmToken X86AsmLexer::LexTokenIntel() {
}
extern "C" void LLVMInitializeX86AsmLexer() {
}
extern "C" void LLVMInitializeX86AsmLexer() {
- RegisterAsmLexer<X86AsmLexer> X(TheX86_32Target);
- RegisterAsmLexer<X86AsmLexer> Y(TheX86_64Target);
+ Register
MC
AsmLexer<X86AsmLexer> X(TheX86_32Target);
+ Register
MC
AsmLexer<X86AsmLexer> Y(TheX86_64Target);
}
}
-
-#define REGISTERS_ONLY
-#include "X86GenAsmMatcher.inc"
-#undef REGISTERS_ONLY