changeset 580b47334a97 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=580b47334a97
description:
cpu: Make CPU and ThreadContext getters const
This patch merely tidies up the CPU and ThreadContext getters by
making them const where appropriate.
diffstat:
src/cpu/base.hh | 2 +-
src/cpu/base_dyn_inst.hh | 8 ++++----
src/cpu/checker/thread_context.hh | 6 +++---
src/cpu/inorder/inorder_dyn_inst.cc | 2 +-
src/cpu/inorder/inorder_dyn_inst.hh | 4 ++--
src/cpu/inorder/thread_context.hh | 6 +++---
src/cpu/o3/thread_context.hh | 6 +++---
src/cpu/ozone/cpu.hh | 2 +-
src/cpu/ozone/cpu_impl.hh | 2 +-
src/cpu/thread_context.hh | 14 +++++++-------
src/cpu/thread_state.hh | 10 +++++-----
11 files changed, 31 insertions(+), 31 deletions(-)
diffs (220 lines):
diff -r b58c5c5854de -r 580b47334a97 src/cpu/base.hh
--- a/src/cpu/base.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/base.hh Fri Mar 07 15:56:23 2014 -0500
@@ -143,7 +143,7 @@
virtual MasterPort &getInstPort() = 0;
/** Reads this CPU's ID. */
- int cpuId() { return _cpuId; }
+ int cpuId() const { return _cpuId; }
/** Reads this CPU's unique data requestor ID */
MasterID dataMasterId() { return _dataMasterId; }
diff -r b58c5c5854de -r 580b47334a97 src/cpu/base_dyn_inst.hh
--- a/src/cpu/base_dyn_inst.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/base_dyn_inst.hh Fri Mar 07 15:56:23 2014 -0500
@@ -454,16 +454,16 @@
void dump(std::string &outstring);
/** Read this CPU's ID. */
- int cpuId() { return cpu->cpuId(); }
+ int cpuId() const { return cpu->cpuId(); }
/** Read this CPU's data requestor ID */
- MasterID masterId() { return cpu->dataMasterId(); }
+ MasterID masterId() const { return cpu->dataMasterId(); }
/** Read this context's system-wide ID **/
- int contextId() { return thread->contextId(); }
+ int contextId() const { return thread->contextId(); }
/** Returns the fault type. */
- Fault getFault() { return fault; }
+ Fault getFault() const { return fault; }
/** Checks whether or not this instruction has had its branch target
* calculated yet. For now it is not utilized and is hacked to be
diff -r b58c5c5854de -r 580b47334a97 src/cpu/checker/thread_context.hh
--- a/src/cpu/checker/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/checker/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
@@ -92,9 +92,9 @@
BaseCPU *getCpuPtr() { return actualTC->getCpuPtr(); }
- int cpuId() { return actualTC->cpuId(); }
+ int cpuId() const { return actualTC->cpuId(); }
- int contextId() { return actualTC->contextId(); }
+ int contextId() const { return actualTC->contextId(); }
void setContextId(int id)
{
@@ -103,7 +103,7 @@
}
/** Returns this thread's ID number. */
- int threadId() { return actualTC->threadId(); }
+ int threadId() const { return actualTC->threadId(); }
void setThreadId(int id)
{
checkerTC->setThreadId(id);
diff -r b58c5c5854de -r 580b47334a97 src/cpu/inorder/inorder_dyn_inst.cc
--- a/src/cpu/inorder/inorder_dyn_inst.cc Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/inorder/inorder_dyn_inst.cc Fri Mar 07 15:56:23 2014 -0500
@@ -91,7 +91,7 @@
int InOrderDynInst::instcount = 0;
int
-InOrderDynInst::cpuId()
+InOrderDynInst::cpuId() const
{
return cpu->cpuId();
}
diff -r b58c5c5854de -r 580b47334a97 src/cpu/inorder/inorder_dyn_inst.hh
--- a/src/cpu/inorder/inorder_dyn_inst.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/inorder/inorder_dyn_inst.hh Fri Mar 07 15:56:23 2014 -0500
@@ -357,10 +357,10 @@
Fault getFault() { return fault; }
/** Read this CPU's ID. */
- int cpuId();
+ int cpuId() const;
/** Read this context's system-wide ID **/
- int contextId() { return thread->contextId(); }
+ int contextId() const { return thread->contextId(); }
////////////////////////////////////////////////////////////
//
diff -r b58c5c5854de -r 580b47334a97 src/cpu/inorder/thread_context.hh
--- a/src/cpu/inorder/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/inorder/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
@@ -111,14 +111,14 @@
std::string getCpuName() { return cpu->name(); }
/** Reads this CPU's ID. */
- int cpuId() { return cpu->cpuId(); }
+ int cpuId() const { return cpu->cpuId(); }
- int contextId() { return thread->contextId(); }
+ int contextId() const { return thread->contextId(); }
void setContextId(int id) { thread->setContextId(id); }
/** Returns this thread's ID number. */
- int threadId() { return thread->threadId(); }
+ int threadId() const { return thread->threadId(); }
void setThreadId(int id) { return thread->setThreadId(id); }
uint64_t readMicroPC()
diff -r b58c5c5854de -r 580b47334a97 src/cpu/o3/thread_context.hh
--- a/src/cpu/o3/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/o3/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
@@ -96,14 +96,14 @@
virtual BaseCPU *getCpuPtr() { return cpu; }
/** Reads this CPU's ID. */
- virtual int cpuId() { return cpu->cpuId(); }
+ virtual int cpuId() const { return cpu->cpuId(); }
- virtual int contextId() { return thread->contextId(); }
+ virtual int contextId() const { return thread->contextId(); }
virtual void setContextId(int id) { thread->setContextId(id); }
/** Returns this thread's ID number. */
- virtual int threadId() { return thread->threadId(); }
+ virtual int threadId() const { return thread->threadId(); }
virtual void setThreadId(int id) { return thread->setThreadId(id); }
/** Returns a pointer to the system. */
diff -r b58c5c5854de -r 580b47334a97 src/cpu/ozone/cpu.hh
--- a/src/cpu/ozone/cpu.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/ozone/cpu.hh Fri Mar 07 15:56:23 2014 -0500
@@ -149,7 +149,7 @@
void profileClear();
void profileSample();
- int threadId();
+ int threadId() const;
void copyArchRegs(ThreadContext *tc);
diff -r b58c5c5854de -r 580b47334a97 src/cpu/ozone/cpu_impl.hh
--- a/src/cpu/ozone/cpu_impl.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/ozone/cpu_impl.hh Fri Mar 07 15:56:23 2014 -0500
@@ -704,7 +704,7 @@
template <class Impl>
int
-OzoneCPU<Impl>::OzoneTC::threadId()
+OzoneCPU<Impl>::OzoneTC::threadId() const
{
return thread->threadId();
}
diff -r b58c5c5854de -r 580b47334a97 src/cpu/thread_context.hh
--- a/src/cpu/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/thread_context.hh Fri Mar 07 15:56:23 2014 -0500
@@ -121,13 +121,13 @@
virtual BaseCPU *getCpuPtr() = 0;
- virtual int cpuId() = 0;
+ virtual int cpuId() const = 0;
- virtual int threadId() = 0;
+ virtual int threadId() const = 0;
virtual void setThreadId(int id) = 0;
- virtual int contextId() = 0;
+ virtual int contextId() const = 0;
virtual void setContextId(int id) = 0;
@@ -321,13 +321,13 @@
BaseCPU *getCpuPtr() { return actualTC->getCpuPtr(); }
- int cpuId() { return actualTC->cpuId(); }
+ int cpuId() const { return actualTC->cpuId(); }
- int threadId() { return actualTC->threadId(); }
+ int threadId() const { return actualTC->threadId(); }
- void setThreadId(int id) { return actualTC->setThreadId(id); }
+ void setThreadId(int id) { actualTC->setThreadId(id); }
- int contextId() { return actualTC->contextId(); }
+ int contextId() const { return actualTC->contextId(); }
void setContextId(int id) { actualTC->setContextId(id); }
diff -r b58c5c5854de -r 580b47334a97 src/cpu/thread_state.hh
--- a/src/cpu/thread_state.hh Fri Mar 07 15:56:23 2014 -0500
+++ b/src/cpu/thread_state.hh Fri Mar 07 15:56:23 2014 -0500
@@ -67,19 +67,19 @@
void unserialize(Checkpoint *cp, const std::string §ion);
- int cpuId() { return baseCpu->cpuId(); }
+ int cpuId() const { return baseCpu->cpuId(); }
- int contextId() { return _contextId; }
+ int contextId() const { return _contextId; }
void setContextId(int id) { _contextId = id; }
void setThreadId(ThreadID id) { _threadId = id; }
- ThreadID threadId() { return _threadId; }
+ ThreadID threadId() const { return _threadId; }
- Tick readLastActivate() { return lastActivate; }
+ Tick readLastActivate() const { return lastActivate; }
- Tick readLastSuspend() { return lastSuspend; }
+ Tick readLastSuspend() const { return lastSuspend; }
/**
* Initialise the physical and virtual port proxies and tie them to
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
