I left a printf in on accident.

[gem5.git] / SConscript

diff --git a/SConscript b/SConscript
index 518b8a0f3a29a2e35aaf450334dadde0f4ace034..677a06d1fb7948507ad29801185a6b9c7c376acf 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -143,7 +143,6 @@ base_sources = Split('''
        encumbered/cpu/full/issue.cc
        encumbered/cpu/full/ls_queue.cc
        encumbered/cpu/full/machine_queue.cc
-        encumbered/cpu/full/pc_sample_profile.cc
         encumbered/cpu/full/pipetrace.cc
         encumbered/cpu/full/readyq.cc
         encumbered/cpu/full/reg_info.cc
@@ -193,12 +192,15 @@ base_sources = Split('''
         mem/cache/prefetch/prefetcher.cc
         mem/cache/prefetch/tagged_prefetcher.cc
        mem/cache/tags/base_tags.cc
-       mem/cache/tags/cache_tags.cc
+       mem/cache/tags/cache_tags.cc    
        mem/cache/tags/fa_lru.cc
        mem/cache/tags/iic.cc
        mem/cache/tags/lru.cc
        mem/cache/tags/repl/gen.cc
        mem/cache/tags/repl/repl.cc
+       mem/cache/tags/split.cc
+       mem/cache/tags/split_lru.cc
+       mem/cache/tags/split_lifo.cc
        mem/functional/functional.cc
        mem/timing/base_memory.cc
        mem/timing/memory_builder.cc
@@ -241,6 +243,7 @@ full_system_sources = Split('''
        arch/alpha/ev5.cc
        arch/alpha/osfpal.cc
        arch/alpha/pseudo_inst.cc
+       arch/alpha/stacktrace.cc
        arch/alpha/vtophys.cc
 
        base/crc.cc
@@ -248,6 +251,7 @@ full_system_sources = Split('''
        base/remote_gdb.cc
 
        cpu/intr_control.cc
+        cpu/profile.cc
 
        dev/alpha_console.cc
        dev/baddev.cc
@@ -282,8 +286,6 @@ full_system_sources = Split('''
        kern/kernel_stats.cc
        kern/system_events.cc
        kern/freebsd/freebsd_system.cc
-       kern/freebsd/freebsd_events.cc
-       kern/linux/linux_events.cc
        kern/linux/linux_syscalls.cc
        kern/linux/linux_system.cc
        kern/linux/printk.cc
@@ -347,6 +349,7 @@ targetarch_files = Split('''
         isa_traits.hh
         osfpal.hh
         pseudo_inst.hh
+        stacktrace.hh
         vptr.hh
         vtophys.hh
         ''')
@@ -430,25 +433,42 @@ def make_objs(sources, env):
 env.Append(CPPPATH='.')
 
 # Debug binary
-debug = env.Copy(OBJSUFFIX='.do')
-debug.Append(CCFLAGS=Split('-g -gstabs+ -O0'))
-debug.Append(CPPDEFINES='DEBUG')
-debug.Program(target = 'm5.debug', source = make_objs(sources, debug))
+debugEnv = env.Copy(OBJSUFFIX='.do')
+debugEnv.Label = 'debug'
+debugEnv.Append(CCFLAGS=Split('-g -gstabs+ -O0'))
+debugEnv.Append(CPPDEFINES='DEBUG')
+tlist = debugEnv.Program(target = 'm5.debug',
+                         source = make_objs(sources, debugEnv))
+debugEnv.M5Binary = tlist[0]
 
 # Optimized binary
-opt = env.Copy()
-opt.Append(CCFLAGS=Split('-g -O5'))
-opt.Program(target = 'm5.opt', source = make_objs(sources, opt))
+optEnv = env.Copy()
+optEnv.Label = 'opt'
+optEnv.Append(CCFLAGS=Split('-g -O5'))
+tlist = optEnv.Program(target = 'm5.opt',
+                       source = make_objs(sources, optEnv))
+optEnv.M5Binary = tlist[0]
 
 # "Fast" binary
-fast = env.Copy(OBJSUFFIX='.fo')
-fast.Append(CCFLAGS=Split('-O5'))
-fast.Append(CPPDEFINES='NDEBUG')
-fast.Program(target = 'm5.fast.unstripped', source = make_objs(sources, fast))
-fast.Command(target = 'm5.fast', source = 'm5.fast.unstripped',
-             action = 'strip $SOURCE -o $TARGET')
+fastEnv = env.Copy(OBJSUFFIX='.fo')
+fastEnv.Label = 'fast'
+fastEnv.Append(CCFLAGS=Split('-O5'))
+fastEnv.Append(CPPDEFINES='NDEBUG')
+fastEnv.Program(target = 'm5.fast.unstripped',
+                source = make_objs(sources, fastEnv))
+tlist = fastEnv.Command(target = 'm5.fast',
+                        source = 'm5.fast.unstripped',
+                        action = 'strip $SOURCE -o $TARGET')
+fastEnv.M5Binary = tlist[0]
 
 # Profiled binary
-prof = env.Copy(OBJSUFFIX='.po')
-prof.Append(CCFLAGS=Split('-O5 -g -pg'), LINKFLAGS='-pg')
-prof.Program(target = 'm5.prof', source = make_objs(sources, prof))
+profEnv = env.Copy(OBJSUFFIX='.po')
+profEnv.Label = 'prof'
+profEnv.Append(CCFLAGS=Split('-O5 -g -pg'), LINKFLAGS='-pg')
+tlist = profEnv.Program(target = 'm5.prof',
+                        source = make_objs(sources, profEnv))
+profEnv.M5Binary = tlist[0]
+
+envList = [debugEnv, optEnv, fastEnv, profEnv]
+
+Return('envList')