[llvm-commits] CVS: llvm/include/llvm/Target/TargetSchedInfo.h

[Tanya Brethour]

Changes in directory llvm/include/llvm/Target:

TargetSchedInfo.h updated: 1.22 -> 1.23

---
Log message:

Removing MachineResource class.


---
Diffs of the changes:  (+5 -15)

Index: llvm/include/llvm/Target/TargetSchedInfo.h
diff -u llvm/include/llvm/Target/TargetSchedInfo.h:1.22 llvm/include/llvm/Target/TargetSchedInfo.h:1.23
--- llvm/include/llvm/Target/TargetSchedInfo.h:1.22	Sun Feb 29 02:40:03 2004
+++ llvm/include/llvm/Target/TargetSchedInfo.h	Fri Apr 30 15:40:38 2004
@@ -62,24 +62,15 @@
 
 typedef unsigned resourceId_t;
 
-struct MachineResource {
+struct CPUResource {
   const std::string rname;
   resourceId_t rid;
+  int maxNumUsers;   // MAXINT if no restriction
   
-  MachineResource(const std::string &resourceName)
-    : rname(resourceName), rid(nextId++) {}
-  
+  CPUResource(const std::string& resourceName, int maxUsers)
+    : rname(resourceName), rid(nextId++), maxNumUsers(maxUsers) {}
 private:
   static resourceId_t nextId;
-  MachineResource();			// disable
-};
-
-
-struct CPUResource : public MachineResource {
-  int maxNumUsers;   // MAXINT if no restriction
-  
-  CPUResource(const std::string& rname, int maxUsers)
-    : MachineResource(rname), maxNumUsers(maxUsers) {}
 };
 
 
@@ -312,8 +303,7 @@
 
 
 
-  friend class ModuloSchedGraph;
-  friend class ModuloScheduling;
+  friend class ModuloSchedulingPass;
   
 };