ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trace: Remove unnecessary intermediate event copies 

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>
Message-id: 145641858988.30295.7223459456488075843.stgit@localhost
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Lluís Vilanova 2016-02-25 17:43:10 +01:00 committed by Stefan Hajnoczi
parent 3596f524d4
commit 56797b1fbc
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/tracetool/__init__.py
View File

@ -6,7 +6,7 @@ Machinery for generating tracing-related intermediate files.
""" """
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" __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" __license__ = "GPL version 2 or (at your option) any later version"
__maintainer__ = "Stefan Hajnoczi" __maintainer__ = "Stefan Hajnoczi"
@ -288,13 +288,12 @@ def _read_events(fobj):
if atrans == aorig: if atrans == aorig:
args_trans.append(atrans) args_trans.append(atrans)
event_trans.args = Arguments(args_trans) event_trans.args = Arguments(args_trans)
event_trans = event_trans.copy()
event_exec = event.copy() event_exec = event.copy()
event_exec.name += "_exec" event_exec.name += "_exec"
event_exec.properties += ["tcg-exec"] event_exec.properties += ["tcg-exec"]
event_exec.fmt = event.fmt[1] event_exec.fmt = event.fmt[1]
event_exec = event_exec.transform(tracetool.transform.TCG_2_HOST) event_exec.args = event_exec.args.transform(tracetool.transform.TCG_2_HOST)
new_event = [event_trans, event_exec] new_event = [event_trans, event_exec]
event.event_trans, event.event_exec = new_event event.event_trans, event.event_exec = new_event

4
scripts/tracetool/format/events_h.py
View File

@ -6,7 +6,7 @@ trace/generated-events.h
""" """
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" __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" __license__ = "GPL version 2 or (at your option) any later version"
__maintainer__ = "Stefan Hajnoczi" __maintainer__ = "Stefan Hajnoczi"
@ -43,7 +43,7 @@ def generate(events, backend):
if "tcg-trans" in e.properties: if "tcg-trans" in e.properties:
# a single define for the two "sub-events" # a single define for the two "sub-events"
out('#define TRACE_%(name)s_ENABLED %(enabled)d', out('#define TRACE_%(name)s_ENABLED %(enabled)d',
name=e.original.original.name.upper(), name=e.original.name.upper(),
enabled=enabled) enabled=enabled)
out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled)) out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))

4
scripts/tracetool/format/tcg_h.py
View File

@ -6,7 +6,7 @@ Generate .h file for TCG code generation.
""" """
__author__ = "Lluís Vilanova <vilanova@ac.upc.edu>" __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" __license__ = "GPL version 2 or (at your option) any later version"
__maintainer__ = "Stefan Hajnoczi" __maintainer__ = "Stefan Hajnoczi"
@ -36,7 +36,7 @@ def generate(events, backend):
continue continue
# get the original event definition # get the original event definition
e = e.original.original e = e.original
out('static inline void %(name_tcg)s(%(args)s)', out('static inline void %(name_tcg)s(%(args)s)',
'{', '{',