Merge ktlim@zizzer:/bk/newmem

into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge --HG-- extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9
2006-06-16 17:53:33 -04:00
parent 51a5b82637 0bbd909f02
commit 4e07f6ca52
52 changed files with 944 additions and 409 deletions
--- a/src/SConscript
+++ b/src/SConscript
@@ -85,6 +85,7 @@ base_sources = Split('''
 	cpu/base.cc
 	cpu/cpuevent.cc
 	cpu/exetrace.cc
+        cpu/func_unit.cc
        cpu/op_class.cc
 	cpu/pc_event.cc
        cpu/quiesce_event.cc
@@ -93,8 +94,6 @@ base_sources = Split('''
        cpu/simple_thread.cc
        cpu/thread_state.cc

-        encumbered/cpu/full/fu_pool.cc
-        
        mem/bridge.cc
        mem/bus.cc
        mem/mem_object.cc