Add in Context IDs to the simulator. From now on, cpuId is almost never used,

the primary identifier for a hardware context should be contextId().  The
concept of threads within a CPU remains, in the form of threadId() because
sometimes you need to know which context within a cpu to manipulate.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/sim/system.hh b/src/sim/system.hh
index 26cac714b..e993a7a50 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -87,19 +87,19 @@ class System : public SimObject
     PCEventQueue pcEventQueue;
 
     std::vector<ThreadContext *> threadContexts;
-    int numcpus;
+    int _numContexts;
 
     ThreadContext * getThreadContext(int tid)
     {
         return threadContexts[tid];
     }
 
-    int getNumCPUs()
+    int numContexts()
     {
-        if (numcpus != threadContexts.size())
+        if (_numContexts != threadContexts.size())
             panic("cpu array not fully populated!");
 
-        return numcpus;
+        return _numContexts;
     }
 
 #if FULL_SYSTEM