more changes for subtick labels.

[gem5.git] / SConscript

diff --git a/SConscript b/SConscript
index 98dfad2177161c811b1a4329e67fdcfdcde10396..360f91b3a507da8469e082f9299ac0d89bfabd26 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -209,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
@@ -292,6 +293,7 @@ full_system_sources = Split('''
        mem/functional/physical.cc
 
        sim/system.cc
+       sim/pseudo_inst.cc
         ''')
 
 # These are now included by the architecture specific SConscript
@@ -339,24 +341,24 @@ syscall_emulation_sources = Split('''
 #      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:
@@ -368,6 +370,9 @@ 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 + arch_source
 
@@ -397,7 +402,7 @@ def ISAScan():
                                 "SRCDIR",
                                 '^[ \t]*##[ \t]*include[ \t]*"([^>"]+)"')
 
-def ISAPath(env, dir, a=None):
+def ISAPath(env, dir, target=None, source=None, a=None):
    return (Dir(env['SRCDIR']), Dir('.'))   
 
 iscan = Scanner(function = ISAScan().scan, skeys = [".isa", ".ISA"],
@@ -432,7 +437,7 @@ env.Command(Split('''
        env['TARGET_ISA'],
        env['TARGET_ISA'])),
        Split('''
-       arch/%s/isa_desc
+       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'])