diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-10-19 22:57:33 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-10-19 22:57:33 +0000 |
| commit | ab450e42f1ae00d221a86cd41361834dd2ab95bc (patch) | |
| tree | d0c17fdde2646ec67b60733e32b568c1a0a14e61 | |
| parent | 30580cea43ac9108627e0616df6a30518ee7c0ef (diff) | |
[ms-inline asm] Reset the opcode prior to parsing a statement.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166349 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 7 | ||||
| -rw-r--r-- | lib/Target/X86/AsmParser/X86AsmParser.cpp | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 6669780c7d..690684f50a 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -319,6 +319,7 @@ private: // MS-style inline assembly parsing. bool isInstruction() { return Opcode != (unsigned)~0x0; } unsigned getOpcode() { return Opcode; } + void setOpcode(unsigned Value) { Opcode = Value; } }; /// \brief Generic implementations of directive handling, etc. which is shared @@ -3615,7 +3616,11 @@ bool AsmParser::ParseMSInlineAsm(void *AsmLoc, std::string &AsmString, unsigned InputIdx = 0; unsigned OutputIdx = 0; while (getLexer().isNot(AsmToken::Eof)) { - if (ParseStatement()) return true; + // Clear the opcode. + setOpcode(~0x0); + + if (ParseStatement()) + return true; if (isInstruction()) { const MCInstrDesc &Desc = MII->get(getOpcode()); diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp index 70f6ef766f..e07fafcb20 100644 --- a/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -1553,9 +1553,6 @@ MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode, assert(Op->isToken() && "Leading operand should always be a mnemonic!"); ArrayRef<SMRange> EmptyRanges = ArrayRef<SMRange>(); - // Clear the opcode. - Opcode = ~0x0; - // First, handle aliases that expand to multiple instructions. // FIXME: This should be replaced with a real .td file alias mechanism. // Also, MatchInstructionImpl should actually *do* the EmitInstruction |