From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Fri, 24 Oct 2003 02:09:18 +0000 (-0700)
Subject: Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
X-Git-Tag: m5_1.0_beta2~361
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc9a838f4c5a5bf5e8951bdb351fc7d4b74661fb;p=gem5.git

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

--HG--
extra : convert_revision : b0f93bd35d767fd3a520a9fed70a71d40b0056db
---

cc9a838f4c5a5bf5e8951bdb351fc7d4b74661fb
diff --cc sim/system.hh
index f10b70a4e,1c4440b9a..081aa3eb7
--- a/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();