From nobody Mon Feb 9 15:45:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500440654885589.30521659671; Tue, 18 Jul 2017 22:04:14 -0700 (PDT) Received: from localhost ([::1]:59914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXh9h-0000e7-LC for importer@patchew.org; Wed, 19 Jul 2017 01:04:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXh3N-0003IV-Cf for qemu-devel@nongnu.org; Wed, 19 Jul 2017 00:57:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXh3M-00026e-Jb for qemu-devel@nongnu.org; Wed, 19 Jul 2017 00:57:41 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXh3M-00026L-EA for qemu-devel@nongnu.org; Wed, 19 Jul 2017 00:57:40 -0400 Received: by mail-pf0-x242.google.com with SMTP id q85so5086206pfq.2 for ; Tue, 18 Jul 2017 21:57:40 -0700 (PDT) Received: from bigtime.twiddle.net (14-203-207-215.tpgi.com.au. [14.203.207.215]) by smtp.gmail.com with ESMTPSA id m196sm9062855pga.33.2017.07.18.21.57.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 21:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bj/hep4jkT1lmODBIyaJNVEcwEKRk0ROtG4hxaztEIQ=; b=MrW/VSb/kb+R6BRhoEjWp6vM2bRmH8NbeWEGHSaUmoN6V9rgY6uqKQpmfZ16J+vbDe 8+ejCax4riruk/hcK3sRwP2VP07hsAkDxoEohoc9syailobLBnHOltRMoTkjMX1xIQNH sJSuHeh3NO8c3zl5Uy19EI6dfbShG8Z5GcE/K0cGExPk6oyMiXS6HQFtNi2a/y0JPeIK c/uDWHE+qaeZshagQw8LZcAa213oLAPW8VfueiNEJRs4TFSpl5+UKVessJJjmYGWaIx1 owtCCAmV/zidpqv5giUokx/inPS/kl0flZoANmiUnawwYWopGqHrbiKBd3yQ6J8GozNH 8HjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Bj/hep4jkT1lmODBIyaJNVEcwEKRk0ROtG4hxaztEIQ=; b=nGW/03GXmhwy5dNfCtDbvhlCNthLoxr+qs/JJVaYzK32Y+sRyV6Z7zYINirY7H9ybC YJVE0YxqVP2hjuB4lmZtCL+79EZB3mtOOUjY0hrlJ4xq04nUtiXG4Ltn2Ug9vbxeNlhh WyqZhmq66YI6JL3HqtTBTLx0dfFsRHHu4S6MYsKqNoxtoXSpSAWSgo0HCW3PYvyYX5ui tIDmhkKcZ9MmQuZZbznR/ddOxwKzQcW1uCpuFSh503pHJd4jf4HCdSwnXNMl2MOXkkZo QAa0k2+TD7qMJuPeWVBGgNgbvVCxXi6mjtiv3H9zqjh1rBSF01JOr6n+vEGFZHQKGklJ YK9Q== X-Gm-Message-State: AIVw112x5fgeutLq8+jU8+jySRyFQY8hJ9jbqYb27LIi/xJoJIx4iXzP ALralnxQeJpFm3lHK/M= X-Received: by 10.84.215.129 with SMTP id l1mr1147216pli.275.1500440259173; Tue, 18 Jul 2017 21:57:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 18 Jul 2017 18:57:11 -1000 Message-Id: <20170719045722.25492-4-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170719045722.25492-1-rth@twiddle.net> References: <20170719045722.25492-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PULL 03/14] tcg: Expand glue macros before stringifying helper names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- include/exec/helper-tcg.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index bb92877..b0c5baf 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -6,31 +6,35 @@ =20 #include "exec/helper-head.h" =20 +/* Need one more level of indirection before stringification + to get all the macros expanded first. */ +#define str(s) #s + #define DEF_HELPER_FLAGS_0(NAME, FLAGS, ret) \ - { .func =3D HELPER(NAME), .name =3D #NAME, .flags =3D FLAGS, \ + { .func =3D HELPER(NAME), .name =3D str(NAME), .flags =3D FLAGS, \ .sizemask =3D dh_sizemask(ret, 0) }, =20 #define DEF_HELPER_FLAGS_1(NAME, FLAGS, ret, t1) \ - { .func =3D HELPER(NAME), .name =3D #NAME, .flags =3D FLAGS, \ + { .func =3D HELPER(NAME), .name =3D str(NAME), .flags =3D FLAGS, \ .sizemask =3D dh_sizemask(ret, 0) | dh_sizemask(t1, 1) }, =20 #define DEF_HELPER_FLAGS_2(NAME, FLAGS, ret, t1, t2) \ - { .func =3D HELPER(NAME), .name =3D #NAME, .flags =3D FLAGS, \ + { .func =3D HELPER(NAME), .name =3D str(NAME), .flags =3D FLAGS, \ .sizemask =3D dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) }, =20 #define DEF_HELPER_FLAGS_3(NAME, FLAGS, ret, t1, t2, t3) \ - { .func =3D HELPER(NAME), .name =3D #NAME, .flags =3D FLAGS, \ + { .func =3D HELPER(NAME), .name =3D str(NAME), .flags =3D FLAGS, \ .sizemask =3D dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) }, =20 #define DEF_HELPER_FLAGS_4(NAME, FLAGS, ret, t1, t2, t3, t4) \ - { .func =3D HELPER(NAME), .name =3D #NAME, .flags =3D FLAGS, \ + { .func =3D HELPER(NAME), .name =3D str(NAME), .flags =3D FLAGS, \ .sizemask =3D dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) }, =20 #define DEF_HELPER_FLAGS_5(NAME, FLAGS, ret, t1, t2, t3, t4, t5) \ - { .func =3D HELPER(NAME), .name =3D #NAME, .flags =3D FLAGS, \ + { .func =3D HELPER(NAME), .name =3D str(NAME), .flags =3D FLAGS, \ .sizemask =3D dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \ | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) \ | dh_sizemask(t5, 5) }, @@ -39,6 +43,7 @@ #include "trace/generated-helpers.h" #include "tcg-runtime.h" =20 +#undef str #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 #undef DEF_HELPER_FLAGS_2 --=20 2.9.4