diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-09-03 20:31:23 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-09-03 20:31:23 +0000 |
| commit | 2cc97def7434345e399e4f5f3f2001d6d7a93c6f (patch) | |
| tree | f081444ccf89e0c10a90ab183533c23cd1e034a4 /utils/TableGen/AsmMatcherEmitter.cpp | |
| parent | efeaae8578ce9173a47f9e3fa5c44b90ae60c5ab (diff) | |
| download | llvm-2cc97def7434345e399e4f5f3f2001d6d7a93c6f.tar.gz llvm-2cc97def7434345e399e4f5f3f2001d6d7a93c6f.tar.bz2 llvm-2cc97def7434345e399e4f5f3f2001d6d7a93c6f.tar.xz | |
[ms-inline asm] Asm operands can map to one or more MCOperands. Therefore, add
the NumMCOperands argument to the GetMCInstOperandNum() function that is set
to the number of MCOperands this asm operand mapped to.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163124 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/TableGen/AsmMatcherEmitter.cpp')
| -rw-r--r-- | utils/TableGen/AsmMatcherEmitter.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/utils/TableGen/AsmMatcherEmitter.cpp b/utils/TableGen/AsmMatcherEmitter.cpp index 2127c048c7..a4744bad7e 100644 --- a/utils/TableGen/AsmMatcherEmitter.cpp +++ b/utils/TableGen/AsmMatcherEmitter.cpp @@ -1703,8 +1703,10 @@ static void emitConvertToMCInst(CodeGenTarget &Target, StringRef ClassName, OpOS << "unsigned " << Target.getName() << ClassName << "::\n" << "GetMCInstOperandNumImpl(unsigned Kind, MCInst &Inst,\n" << " const SmallVectorImpl<MCParsedAsmOperand*> " - << "&Operands,\n unsigned OperandNum) {\n" + << "&Operands,\n unsigned OperandNum, unsigned " + << "&NumMCOperands) {\n" << " assert(Kind < CVT_NUM_SIGNATURES && \"Invalid signature!\");\n" + << " NumMCOperands = 0;\n" << " unsigned MCOperandNum = 0;\n" << " uint8_t *Converter = ConversionTable[Kind];\n" << " for (uint8_t *p = Converter; *p; p+= 2) {\n" @@ -1712,6 +1714,10 @@ static void emitConvertToMCInst(CodeGenTarget &Target, StringRef ClassName, << " switch (*p) {\n" << " default: llvm_unreachable(\"invalid conversion entry!\");\n" << " case CVT_Reg:\n" + << " if (*(p + 1) == OperandNum) {\n" + << " NumMCOperands = 1;\n" + << " break;\n" + << " }\n" << " ++MCOperandNum;\n" << " break;\n" << " case CVT_Tied:\n" @@ -1811,6 +1817,10 @@ static void emitConvertToMCInst(CodeGenTarget &Target, StringRef ClassName, // Add a handler for the operand number lookup. OpOS << " case " << Name << ":\n" + << " if (*(p + 1) == OperandNum) {\n" + << " NumMCOperands = " << OpInfo.MINumOperands << ";\n" + << " break;\n" + << " }\n" << " MCOperandNum += " << OpInfo.MINumOperands << ";\n" << " break;\n"; break; @@ -1848,6 +1858,10 @@ static void emitConvertToMCInst(CodeGenTarget &Target, StringRef ClassName, << " break;\n"; OpOS << " case " << Name << ":\n" + << " if (*(p + 1) == OperandNum) {\n" + << " NumMCOperands = 1;\n" + << " break;\n" + << " }\n" << " ++MCOperandNum;\n" << " break;\n"; break; @@ -1877,6 +1891,10 @@ static void emitConvertToMCInst(CodeGenTarget &Target, StringRef ClassName, << " break;\n"; OpOS << " case " << Name << ":\n" + << " if (*(p + 1) == OperandNum) {\n" + << " NumMCOperands = 1;\n" + << " break;\n" + << " }\n" << " ++MCOperandNum;\n" << " break;\n"; } @@ -2583,7 +2601,7 @@ void AsmMatcherEmitter::run(raw_ostream &OS) { OS << " unsigned GetMCInstOperandNumImpl(unsigned Kind, MCInst &Inst,\n " << " const " << "SmallVectorImpl<MCParsedAsmOperand*> &Operands,\n " - << " unsigned OperandNum);\n"; + << " unsigned OperandNum, unsigned &NumMCOperands);\n"; OS << " bool MnemonicIsValid(StringRef Mnemonic);\n"; OS << " unsigned MatchInstructionImpl(\n" << " const SmallVectorImpl<MCParsedAsmOperand*> &Operands,\n" |