Miscellaneous minor fixes.

src/cpu/checker/cpu.cc:
    Add in comment.
src/cpu/cpuevent.hh:
    Fix up comment.
src/cpu/o3/bpred_unit.cc:
    Comment out Ozone instantiations.
src/cpu/o3/dep_graph.hh:
    Include destructor.

--HG--
extra : convert_revision : 549454ed11bc2fa49a0627f7fb8f96d00a9be303

diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index 99189a8966069b718185526629d07a653c113de5..45c57d276a2e7c54d3fa17f6870847d543b79d30 100644 (file)
--- a/src/cpu/checker/cpu.cc
+++ b/src/cpu/checker/cpu.cc
@@ -829,6 +829,6 @@ Checker<DynInstPtr>::dumpInsts()
 
 //template
 //class Checker<RefCountingPtr<OzoneDynInst<OzoneImpl> > >;
-
+// Manually instantiate checker
 template
 class Checker<RefCountingPtr<AlphaDynInst<AlphaSimpleImpl> > >;

diff --git a/src/cpu/cpuevent.hh b/src/cpu/cpuevent.hh
index 11ac7aafbab5c020d210b62d85a10eaef1e03649..9dfae27cf3f29899230c947f85d6603055bc6bab 100644 (file)
--- a/src/cpu/cpuevent.hh
+++ b/src/cpu/cpuevent.hh
@@ -36,7 +36,7 @@
 
 class ThreadContext;
 
-/** This class creates a global list of events than need a pointer to an
+/** This class creates a global list of events that need a pointer to a
  * thread context. When a switchover takes place the events can be migrated
  * to the new thread context, otherwise you could have a wake timer interrupt
  * go off on a switched out cpu or other unfortunate events. This object MUST be

diff --git a/src/cpu/o3/bpred_unit.cc b/src/cpu/o3/bpred_unit.cc
index b33543bdc690a51fd24680eccb1a173f59ccb83b..2944387045a4e7c74d6a4cb26c8033ba084930de 100644 (file)
--- a/src/cpu/o3/bpred_unit.cc
+++ b/src/cpu/o3/bpred_unit.cc
@@ -31,9 +31,9 @@
 #include "cpu/o3/bpred_unit_impl.hh"
 #include "cpu/o3/alpha_impl.hh"
 #include "cpu/o3/alpha_dyn_inst.hh"
-#include "cpu/ozone/ozone_impl.hh"
+//#include "cpu/ozone/ozone_impl.hh"
 //#include "cpu/ozone/simple_impl.hh"
 
 template class BPredUnit<AlphaSimpleImpl>;
-template class BPredUnit<OzoneImpl>;
+//template class BPredUnit<OzoneImpl>;
 //template class BPredUnit<SimpleImpl>;

diff --git a/src/cpu/o3/dep_graph.hh b/src/cpu/o3/dep_graph.hh
index 3659b1a37e0e886a3ed43829e1002725001fc48f..c19fd0abff4a9fcc8683191e25fd54c33b59f1d4 100644 (file)
--- a/src/cpu/o3/dep_graph.hh
+++ b/src/cpu/o3/dep_graph.hh
@@ -68,6 +68,8 @@ class DependencyGraph
         : numEntries(0), memAllocCounter(0), nodesTraversed(0), nodesRemoved(0)
     { }
 
+    ~DependencyGraph();
+
     /** Resize the dependency graph to have num_entries registers. */
     void resize(int num_entries);
 
@@ -120,6 +122,12 @@ class DependencyGraph
     uint64_t nodesRemoved;
 };
 
+template <class DynInstPtr>
+DependencyGraph<DynInstPtr>::~DependencyGraph()
+{
+    delete [] dependGraph;
+}
+
 template <class DynInstPtr>
 void
 DependencyGraph<DynInstPtr>::resize(int num_entries)