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

scons: Separate debug flags from debug-format flags

Browse Source 
Debug flags are flags that aid with debugging by printing
relevant information when enabled. Debug-formatting flags
define how the debug flags will print the information.

Although a viability, this patch does not support declaring
compound format flags.

As a side effect, now debug flags and debug-formatting flags
are printed in different lists, when using --debug-help.

Change-Id: Ieae68745276218cf4e9c1d37d7bf3bd1f19709ae
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39076
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Daniel R. Carvalho
2021-01-13 20:58:47 -03:00
committed by Daniel Carvalho
parent 58ccc6287e
commit 4ff5fa567b
6 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/SConscript
View File

@@ -618,20 +618,24 @@ Export('GTest')
# Debug Flags
#
debug_flags = {}
def DebugFlag(name, desc=None):
def DebugFlag(name, desc=None, fmt=False):
if name in debug_flags:
raise AttributeError("Flag {} already specified".format(name))
debug_flags[name] = (name, (), desc)
debug_flags[name] = (name, (), desc, fmt)
def CompoundFlag(name, flags, desc=None):
if name in debug_flags:
raise AttributeError("Flag {} already specified".format(name))
compound = tuple(flags)
debug_flags[name] = (name, compound, desc)
debug_flags[name] = (name, compound, desc, False)
def DebugFormatFlag(name, desc=None):
DebugFlag(name, desc, True)
Export('DebugFlag')
Export('CompoundFlag')
Export('DebugFormatFlag')
########################################################################
#
@@ -1109,11 +1113,14 @@ namespace Debug {
''')
for name, flag in sorted(source[0].read().items()):
n, compound, desc = flag
n, compound, desc, fmt = flag
assert n == name
if not compound:
code('SimpleFlag $name("$name", "$desc");')
if fmt:
code('SimpleFlag $name("$name", "$desc", true);')
else:
code('SimpleFlag $name("$name", "$desc", false);')
else:
comp_code('CompoundFlag $name("$name", "$desc", {')
comp_code.indent()
@@ -1132,7 +1139,7 @@ def makeDebugFlagHH(target, source, env):
assert(len(target) == 1 and len(source) == 1)
val = eval(source[0].get_contents())
name, compound, desc = val
name, compound, desc, fmt = val
code = code_formatter()
@@ -1168,7 +1175,7 @@ namespace Debug {
code.write(str(target[0]))
for name,flag in sorted(debug_flags.items()):
n, compound, desc = flag
n, compound, desc, fmt = flag
assert n == name
hh_file = 'debug/%s.hh' % name