From 9efc4d6aaaa0153c94a661c44198d514d4f83282 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 2 Jun 2003 22:45:07 +0000 Subject: [PATCH] Remove usage of noncopyable classes to clean up doxygen output. In particular these classes are the last that link the noncopyable classes with the hash_map, vector, and list classes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6552 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/InstrSched/SchedGraph.h | 39 +++++++++---------- lib/CodeGen/InstrSched/SchedPriorities.h | 8 +++- lib/Target/SparcV9/InstrSched/SchedGraph.h | 39 +++++++++---------- .../SparcV9/InstrSched/SchedPriorities.h | 8 +++- 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h index 37c22be2b07..11edf0d8791 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.h +++ b/lib/CodeGen/InstrSched/SchedGraph.h @@ -17,7 +17,6 @@ #include "llvm/CodeGen/MachineInstr.h" #include "Support/HashExtras.h" #include "Support/GraphTraits.h" -#include "Support/NonCopyable.h" class Value; class Instruction; @@ -46,7 +45,9 @@ const ResourceId MachineFPRegsRID = -4; // use +ve numbers for actual regs //*********************** Public Class Declarations ************************/ -class SchedGraphEdge: public NonCopyable { +class SchedGraphEdge { + SchedGraphEdge(const SchedGraphEdge &); // DO NOT IMPLEMENT + void operator=(const SchedGraphEdge &); // DO NOT IMPLEMENT public: enum SchedGraphEdgeDepType { CtrlDep, MemoryDep, ValueDep, MachineRegister, MachineResource @@ -55,7 +56,7 @@ public: TrueDep = 0x1, AntiDep=0x2, OutputDep=0x4, NonDataDep=0x8 }; -protected: +private: SchedGraphNode* src; SchedGraphNode* sink; SchedGraphEdgeDepType depType; @@ -132,7 +133,7 @@ private: -class SchedGraphNode: public NonCopyable { +class SchedGraphNode { unsigned nodeId; MachineBasicBlock *MBB; const MachineInstr* minstr; @@ -140,7 +141,9 @@ class SchedGraphNode: public NonCopyable { std::vector outEdges; int origIndexInBB; // original position of machine instr in BB int latency; - + + SchedGraphNode(const SchedGraphNode &); // DO NOT IMPLEMENT + void operator=(const SchedGraphNode &); // DO NOT IMPLEMENT public: typedef std::vector:: iterator iterator; typedef std::vector::const_iterator const_iterator; @@ -203,15 +206,14 @@ private: -class SchedGraph : - public NonCopyable, - private hash_map -{ +class SchedGraph : private hash_map { MachineBasicBlock &MBB; // basic blocks for this graph SchedGraphNode* graphRoot; // the root and leaf are not inserted SchedGraphNode* graphLeaf; // in the hash_map (see getNumNodes()) typedef hash_map map_base; + SchedGraph(const SchedGraph &); // DO NOT IMPLEMENT + void operator=(const SchedGraph &); // DO NOT IMPLEMENT public: using map_base::iterator; using map_base::const_iterator; @@ -327,29 +329,27 @@ private: }; -class SchedGraphSet : - public NonCopyable, - private std::vector -{ +class SchedGraphSet : private std::vector { private: const Function* method; - + + SchedGraphSet(const SchedGraphSet&); // DO NOT IMPLEMENT + void operator=(const SchedGraphSet&); // DO NOT IMPLEMENT public: typedef std::vector baseVector; using baseVector::iterator; using baseVector::const_iterator; public: - /*ctor*/ SchedGraphSet (const Function * function, - const TargetMachine& target); - /*dtor*/ ~SchedGraphSet (); + SchedGraphSet(const Function *F, const TargetMachine &TM); + ~SchedGraphSet(); // Iterators using baseVector::begin; using baseVector::end; // Debugging support - void dump () const; + void dump() const; private: inline void addGraph(SchedGraph* graph) { @@ -358,8 +358,7 @@ private: } // Graph builder - void buildGraphsForMethod (const Function *F, - const TargetMachine& target); + void buildGraphsForMethod(const Function *F, const TargetMachine &TM); }; diff --git a/lib/CodeGen/InstrSched/SchedPriorities.h b/lib/CodeGen/InstrSched/SchedPriorities.h index 62e41ee4f66..4513b28a36c 100644 --- a/lib/CodeGen/InstrSched/SchedPriorities.h +++ b/lib/CodeGen/InstrSched/SchedPriorities.h @@ -63,7 +63,9 @@ NDPLessThan(const NodeDelayPair* np1, const NodeDelayPair* np2) return np1->delay < np2->delay; } -class NodeHeap: public std::list, public NonCopyable { +class NodeHeap : public std::list { + NodeHeap(const NodeHeap&); // DO NOT IMPLEMENT + void operator=(const NodeHeap&); // DO NOT IMPLEMENT public: typedef std::list::iterator iterator; typedef std::list::const_iterator const_iterator; @@ -115,7 +117,9 @@ private: }; -class SchedPriorities: public NonCopyable { +class SchedPriorities { + SchedPriorities(const SchedPriorities&); // DO NOT IMPLEMENT + void operator=(const SchedPriorities &); // DO NOT IMPLEMENT public: SchedPriorities(const Function *F, const SchedGraph *G, FunctionLiveVarInfo &LVI); diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.h b/lib/Target/SparcV9/InstrSched/SchedGraph.h index 37c22be2b07..11edf0d8791 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.h +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.h @@ -17,7 +17,6 @@ #include "llvm/CodeGen/MachineInstr.h" #include "Support/HashExtras.h" #include "Support/GraphTraits.h" -#include "Support/NonCopyable.h" class Value; class Instruction; @@ -46,7 +45,9 @@ const ResourceId MachineFPRegsRID = -4; // use +ve numbers for actual regs //*********************** Public Class Declarations ************************/ -class SchedGraphEdge: public NonCopyable { +class SchedGraphEdge { + SchedGraphEdge(const SchedGraphEdge &); // DO NOT IMPLEMENT + void operator=(const SchedGraphEdge &); // DO NOT IMPLEMENT public: enum SchedGraphEdgeDepType { CtrlDep, MemoryDep, ValueDep, MachineRegister, MachineResource @@ -55,7 +56,7 @@ public: TrueDep = 0x1, AntiDep=0x2, OutputDep=0x4, NonDataDep=0x8 }; -protected: +private: SchedGraphNode* src; SchedGraphNode* sink; SchedGraphEdgeDepType depType; @@ -132,7 +133,7 @@ private: -class SchedGraphNode: public NonCopyable { +class SchedGraphNode { unsigned nodeId; MachineBasicBlock *MBB; const MachineInstr* minstr; @@ -140,7 +141,9 @@ class SchedGraphNode: public NonCopyable { std::vector outEdges; int origIndexInBB; // original position of machine instr in BB int latency; - + + SchedGraphNode(const SchedGraphNode &); // DO NOT IMPLEMENT + void operator=(const SchedGraphNode &); // DO NOT IMPLEMENT public: typedef std::vector:: iterator iterator; typedef std::vector::const_iterator const_iterator; @@ -203,15 +206,14 @@ private: -class SchedGraph : - public NonCopyable, - private hash_map -{ +class SchedGraph : private hash_map { MachineBasicBlock &MBB; // basic blocks for this graph SchedGraphNode* graphRoot; // the root and leaf are not inserted SchedGraphNode* graphLeaf; // in the hash_map (see getNumNodes()) typedef hash_map map_base; + SchedGraph(const SchedGraph &); // DO NOT IMPLEMENT + void operator=(const SchedGraph &); // DO NOT IMPLEMENT public: using map_base::iterator; using map_base::const_iterator; @@ -327,29 +329,27 @@ private: }; -class SchedGraphSet : - public NonCopyable, - private std::vector -{ +class SchedGraphSet : private std::vector { private: const Function* method; - + + SchedGraphSet(const SchedGraphSet&); // DO NOT IMPLEMENT + void operator=(const SchedGraphSet&); // DO NOT IMPLEMENT public: typedef std::vector baseVector; using baseVector::iterator; using baseVector::const_iterator; public: - /*ctor*/ SchedGraphSet (const Function * function, - const TargetMachine& target); - /*dtor*/ ~SchedGraphSet (); + SchedGraphSet(const Function *F, const TargetMachine &TM); + ~SchedGraphSet(); // Iterators using baseVector::begin; using baseVector::end; // Debugging support - void dump () const; + void dump() const; private: inline void addGraph(SchedGraph* graph) { @@ -358,8 +358,7 @@ private: } // Graph builder - void buildGraphsForMethod (const Function *F, - const TargetMachine& target); + void buildGraphsForMethod(const Function *F, const TargetMachine &TM); }; diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.h b/lib/Target/SparcV9/InstrSched/SchedPriorities.h index 62e41ee4f66..4513b28a36c 100644 --- a/lib/Target/SparcV9/InstrSched/SchedPriorities.h +++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.h @@ -63,7 +63,9 @@ NDPLessThan(const NodeDelayPair* np1, const NodeDelayPair* np2) return np1->delay < np2->delay; } -class NodeHeap: public std::list, public NonCopyable { +class NodeHeap : public std::list { + NodeHeap(const NodeHeap&); // DO NOT IMPLEMENT + void operator=(const NodeHeap&); // DO NOT IMPLEMENT public: typedef std::list::iterator iterator; typedef std::list::const_iterator const_iterator; @@ -115,7 +117,9 @@ private: }; -class SchedPriorities: public NonCopyable { +class SchedPriorities { + SchedPriorities(const SchedPriorities&); // DO NOT IMPLEMENT + void operator=(const SchedPriorities &); // DO NOT IMPLEMENT public: SchedPriorities(const Function *F, const SchedGraph *G, FunctionLiveVarInfo &LVI);