Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9

diff --cc configs/test/test.py
index 251755e71804c7ccc4025a0ea55fbb0cb0ca8326,05fdb7786d09c2304a8992be3535490fbebb30a3..76791d9d7877d94bba1ca8f7cf3c50de7fa3f80a
--- 1/configs/test/test.py
--- 2/configs/test/test.py
+++ b/configs/test/test.py
@@@ -48,7 -49,10 +49,10 @@@ root = Root(system = system
  m5.instantiate(root)
  
  # simulate until program terminates
- exit_event = m5.simulate()
+ if options.maxtick:
+     exit_event = m5.simulate(options.maxtick)
+ else:
+     exit_event = m5.simulate()
  
 -print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
 +print 'Exiting @ cycle', m5.curTick(), 'because', exit_event.getCause()
  

diff --cc src/SConscript
index e6ed43804c9858242eb8505c46fb23a509f8d8f0,0f21891c423e978e0eda0d29f45e54c15dc32ed5..933158f5fdaaacf4c05257e36d19cbbdb3a7d4ea
--- 1/src/SConscript
--- 2/src/SConscript
+++ b/src/SConscript
@@@ -93,10 -94,9 +94,8 @@@ base_sources = Split(''
          cpu/simple_thread.cc
          cpu/thread_state.cc
  
-         encumbered/cpu/full/fu_pool.cc
-         
          mem/bridge.cc
          mem/bus.cc
 -        mem/connector.cc
          mem/mem_object.cc
          mem/packet.cc
          mem/physical.cc

diff --cc src/cpu/o3/commit.hh
Simple merge

diff --cc src/cpu/o3/cpu.cc
Simple merge

diff --cc src/cpu/o3/cpu.hh
Simple merge

diff --cc src/cpu/o3/fetch.hh
Simple merge

diff --cc src/cpu/o3/fetch_impl.hh
index 4993819be8a3146d028334a4dea1a54fd223c9fa,ab706ed472c5a99ef88b1affe7d0badd245bfd76..7cbf0ab026f1bffce8044b921bfbc3e3c1024b99
--- 1/src/cpu/o3/fetch_impl.hh
--- 2/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@@ -26,9 -26,10 +26,11 @@@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   * Authors: Kevin Lim
 + *          Korey Sewell
   */
  
+ #include "config/use_checker.hh"
+ 
  #include "arch/isa_traits.hh"
  #include "arch/utility.hh"
  #include "cpu/checker/cpu.hh"