From 98d2d07d416b3431a298eec5a2bfe8b39652c3aa Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Mon, 8 Sep 2008 08:39:33 +0000 Subject: Correctly handle physical register inputs. They are not explicit input operands in the resulting machine instrs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55893 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/FastISelEmitter.cpp | 39 +++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'utils/TableGen/FastISelEmitter.cpp') diff --git a/utils/TableGen/FastISelEmitter.cpp b/utils/TableGen/FastISelEmitter.cpp index 7f8a358bc3..0aa9dfc49d 100644 --- a/utils/TableGen/FastISelEmitter.cpp +++ b/utils/TableGen/FastISelEmitter.cpp @@ -114,7 +114,7 @@ struct OperandsSignature { return false; Record *OpLeafRec = OpDI->getDef(); // For now, the only other thing we accept is register operands. - + const CodeGenRegisterClass *RC = 0; if (OpLeafRec->isSubClassOf("RegisterClass")) RC = &Target.getRegisterClass(OpLeafRec); @@ -157,21 +157,27 @@ struct OperandsSignature { void PrintArguments(std::ostream &OS, const std::vector& PR) const { assert(PR.size() == Operands.size()); + bool PrintedArg = false; for (unsigned i = 0, e = Operands.size(); i != e; ++i) { - if (PR[i] != "") { - OS << PR[i]; - } else if (Operands[i] == "r") { + if (PR[i] != "") + // Implicit physical register operand. + continue; + + if (PrintedArg) + OS << ", "; + if (Operands[i] == "r") { OS << "Op" << i; + PrintedArg = true; } else if (Operands[i] == "i") { OS << "imm" << i; + PrintedArg = true; } else if (Operands[i] == "f") { OS << "f" << i; + PrintedArg = true; } else { assert("Unknown operand kind!"); abort(); } - if (i + 1 != e) - OS << ", "; } } @@ -193,6 +199,20 @@ struct OperandsSignature { } + void PrintManglingSuffix(std::ostream &OS, + const std::vector& PR) const { + for (unsigned i = 0, e = Operands.size(); i != e; ++i) { + if (PR[i] != "") + // Implicit physical register operand. e.g. Instruction::Mul expect to + // select to a binary op. On x86, mul may take a single operand with + // the other operand being implicit. We must emit something that looks + // like a binary instruction except for the very inner FastEmitInst_* + // call. + continue; + OS << Operands[i]; + } + } + void PrintManglingSuffix(std::ostream &OS) const { for (unsigned i = 0, e = Operands.size(); i != e; ++i) { OS << Operands[i]; @@ -430,7 +450,7 @@ void FastISelMap::PrintFunctionDefinitions(std::ostream &OS) { OS << " return FastEmitInst_"; if (Memo.SubRegNo == (unsigned char)~0) { - Operands.PrintManglingSuffix(OS); + Operands.PrintManglingSuffix(OS, *Memo.PhysRegs); OS << "(" << InstNS << Memo.Name << ", "; OS << InstNS << Memo.RC->getName() << "RegisterClass"; if (!Operands.empty()) @@ -497,7 +517,8 @@ void FastISelMap::PrintFunctionDefinitions(std::ostream &OS) { // Emit code for each possible instruction. There may be // multiple if there are subtarget concerns. - for (PredMap::const_iterator PI = PM.begin(), PE = PM.end(); PI != PE; ++PI) { + for (PredMap::const_iterator PI = PM.begin(), PE = PM.end(); PI != PE; + ++PI) { std::string PredicateCheck = PI->first; const InstructionMemo &Memo = PI->second; @@ -523,7 +544,7 @@ void FastISelMap::PrintFunctionDefinitions(std::ostream &OS) { OS << " return FastEmitInst_"; if (Memo.SubRegNo == (unsigned char)~0) { - Operands.PrintManglingSuffix(OS); + Operands.PrintManglingSuffix(OS, *Memo.PhysRegs); OS << "(" << InstNS << Memo.Name << ", "; OS << InstNS << Memo.RC->getName() << "RegisterClass"; if (!Operands.empty()) -- cgit v1.2.3-70-g09d2