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 70a8de7fbe7e0f5ae664cd3505db9f42fd331d86..f271f487f5904c169c424efd6aa71792bca95111 100644 (file)
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -29,6 +29,7 @@
 # Authors: Steve Reinhardt
 
 import sys
+import os
 
 Import('*')
 
@@ -43,6 +44,7 @@ Import('*')
 
 # List of headers to generate
 isa_switch_hdrs = Split('''
+        decoder.hh
         interrupts.hh
         isa.hh
         isa_traits.hh
@@ -94,8 +96,7 @@ isa_parser = File('isa_parser.py')
 # 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.
@@ -108,7 +109,7 @@ def isa_desc_emitter(target, source, env):
     # Add in the CPU models.
     source += [ Value(m) for m in cpu_models ]
 
-    return target, source
+    return [os.path.join("generated", t) for t in target], source
 
 ARCH_DIR = Dir('.')