derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons,python: revert Always generate default create() methods.

Browse Source 
This reverts commit 7bb690c1ee.

Change-Id: If1b44162b24409fb44daec0159852fa44937184d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46819
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Jason Lowe-Power
2021-06-11 09:55:03 -07:00
committed by Bobby R. Bruce
parent 8c48ba9207
commit e1aaf8218e
2 changed files with 72 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/SConscript
View File

@@ -976,7 +976,7 @@ PySource('m5', 'python/m5/info.py')
# Create all of the SimObject param headers and enum headers
#
def createSimObjectParamDecl(target, source, env):
def createSimObjectParamStruct(target, source, env):
assert len(target) == 1 and len(source) == 1
name = source[0].get_text_contents()
@@ -986,16 +986,6 @@ def createSimObjectParamDecl(target, source, env):
obj.cxx_param_decl(code)
code.write(target[0].abspath)
def createSimObjectParamDef(target, source, env):
assert len(target) == 1 and len(source) == 1
name = source[0].get_text_contents()
obj = sim_objects[name]
code = code_formatter()
obj.cxx_param_def(code)
code.write(target[0].abspath)
def createSimObjectCxxConfig(is_header):
def body(target, source, env):
assert len(target) == 1 and len(source) == 1
@@ -1056,16 +1046,9 @@ for name,simobj in sorted(sim_objects.items()):
hh_file = File('params/%s.hh' % name)
params_hh_files.append(hh_file)
env.Command(hh_file, Value(name),
MakeAction(createSimObjectParamDecl, Transform("SOPARMHH")))
MakeAction(createSimObjectParamStruct, Transform("SO PARAM")))
env.Depends(hh_file, depends + extra_deps)
if not getattr(simobj, 'abstract', False) and hasattr(simobj, 'type'):
cc_file = File('params/%s.cc' % name)
env.Command(cc_file, Value(name),
MakeAction(createSimObjectParamDef, Transform("SOPARMCC")))
env.Depends(cc_file, depends + extra_deps)
Source(cc_file)
# C++ parameter description files
if GetOption('with_cxx_config'):
for name,simobj in sorted(sim_objects.items()):