changeset a24d88e850e2 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=a24d88e850e2
description:
isa_parser: Make SCons import the isa_parser
this is instead of forking a new interpreter
diffstat:
1 file changed, 31 insertions(+), 26 deletions(-)
src/arch/SConscript | 57 +++++++++++++++++++++++++++------------------------
diffs (76 lines):
diff -r 0288d8e8b192 -r a24d88e850e2 src/arch/SConscript
--- a/src/arch/SConscript Fri Feb 26 18:14:48 2010 -0800
+++ b/src/arch/SConscript Fri Feb 26 18:14:48 2010 -0800
@@ -90,41 +90,46 @@
# output from the ISA description (*.isa) files.
#
+#
+# Grab the CPU Model information
+#
+
# Convert to File node to fix path
-isa_parser = File('isa_parser.py')
cpu_models_file = File('../cpu/cpu_models.py')
# This sucks in the defintions of the CpuModel objects.
execfile(cpu_models_file.srcnode().abspath)
-# Several files are generated from the ISA description.
-# We always get the basic decoder and header file.
-isa_desc_gen_files = [ 'decoder.cc', 'decoder.hh', 'max_inst_regs.hh' ]
-# We also get an execute file for each selected CPU model.
-isa_desc_gen_files += [CpuModel.dict[cpu].filename
- for cpu in env['CPU_MODELS']]
+# 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')
+
+ # Several files are generated from the ISA description.
+ # We always get the basic decoder and header file.
+ target = [ 'decoder.cc', 'decoder.hh', 'max_inst_regs.hh' ]
+ # 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 ]
+
+ARCH_DIR = Dir('.')
+
+def isa_desc_action(target, source, env):
+ # Add the current directory to the system path so we can import files
+ sys.path[0:0] = [ ARCH_DIR.srcnode().abspath ]
+ import isa_parser
+
+ models = [ s.get_contents() for s in source[1:] ]
+ 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)
# Also include the CheckerCPU as one of the models if it is being
# enabled via command line.
-if env['USE_CHECKER']:
- isa_desc_gen_files += [CpuModel.dict['CheckerCPU'].filename]
-
-# 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):
- return (isa_desc_gen_files, [isa_parser, cpu_models_file] + source)
-
-# Pieces are in place, so create the builder.
-python = sys.executable # use same Python binary used to run scons
-
-# Also include the CheckerCPU as one of the models if it is being
-# enabled via command line.
-if env['USE_CHECKER']:
- isa_desc_builder = Builder(action=python + ' $SOURCES $TARGET.dir
$CPU_MODELS CheckerCPU',
- emitter = isa_desc_emitter)
-else:
- isa_desc_builder = Builder(action=python + ' $SOURCES $TARGET.dir
$CPU_MODELS',
- emitter = isa_desc_emitter)
+isa_desc_builder = Builder(action=isa_desc_action, emitter=isa_desc_emitter)
env.Append(BUILDERS = { 'ISADesc' : isa_desc_builder })
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
