summaryrefslogtreecommitdiff
path: root/src/SConscript
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-03-03 06:24:01 +0000
committerGabe Black <gblack@eecs.umich.edu>2007-03-03 06:24:01 +0000
commit68ad1533096ab736c534cb29364a1a93e1010306 (patch)
tree1499c0085d1e4de76b37827e6d691f91364bc396 /src/SConscript
parent23dc5099a4bca9e38a286d867c4eccd7db3c09c1 (diff)
parentffe6bebb05c30b0f1d7cde5ad5b94a2551938630 (diff)
downloadgem5-68ad1533096ab736c534cb29364a1a93e1010306.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-sparc32 --HG-- extra : convert_revision : bbd0def502e423e64e2c4f6415a4b043b60c7f90
Diffstat (limited to 'src/SConscript')
-rw-r--r--src/SConscript7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/SConscript b/src/SConscript
index c93605ff7..9d7248213 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -131,15 +131,19 @@ base_sources = Split('''
mem/cache/cache_builder.cc
python/swig/init.cc
+ python/swig/core_wrap.cc
python/swig/debug_wrap.cc
- python/swig/main_wrap.cc
python/swig/event_wrap.cc
python/swig/random_wrap.cc
+ python/swig/sim_object_wrap.cc
python/swig/stats_wrap.cc
python/swig/trace_wrap.cc
python/swig/pyevent.cc
+ python/swig/pyobject.cc
+ sim/async.cc
sim/builder.cc
+ sim/core.cc
sim/debug.cc
sim/eventq.cc
sim/faults.cc
@@ -149,6 +153,7 @@ base_sources = Split('''
sim/serialize.cc
sim/sim_events.cc
sim/sim_object.cc
+ sim/simulate.cc
sim/startup.cc
sim/stat_control.cc
sim/system.cc