| Message ID | 145505247535.4785.10937373381145935912.stgit@localhost (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Lluís Vilanova writes: > The current code forces the use of a chain of ".original" dereferences, > which looks odd. > Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> > --- > scripts/tracetool/__init__.py | 4 +--- > scripts/tracetool/format/events_h.py | 4 ++-- > scripts/tracetool/format/tcg_h.py | 4 ++-- > 3 files changed, 5 insertions(+), 7 deletions(-) > diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py > index 0663e7f..1bf9246 100644 > --- a/scripts/tracetool/__init__.py > +++ b/scripts/tracetool/__init__.py > @@ -6,7 +6,7 @@ Machinery for generating tracing-related intermediate files. > """ > __author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" > -__copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>" > +__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>" > __license__ = "GPL version 2 or (at your option) any later version" > __maintainer__ = "Stefan Hajnoczi" > @@ -287,8 +287,6 @@ def _read_events(fobj): > event.args): > if atrans == aorig: > args_trans.append(atrans) > - event_trans.args = Arguments(args_trans) > - event_trans = event_trans.copy() > event_exec = event.copy() > event_exec.name += "_exec" I've detected an error in this piece. Please ignore this patch until v7. Thanks, Lluis
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 0663e7f..1bf9246 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -6,7 +6,7 @@ Machinery for generating tracing-related intermediate files. """ __author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" -__copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>" +__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>" __license__ = "GPL version 2 or (at your option) any later version" __maintainer__ = "Stefan Hajnoczi" @@ -287,8 +287,6 @@ def _read_events(fobj): event.args): if atrans == aorig: args_trans.append(atrans) - event_trans.args = Arguments(args_trans) - event_trans = event_trans.copy() event_exec = event.copy() event_exec.name += "_exec" diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py index 9f114a3..bbfaa5b 100644 --- a/scripts/tracetool/format/events_h.py +++ b/scripts/tracetool/format/events_h.py @@ -6,7 +6,7 @@ trace/generated-events.h """ __author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" -__copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>" +__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>" __license__ = "GPL version 2 or (at your option) any later version" __maintainer__ = "Stefan Hajnoczi" @@ -43,7 +43,7 @@ def generate(events, backend): if "tcg-trans" in e.properties: # a single define for the two "sub-events" out('#define TRACE_%(name)s_ENABLED %(enabled)d', - name=e.original.original.name.upper(), + name=e.original.name.upper(), enabled=enabled) out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled)) diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py index f676b66..0d2cf79 100644 --- a/scripts/tracetool/format/tcg_h.py +++ b/scripts/tracetool/format/tcg_h.py @@ -6,7 +6,7 @@ Generate .h file for TCG code generation. """ __author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" -__copyright__ = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>" +__copyright__ = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>" __license__ = "GPL version 2 or (at your option) any later version" __maintainer__ = "Stefan Hajnoczi" @@ -36,7 +36,7 @@ def generate(events, backend): continue # get the original event definition - e = e.original.original + e = e.original out('static inline void %(name_tcg)s(%(args)s)', '{',
The current code forces the use of a chain of ".original" dereferences, which looks odd. Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> --- scripts/tracetool/__init__.py | 4 +--- scripts/tracetool/format/events_h.py | 4 ++-- scripts/tracetool/format/tcg_h.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-)