make BaseCPU the provider of _cpuId, and cpuId() instead of being scattered

across the subclasses. generally make it so that member data is _cpuId and
accessor functions are cpuId(). The ID val comes from the python (default -1 if
none provided), and if it is -1, the index of cpuList will be given. this has
passed util/regress quick and se.py -n4 and fs.py -n4 as well as standard
switch.

2 files changed, 6 insertions, 7 deletions

diff --git a/src/sim/system.cc b/src/sim/system.cc
index 7b830d0f7..41075e9d0 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -166,13 +166,12 @@ bool System::breakpoint()
 }
 
 int
-System::registerThreadContext(ThreadContext *tc, int id)
+System::registerThreadContext(ThreadContext *tc)
 {
-    if (id == -1) {
-        for (id = 0; id < threadContexts.size(); id++) {
-            if (!threadContexts[id])
-                break;
-        }
+    int id;
+    for (id = 0; id < threadContexts.size(); id++) {
+        if (!threadContexts[id])
+            break;
     }
 
     if (threadContexts.size() <= id)
diff --git a/src/sim/system.hh b/src/sim/system.hh
index cdd5bebb0..f67d39c67 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -219,7 +219,7 @@ class System : public SimObject
 
 #endif // FULL_SYSTEM
 
-    int registerThreadContext(ThreadContext *tc, int tcIndex);
+    int registerThreadContext(ThreadContext *tc);
     void replaceThreadContext(ThreadContext *tc, int tcIndex);
 
     void serialize(std::ostream &os);