Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : b0f93bd35d767fd3a520a9fed70a71d40b0056db

1 files changed, 14 insertions, 6 deletions

diff --git a/sim/system.cc b/sim/system.cc
index 903362f0b..af4a4c151 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -56,16 +56,24 @@ System::~System()
 }
 
 
-void
+int
 System::registerExecContext(ExecContext *xc)
 {
-    if (xc->cpu_id >= 12/*MAX_CPUS*/)
-        panic("Too many CPU's\n");
+    int myIndex = execContexts.size();
+    execContexts.push_back(xc);
+    return myIndex;
+}
+
 
-    if (xc->cpu_id >= xcvec.size())
-        xcvec.resize(xc->cpu_id + 1);
+void
+System::replaceExecContext(int xcIndex, ExecContext *xc)
+{
+    if (xcIndex >= execContexts.size()) {
+        panic("replaceExecContext: bad xcIndex, %d >= %d\n",
+              xcIndex, execContexts.size());
+    }
 
-    xcvec[xc->cpu_id] = xc;
+    execContexts[xcIndex] = xc;
 }