Minor changes for bug fixes in SchedGraph.cpp.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@677 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h
index ef3b4df..76a7663 100644
--- a/lib/CodeGen/InstrSched/SchedGraph.h
+++ b/lib/CodeGen/InstrSched/SchedGraph.h
@@ -33,7 +33,7 @@
class SchedGraphEdge;
class SchedGraphNode;
class SchedGraph;
-class NodeToRegRefMap;
+class RegToRefVecMap;
class MachineInstr;
/******************** Exported Data Types and Constants ********************/
@@ -61,9 +61,9 @@
int minDelay; // cached latency (assumes fixed target arch)
union {
- Value* val;
- int machineRegNum;
- ResourceId resourceId;
+ const Value* val;
+ int machineRegNum;
+ ResourceId resourceId;
};
public:
@@ -79,7 +79,7 @@
// constructor for explicit def-use or memory def-use edge
/*ctor*/ SchedGraphEdge(SchedGraphNode* _src,
SchedGraphNode* _sink,
- Value* _val,
+ const Value* _val,
DataDepOrderType _depOrderType =TrueDep,
int _minDelay = -1);
@@ -293,8 +293,11 @@
//
void buildGraph (const TargetMachine& target);
- void addEdgesForInstruction (SchedGraphNode* node,
- NodeToRegRefMap& regToRefVecMap,
+ void buildNodesforVMInstr (const TargetMachine& target,
+ const Instruction* instr);
+
+ void addEdgesForInstruction (const MachineInstr& minstr,
+ RegToRefVecMap& regToRefVecMap,
const TargetMachine& target);
void addCDEdges (const TerminatorInst* term,
@@ -303,11 +306,14 @@
void addMemEdges (const vector<const Instruction*>& memVec,
const TargetMachine& target);
- void addMachineRegEdges (NodeToRegRefMap& regToRefVecMap,
+ void addMachineRegEdges (RegToRefVecMap& regToRefVecMap,
const TargetMachine& target);
void addSSAEdge (SchedGraphNode* node,
- Value* val,
+ const Value* val,
+ const TargetMachine& target);
+
+ void addNonSSAEdgesForValue (const Instruction* instr,
const TargetMachine& target);
void addDummyEdges ();