Merge ktlim@zizzer:/bk/newmem

into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem --HG-- extra : convert_revision : 3d951bbeee0178de47e1bdbe704808544bfe732e
2006-05-31 11:34:42 -04:00
parent d77d39daee 4a5b51b516
commit d4b73086b6
138 changed files with 32988 additions and 5311 deletions
--- a/src/SConscript
+++ b/src/SConscript
@@ -79,12 +79,14 @@ base_sources = Split('''
 	base/stats/visit.cc
 	base/stats/text.cc

+        cpu/activity.cc
 	cpu/base.cc
 	cpu/cpu_exec_context.cc
 	cpu/cpuevent.cc
 	cpu/exetrace.cc
        cpu/op_class.cc
 	cpu/pc_event.cc
+        cpu/quiesce_event.cc
 	cpu/static_inst.cc
        cpu/sampler/sampler.cc