diff options
| -rw-r--r-- | cpu/full_cpu/smt.hh | 7 | ||||
| -rw-r--r-- | sim/debug.cc | 2 | ||||
| -rw-r--r-- | sim/serialize.cc | 7 | ||||
| -rw-r--r-- | sim/serialize.hh | 4 |
4 files changed, 4 insertions, 16 deletions
diff --git a/cpu/full_cpu/smt.hh b/cpu/full_cpu/smt.hh index f9c1e4614..6a4151ffd 100644 --- a/cpu/full_cpu/smt.hh +++ b/cpu/full_cpu/smt.hh @@ -28,17 +28,12 @@ /** * @file - * Defines SMT_MAX_CPUS and SMT_MAX_THREADS. + * Defines SMT_MAX_THREADS. */ #ifndef __SMT_HH__ #define __SMT_HH__ -#ifndef SMT_MAX_CPUS -/** The maximum number of cpus in any one system. */ -#define SMT_MAX_CPUS 4 -#endif - #ifndef SMT_MAX_THREADS /** The number of TPUs in any processor. */ #define SMT_MAX_THREADS 4 diff --git a/sim/debug.cc b/sim/debug.cc index 95187baff..6f3789c96 100644 --- a/sim/debug.cc +++ b/sim/debug.cc @@ -66,6 +66,7 @@ class DebugBreakEvent : public Event DebugBreakEvent::DebugBreakEvent(EventQueue *q, Tick _when) : Event(q) { + setFlags(AutoDelete); schedule(_when, -20000); } @@ -76,7 +77,6 @@ void DebugBreakEvent::process() { debug_break(); - delete this; } diff --git a/sim/serialize.cc b/sim/serialize.cc index 1fce6e7b1..9738029c2 100644 --- a/sim/serialize.cc +++ b/sim/serialize.cc @@ -50,13 +50,6 @@ using namespace std; Serializer *Serializeable::serializer = NULL; -Serializeable::Serializeable() - : serialized(false) -{ } - -Serializeable::~Serializeable() -{ } - void Serializeable::mark() { diff --git a/sim/serialize.hh b/sim/serialize.hh index bc40d0ad2..077931d8c 100644 --- a/sim/serialize.hh +++ b/sim/serialize.hh @@ -115,8 +115,8 @@ class Serializeable void nameOut(std::ostream& os, const std::string &_name); public: - Serializeable(); - virtual ~Serializeable(); + Serializeable() : serialized(false) {} + virtual ~Serializeable() {} // manditory virtual function, so objects must provide names virtual std::string name() const = 0; |