summaryrefslogtreecommitdiff
path: root/src/mem/protocol/SConsopts
diff options
context:
space:
mode:
authorJason Power <power.jg@gmail.com>2012-09-12 14:52:04 -0500
committerJason Power <power.jg@gmail.com>2012-09-12 14:52:04 -0500
commitaa8bcd15ec1ba916f3e750f41697a65e06b3c2ac (patch)
treeef66477d4b1904699ab751a841ff465768ab158e /src/mem/protocol/SConsopts
parentc6927ed13868c096a60df6a217f92857799b5be6 (diff)
downloadgem5-aa8bcd15ec1ba916f3e750f41697a65e06b3c2ac.tar.xz
Ruby: Modify Scons so that we can put .sm files in extras
Also allows for header files which are required in slicc generated code to be in a directory other than src/mem/ruby/slicc_interface.
Diffstat (limited to 'src/mem/protocol/SConsopts')
-rw-r--r--src/mem/protocol/SConsopts17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mem/protocol/SConsopts b/src/mem/protocol/SConsopts
index 78b93c40e..95b043bc5 100644
--- a/src/mem/protocol/SConsopts
+++ b/src/mem/protocol/SConsopts
@@ -32,7 +32,7 @@ import os
Import('*')
-all_protocols = [
+all_protocols.extend([
'MESI_CMP_directory',
'MI_example',
'MOESI_CMP_directory',
@@ -40,13 +40,14 @@ all_protocols = [
'MOESI_hammer',
'Network_test',
'None'
- ]
-
-opt = EnumVariable('PROTOCOL', 'Coherence protocol for Ruby', 'None',
- all_protocols)
-
-sticky_vars.AddVariables(opt)
-export_vars += ['PROTOCOL']
+ ])
opt = BoolVariable('SLICC_HTML', 'Create HTML files', False)
sticky_vars.AddVariables(opt)
+
+protocol_dirs.append(Dir('.').abspath)
+
+protocol_base = Dir('.')
+Export('protocol_base')
+
+slicc_includes.append('mem/ruby/slicc_interface/RubySlicc_includes.hh')