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

--HG--
extra : convert_revision : b0f93bd35d767fd3a520a9fed70a71d40b0056db

diff --cc cpu/exec_context.hh
Simple merge

diff --cc kern/tru64/tru64_system.cc
Simple merge

diff --cc kern/tru64/tru64_system.hh
Simple merge

diff --cc sim/system.cc
Simple merge

diff --cc sim/system.hh
index f10b70a4e715e2bac7fb433fb3a0a6bd9beb5733,1c4440b9aebaeaa18f8abe80238b7bc041d1a57e..081aa3eb70d21924121ca13585bde8d05665f84b
--- 1/sim/system.hh
--- 2/sim/system.hh
+++ b/sim/system.hh
@@@ -52,11 -52,13 +52,13 @@@ class System : public SimObjec
  
      PCEventQueue pcEventQueue;
  
-     std::vector<ExecContext *> xcvec;
-     void registerExecContext(ExecContext *xc);
+     std::vector<ExecContext *> execContexts;
+ 
+     virtual int registerExecContext(ExecContext *xc);
+     virtual void replaceExecContext(int xcIndex, ExecContext *xc);
  
    public:
 -    System(const std::string _name, const int _init_param,
 +    System(const std::string _name, const uint64_t _init_param,
             MemoryController *, PhysicalMemory *);
      ~System();