From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHY-0000pQ-63 for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHCHT-00086E-Lw for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHT-000863-Dw for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:27 -0400 From: Stefan Hajnoczi Date: Tue, 12 Aug 2014 14:37:48 +0100 Message-Id: <1407850675-11890-12-git-send-email-stefanha@redhat.com> In-Reply-To: <1407850675-11890-1-git-send-email-stefanha@redhat.com> References: <1407850675-11890-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 11/18] trace: [tcg] Define TCG tracing helper routine wrappers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi From: Llu=C3=ADs Vilanova Generates header "trace/generated-helpers-wrappers.h" with definitions fo= r TCG helper wrappers. These wrappers ('gen_helper_trace_${event}_exec_wrapper') transform mixed= native and TCG argument types to TCG types and call the actual TCG helpers ('gen_helper_trace_${event}_exec_proxy'). Signed-off-by: Llu=C3=ADs Vilanova Signed-off-by: Stefan Hajnoczi --- .gitignore | 1 + Makefile | 1 + scripts/tracetool/format/tcg_helper_wrapper_h.py | 70 ++++++++++++++++++= ++++++ trace/Makefile.objs | 8 +++ 4 files changed, 80 insertions(+) create mode 100644 scripts/tracetool/format/tcg_helper_wrapper_h.py diff --git a/.gitignore b/.gitignore index 643b34b..6631c57 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ /trace/generated-tracers.dtrace /trace/generated-events.h /trace/generated-events.c +/trace/generated-helpers-wrappers.h /trace/generated-helpers.h /trace/generated-helpers.c /trace/generated-ust-provider.h diff --git a/Makefile b/Makefile index 09601f7..fa93fc9 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,7 @@ GENERATED_HEADERS +=3D trace/generated-tracers-dtrace.h endif GENERATED_SOURCES +=3D trace/generated-tracers.c =20 +GENERATED_HEADERS +=3D trace/generated-helpers-wrappers.h GENERATED_HEADERS +=3D trace/generated-helpers.h GENERATED_SOURCES +=3D trace/generated-helpers.c =20 diff --git a/scripts/tracetool/format/tcg_helper_wrapper_h.py b/scripts/t= racetool/format/tcg_helper_wrapper_h.py new file mode 100644 index 0000000..cac5a87 --- /dev/null +++ b/scripts/tracetool/format/tcg_helper_wrapper_h.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" +Generate trace/generated-helpers-wrappers.h. +""" + +__author__ =3D "Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " +__license__ =3D "GPL version 2 or (at your option) any later version" + +__maintainer__ =3D "Stefan Hajnoczi" +__email__ =3D "stefanha@linux.vnet.ibm.com" + + +from tracetool import out +from tracetool.transform import * + + +def generate(events, backend): + events =3D [e for e in events + if "disable" not in e.properties] + + out('/* This file is autogenerated by tracetool, do not edit. */', + '', + '#define tcg_temp_new_nop(v) (v)', + '#define tcg_temp_free_nop(v)', + '', + ) + + for e in events: + if "tcg-exec" not in e.properties: + continue + + # tracetool.generate always transforms types to host + e_args =3D e.original.args + + # mixed-type to TCG helper bridge + args_tcg_compat =3D e_args.transform(HOST_2_TCG_COMPAT) + + code_new =3D [ + "%(tcg_type)s __%(name)s =3D %(tcg_func)s(%(name)s);" % + {"tcg_type": transform_type(type_, HOST_2_TCG), + "tcg_func": transform_type(type_, HOST_2_TCG_TMP_NEW), + "name": name} + for (type_, name) in args_tcg_compat + ] + + code_free =3D [ + "%(tcg_func)s(__%(name)s);" % + {"tcg_func": transform_type(type_, HOST_2_TCG_TMP_FREE), + "name": name} + for (type_, name) in args_tcg_compat + ] + + gen_name =3D "gen_helper_" + e.api() + + out('static inline void %(name)s(%(args)s)', + '{', + ' %(code_new)s', + ' %(proxy_name)s(%(tmp_names)s);', + ' %(code_free)s', + '}', + name=3Dgen_name, + args=3De_args, + proxy_name=3Dgen_name + "_proxy", + code_new=3D"\n ".join(code_new), + code_free=3D"\n ".join(code_free), + tmp_names=3D", ".join(["__%s" % name for _, name in e_args])= , + ) diff --git a/trace/Makefile.objs b/trace/Makefile.objs index 2d36142..72cc3f5 100644 --- a/trace/Makefile.objs +++ b/trace/Makefile.objs @@ -99,6 +99,14 @@ endif ################################################## # Translation level =20 +$(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h= -timestamp +$(obj)/generated-helpers-wrappers.h-timestamp: $(SRC_PATH)/trace-events = $(BUILD_DIR)/config-host.mak + $(call quiet-command,$(TRACETOOL) \ + --format=3Dtcg-helper-wrapper-h \ + --backend=3D$(TRACE_BACKENDS) \ + < $< > $@," GEN $(patsubst %-timestamp,%,$@)") + @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp= ,%,$@) + $(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp $(obj)/generated-helpers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_D= IR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --=20 1.9.3