[gem5-dev] changeset in gem5: cpu: Move invldPid constant from Request to B...

[Andreas Hansson]

changeset 65fc1db5d795 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=65fc1db5d795
description:
        cpu: Move invldPid constant from Request to BaseCPU

        A more natural home for this constant.

diffstat:

 src/arch/arm/linux/system.cc |  2 +-
 src/cpu/base.cc              |  2 +-
 src/cpu/base.hh              |  5 +++++
 src/mem/request.hh           |  4 ----
 4 files changed, 7 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r dfb0aa3f0649 -r 65fc1db5d795 src/arch/arm/linux/system.cc
--- a/src/arch/arm/linux/system.cc      Wed Aug 19 10:02:01 2015 -0500
+++ b/src/arch/arm/linux/system.cc      Fri Aug 21 07:03:14 2015 -0400
@@ -241,7 +241,7 @@
         for (int i = 0; i < _numContexts; i++) {
             ThreadContext *tc = threadContexts[i];
             uint32_t pid = tc->getCpuPtr()->getPid();
-            if (pid != Request::invldPid) {
+            if (pid != BaseCPU::invldPid) {
                 mapPid(tc, pid);
                 tc->getCpuPtr()->taskId(taskMap[pid]);
             }
diff -r dfb0aa3f0649 -r 65fc1db5d795 src/cpu/base.cc
--- a/src/cpu/base.cc   Wed Aug 19 10:02:01 2015 -0500
+++ b/src/cpu/base.cc   Fri Aug 21 07:03:14 2015 -0400
@@ -127,7 +127,7 @@
     : MemObject(p), instCnt(0), _cpuId(p->cpu_id), _socketId(p->socket_id),
       _instMasterId(p->system->getMasterId(name() + ".inst")),
       _dataMasterId(p->system->getMasterId(name() + ".data")),
-      _taskId(ContextSwitchTaskId::Unknown), _pid(Request::invldPid),
+      _taskId(ContextSwitchTaskId::Unknown), _pid(invldPid),
       _switchedOut(p->switched_out), 
_cacheLineSize(p->system->cacheLineSize()),
       interrupts(p->interrupts), profileEvent(NULL),
       numThreads(p->numThreads), system(p->system),
diff -r dfb0aa3f0649 -r 65fc1db5d795 src/cpu/base.hh
--- a/src/cpu/base.hh   Wed Aug 19 10:02:01 2015 -0500
+++ b/src/cpu/base.hh   Fri Aug 21 07:03:14 2015 -0400
@@ -263,6 +263,11 @@
 
   public:
 
+
+    /** Invalid or unknown Pid. Possible when operating system is not present
+     *  or has not assigned a pid yet */
+    static const uint32_t invldPid = std::numeric_limits<uint32_t>::max();
+
     // Mask to align PCs to MachInst sized boundaries
     static const Addr PCMask = ~((Addr)sizeof(TheISA::MachInst) - 1);
 
diff -r dfb0aa3f0649 -r 65fc1db5d795 src/mem/request.hh
--- a/src/mem/request.hh        Wed Aug 19 10:02:01 2015 -0500
+++ b/src/mem/request.hh        Fri Aug 21 07:03:14 2015 -0400
@@ -195,10 +195,6 @@
     };
     /** @} */
 
-    /** Invalid or unknown Pid. Possible when operating system is not present
-     *  or has not assigned a pid yet */
-    static const uint32_t invldPid = std::numeric_limits<uint32_t>::max();
-
   private:
     typedef uint8_t PrivateFlagsType;
     typedef ::Flags<PrivateFlagsType> PrivateFlags;
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev