more changes for subtick labels.
[gem5.git] / SConscript
index de320aa40b83fd719920a5cab64f19bd0b1fe9ed..360f91b3a507da8469e082f9299ac0d89bfabd26 100644 (file)
@@ -43,15 +43,8 @@ Import('env')
 ###################################################
 
 # Base sources used by all configurations.
-base_sources = Split('''
-       arch/alpha/decoder.cc
-        arch/alpha/alpha_o3_exec.cc
-       arch/alpha/fast_cpu_exec.cc
-       arch/alpha/simple_cpu_exec.cc
-       arch/alpha/full_cpu_exec.cc
-       arch/alpha/faults.cc
-       arch/alpha/isa_traits.cc
 
+base_sources = Split('''
        base/circlebuf.cc
        base/copyright.cc
        base/cprintf.cc
@@ -192,12 +185,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
@@ -213,6 +209,7 @@ base_sources = Split('''
        sim/configfile.cc
        sim/debug.cc
        sim/eventq.cc
+       sim/faults.cc
        sim/main.cc
        sim/param.cc
        sim/profile.cc
@@ -226,6 +223,14 @@ base_sources = Split('''
        sim/stat_control.cc
        sim/trace_context.cc
         ''')
+# These are now included by the architecture specific SConscript
+#      arch/alpha/decoder.cc
+#      arch/alpha/alpha_o3_exec.cc
+#      arch/alpha/fast_cpu_exec.cc
+#      arch/alpha/simple_cpu_exec.cc
+#      arch/alpha/full_cpu_exec.cc
+#      arch/alpha/faults.cc
+#      arch/alpha/isa_traits.cc
 
 # MySql sources
 mysql_sources = Split('''
@@ -235,14 +240,6 @@ mysql_sources = Split('''
 
 # Full-system sources
 full_system_sources = Split('''
-       arch/alpha/alpha_memory.cc
-       arch/alpha/arguments.cc
-       arch/alpha/ev5.cc
-       arch/alpha/osfpal.cc
-       arch/alpha/pseudo_inst.cc
-       arch/alpha/stacktrace.cc
-       arch/alpha/vtophys.cc
-
        base/crc.cc
        base/inet.cc
        base/remote_gdb.cc
@@ -296,8 +293,18 @@ full_system_sources = Split('''
        mem/functional/physical.cc
 
        sim/system.cc
+       sim/pseudo_inst.cc
         ''')
 
+# These are now included by the architecture specific SConscript
+#      arch/alpha/alpha_memory.cc
+#      arch/alpha/arguments.cc
+#      arch/alpha/ev5.cc
+#      arch/alpha/osfpal.cc
+#      arch/alpha/pseudo_inst.cc
+#      arch/alpha/stacktrace.cc
+#      arch/alpha/vtophys.cc
+
 # turbolaser encumbered sources
 turbolaser_sources = Split('''
        encumbered/dev/dma.cc
@@ -320,9 +327,6 @@ turbolaser_sources = Split('''
 
 # Syscall emulation (non-full-system) sources
 syscall_emulation_sources = Split('''
-       arch/alpha/alpha_common_syscall_emul.cc
-       arch/alpha/alpha_linux_process.cc
-       arch/alpha/alpha_tru64_process.cc
        cpu/memtest/memtest.cc
        encumbered/eio/eio.cc
        encumbered/eio/exolex.cc
@@ -331,33 +335,46 @@ syscall_emulation_sources = Split('''
        sim/syscall_emul.cc
         ''')
 
+# These are now included by the architecture specific SConscript
+#      arch/alpha/alpha_common_syscall_emul.cc
+#      arch/alpha/alpha_linux_process.cc
+#      arch/alpha/alpha_tru64_process.cc
+
 targetarch_files = Split('''
-        alpha_common_syscall_emul.hh
         alpha_linux_process.hh
         alpha_memory.hh
         alpha_tru64_process.hh
         aout_machdep.h
         arguments.hh
-        byte_swap.hh
         ecoff_machdep.h
         ev5.hh
         faults.hh
-        isa_fullsys_traits.hh
-        isa_traits.hh
-        osfpal.hh
-        pseudo_inst.hh
         stacktrace.hh
-        vptr.hh
         vtophys.hh
         ''')
-
+#        pseudo_inst.hh
+#        isa_traits.hh
+#        osfpal.hh
+#        byte_swap.hh
+#        alpha_common_syscall_emul.hh
+#        vptr.hh
+#        isa_fullsys_traits.hh
+
+# Set up bridging headers to the architecture specific versions
 for f in targetarch_files:
-    env.Command('targetarch/' + f, 'arch/alpha/' + f,
-                '''echo '#include "arch/alpha/%s"' > $TARGET''' % f)
+    env.Command('targetarch/' + f, 'arch/%s/%s' % (env['TARGET_ISA'], f),
+                '''echo '#include "arch/%s/%s"' > $TARGET''' % (env['TARGET_ISA'], f))
 
+# Let the target architecture define what sources it needs
+arch_source = SConscript('arch/%s/SConscript' % env['TARGET_ISA'],
+       build_dir = 'build/%s/' % env['BUILD_DIR'],
+       exports = 'env', duplicate = False)
+
+# Add a flag defining what THE_ISA should be for all compilation
+env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])
 
 # Set up complete list of sources based on configuration.
-sources = base_sources
+sources = base_sources + arch_source
 
 if env['FULL_SYSTEM']:
     sources += full_system_sources
@@ -372,6 +389,27 @@ if env['USE_MYSQL']:
 for opt in env.ExportOptions:
     env.ConfigFile(opt)
 
+###################################################
+#
+# Add an SCons scanner for ISA files
+#
+###################################################
+import SCons.Scanner
+
+def ISAScan():
+   return SCons.Scanner.Classic("ISAScan",
+                                "$ISASUFFIXES",
+                                "SRCDIR",
+                                '^[ \t]*##[ \t]*include[ \t]*"([^>"]+)"')
+
+def ISAPath(env, dir, target=None, source=None, a=None):
+   return (Dir(env['SRCDIR']), Dir('.'))   
+
+iscan = Scanner(function = ISAScan().scan, skeys = [".isa", ".ISA"],
+                path_function = ISAPath)
+env.Append(SCANNERS = iscan)
+
 ###################################################
 #
 # Special build rules.
@@ -385,15 +423,24 @@ env.Command(Split('base/traceflags.hh base/traceflags.cc'),
             'python $SOURCE $TARGET.base')
 
 # several files are generated from arch/$TARGET_ISA/isa_desc.
-env.Command(Split('''arch/alpha/decoder.cc
-                    arch/alpha/decoder.hh
-                     arch/alpha/alpha_o3_exec.cc
-                    arch/alpha/fast_cpu_exec.cc
-                     arch/alpha/simple_cpu_exec.cc
-                     arch/alpha/full_cpu_exec.cc'''),
-            Split('''arch/alpha/isa_desc
-                    arch/isa_parser.py'''),
-            '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/alpha')
+env.Command(Split('''
+       arch/%s/decoder.cc
+       arch/%s/decoder.hh
+        arch/%s/alpha_o3_exec.cc
+       arch/%s/fast_cpu_exec.cc
+        arch/%s/simple_cpu_exec.cc
+        arch/%s/full_cpu_exec.cc''' %
+       (env['TARGET_ISA'],
+       env['TARGET_ISA'],
+       env['TARGET_ISA'],
+       env['TARGET_ISA'],
+       env['TARGET_ISA'],
+       env['TARGET_ISA'])),
+       Split('''
+       arch/%s/isa/main.isa
+       arch/isa_parser.py''' %
+       env['TARGET_ISA']),
+       '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/%s' % env['TARGET_ISA'])
 
 
 # libelf build is described in its own SConscript file.