From: Kevin Lim <ktlim@umich.edu>
Date: Fri, 16 Jun 2006 21:53:33 +0000 (-0400)
Subject: Merge ktlim@zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta1~36^2~59^2~5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e07f6ca52828247fe1741b1e6c5269ad5291187;p=gem5.git

Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9
---

4e07f6ca52828247fe1741b1e6c5269ad5291187
diff --cc configs/test/test.py
index 251755e71,05fdb7786..76791d9d7
--- a/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 e6ed43804,0f21891c4..933158f5f
--- a/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/fetch_impl.hh
index 4993819be,ab706ed47..7cbf0ab02
--- a/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"