6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-10 04:33:40 +00:00
Code Issues Projects Releases Wiki Activity

Rename CountMemOperands to ComputeMemOperandsEnd to reflect what

Browse Source 
it actually does. Simplify CountOperands a little by reusing
ComputeMemOperandsEnd. And reword some comments for both.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47198 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2008-02-16 00:36:48 +00:00
parent 94ebde1d45
commit 42a77880a8
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/CodeGen/ScheduleDAG.h
View File

@ -315,13 +315,14 @@ namespace llvm {
static unsigned CountResults(SDNode *Node); static unsigned CountResults(SDNode *Node);
/// CountOperands - The inputs to target nodes have any actual inputs first, /// CountOperands - The inputs to target nodes have any actual inputs first,
/// followed by optional memory operands chain operand, then flag operands. /// followed by special operands that describe memory references, then an
/// Compute the number of actual operands that will go into the machine /// optional chain operand, then flag operands. Compute the number of
/// instr. /// actual operands that will go into the resulting MachineInstr.
static unsigned CountOperands(SDNode *Node); static unsigned CountOperands(SDNode *Node);
/// CountMemOperands - Find the index of the last MemOperandSDNode /// ComputeMemOperandsEnd - Find the index one past the last
static unsigned CountMemOperands(SDNode *Node); /// MemOperandSDNode operand
static unsigned ComputeMemOperandsEnd(SDNode *Node);
/// EmitNode - Generate machine code for an node and needed dependencies. /// EmitNode - Generate machine code for an node and needed dependencies.
/// VRBaseMap contains, for each already emitted node, the first virtual /// VRBaseMap contains, for each already emitted node, the first virtual

21
lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
View File

@ -279,22 +279,19 @@ unsigned ScheduleDAG::CountResults(SDNode *Node) {
} }
/// CountOperands - The inputs to target nodes have any actual inputs first, /// CountOperands - The inputs to target nodes have any actual inputs first,
/// followed by optional memory operands chain operand, then flag operands. /// followed by special operands that describe memory references, then an
/// Compute the number of actual operands that will go into the resulting /// optional chain operand, then flag operands. Compute the number of
/// MachineInstr. /// actual operands that will go into the resulting MachineInstr.
unsigned ScheduleDAG::CountOperands(SDNode *Node) { unsigned ScheduleDAG::CountOperands(SDNode *Node) {
unsigned N = Node->getNumOperands(); unsigned N = ComputeMemOperandsEnd(Node);
while (N && Node->getOperand(N - 1).getValueType() == MVT::Flag)
--N;
if (N && Node->getOperand(N - 1).getValueType() == MVT::Other)
--N; // Ignore chain if it exists.
while (N && isa<MemOperandSDNode>(Node->getOperand(N - 1).Val)) while (N && isa<MemOperandSDNode>(Node->getOperand(N - 1).Val))
--N; // Ignore MemOperand nodes --N; // Ignore MemOperand nodes
return N; return N;
} }
/// CountMemOperands - Find the index of the last MemOperandSDNode operand /// ComputeMemOperandsEnd - Find the index one past the last MemOperandSDNode
unsigned ScheduleDAG::CountMemOperands(SDNode *Node) { /// operand
unsigned ScheduleDAG::ComputeMemOperandsEnd(SDNode *Node) {
unsigned N = Node->getNumOperands(); unsigned N = Node->getNumOperands();
while (N && Node->getOperand(N - 1).getValueType() == MVT::Flag) while (N && Node->getOperand(N - 1).getValueType() == MVT::Flag)
--N; --N;
@ -698,7 +695,7 @@ void ScheduleDAG::EmitNode(SDNode *Node, unsigned InstanceNo,
unsigned NumResults = CountResults(Node); unsigned NumResults = CountResults(Node);
unsigned NodeOperands = CountOperands(Node); unsigned NodeOperands = CountOperands(Node);
unsigned NodeMemOperands = CountMemOperands(Node); unsigned MemOperandsEnd = ComputeMemOperandsEnd(Node);
unsigned NumMIOperands = NodeOperands + NumResults; unsigned NumMIOperands = NodeOperands + NumResults;
bool HasPhysRegOuts = (NumResults > II.getNumDefs()) && bool HasPhysRegOuts = (NumResults > II.getNumDefs()) &&
II.getImplicitDefs() != 0; II.getImplicitDefs() != 0;
@ -722,7 +719,7 @@ void ScheduleDAG::EmitNode(SDNode *Node, unsigned InstanceNo,
AddOperand(MI, Node->getOperand(i), i+II.getNumDefs(), &II, VRBaseMap); AddOperand(MI, Node->getOperand(i), i+II.getNumDefs(), &II, VRBaseMap);
// Emit all of the memory operands of this instruction // Emit all of the memory operands of this instruction
for (unsigned i = NodeOperands; i != NodeMemOperands; ++i) for (unsigned i = NodeOperands; i != MemOperandsEnd; ++i)
AddMemOperand(MI, cast<MemOperandSDNode>(Node->getOperand(i))->MO); AddMemOperand(MI, cast<MemOperandSDNode>(Node->getOperand(i))->MO);
// Commute node if it has been determined to be profitable. // Commute node if it has been determined to be profitable.