ISA: Make the decode function part of the ISA's decoder.

[gem5.git] / src / arch / SConscript

diff --git a/src/arch/SConscript b/src/arch/SConscript
index a8b7f53541180d1f3796f8e78d2fd4d69d415ac8..f271f487f5904c169c424efd6aa71792bca95111 100644 (file)
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -29,6 +29,7 @@
 # Authors: Steve Reinhardt
 
 import sys
+import os
 
 Import('*')
 
@@ -43,7 +44,7 @@ Import('*')
 
 # List of headers to generate
 isa_switch_hdrs = Split('''
-        faults.hh
+        decoder.hh
         interrupts.hh
         isa.hh
         isa_traits.hh
@@ -89,12 +90,13 @@ env.Append(SCANNERS = isa_scanner)
 # output from the ISA description (*.isa) files.
 #
 
+isa_parser = File('isa_parser.py')
+
 # The emitter patches up the sources & targets to include the
 # autogenerated files as targets and isa parser itself as a source.
 def isa_desc_emitter(target, source, env):
     cpu_models = list(env['CPU_MODELS'])
-    if env['USE_CHECKER']:
-        cpu_models.append('CheckerCPU')
+    cpu_models.append('CheckerCPU')
 
     # Several files are generated from the ISA description.
     # We always get the basic decoder and header file.
@@ -102,7 +104,12 @@ def isa_desc_emitter(target, source, env):
     # We also get an execute file for each selected CPU model.
     target += [CpuModel.dict[cpu].filename for cpu in cpu_models]
 
-    return target, source + [ Value(m) for m in cpu_models ]
+    # List the isa parser as a source.
+    source += [ isa_parser ]
+    # Add in the CPU models.
+    source += [ Value(m) for m in cpu_models ]
+
+    return [os.path.join("generated", t) for t in target], source
 
 ARCH_DIR = Dir('.')
 
@@ -114,7 +121,8 @@ def isa_desc_action_func(target, source, env):
     sys.path[0:0] = [ ARCH_DIR.srcnode().abspath ]
     import isa_parser
 
-    models = [ s.get_contents() for s in source[1:] ]
+    # Skip over the ISA description itself and the parser to the CPU models.
+    models = [ s.get_contents() for s in source[2:] ]
     cpu_models = [CpuModel.dict[cpu] for cpu in models]
     parser = isa_parser.ISAParser(target[0].dir.abspath, cpu_models)
     parser.parse_isa_desc(source[0].abspath)