diff options
| -rw-r--r-- | src/cpu/base.hh | 10 | ||||
| -rw-r--r-- | src/cpu/o3/rob.hh | 2 | ||||
| -rw-r--r-- | src/cpu/o3/rob_impl.hh | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh index 3d679f172..1ca1ca10c 100644 --- a/src/cpu/base.hh +++ b/src/cpu/base.hh @@ -287,7 +287,9 @@ class BaseCPU : public ClockedObject virtual ThreadContext *getContext(int tn) { return threadContexts[tn]; } /// Get the number of thread contexts available - unsigned numContexts() { return threadContexts.size(); } + unsigned numContexts() { + return static_cast<unsigned>(threadContexts.size()); + } /// Convert ContextID to threadID ThreadID contextToThread(ContextID cid) @@ -399,7 +401,7 @@ class BaseCPU : public ClockedObject * uniform data format for all CPU models and promotes better code * reuse. * - * @param os The stream to serialize to. + * @param cp The stream to serialize to. */ void serialize(CheckpointOut &cp) const override; @@ -412,14 +414,13 @@ class BaseCPU : public ClockedObject * promotes better code reuse. * @param cp The checkpoint use. - * @param section The section name of this object. */ void unserialize(CheckpointIn &cp) override; /** * Serialize a single thread. * - * @param os The stream to serialize to. + * @param cp The stream to serialize to. * @param tid ID of the current thread. */ virtual void serializeThread(CheckpointOut &cp, ThreadID tid) const {}; @@ -428,7 +429,6 @@ class BaseCPU : public ClockedObject * Unserialize one thread. * * @param cp The checkpoint use. - * @param section The section name of this thread. * @param tid ID of the current thread. */ virtual void unserializeThread(CheckpointIn &cp, ThreadID tid) {}; diff --git a/src/cpu/o3/rob.hh b/src/cpu/o3/rob.hh index ad7a6d6e7..0289d2c76 100644 --- a/src/cpu/o3/rob.hh +++ b/src/cpu/o3/rob.hh @@ -258,7 +258,7 @@ class ROB * threadEntries to get the instructions in the ROB unless you are * double checking that variable. */ - int countInsts(ThreadID tid); + size_t countInsts(ThreadID tid); /** Registers statistics. */ void regStats(); diff --git a/src/cpu/o3/rob_impl.hh b/src/cpu/o3/rob_impl.hh index 5d5d821b8..432d43f9c 100644 --- a/src/cpu/o3/rob_impl.hh +++ b/src/cpu/o3/rob_impl.hh @@ -153,7 +153,7 @@ void ROB<Impl>::resetEntries() { if (robPolicy != SMTQueuePolicy::Dynamic || numThreads > 1) { - int active_threads = activeThreads->size(); + auto active_threads = activeThreads->size(); list<ThreadID>::iterator threads = activeThreads->begin(); list<ThreadID>::iterator end = activeThreads->end(); @@ -195,7 +195,7 @@ ROB<Impl>::countInsts() } template <class Impl> -int +size_t ROB<Impl>::countInsts(ThreadID tid) { return instList[tid].size(); |