[PATCH v2 45/52] tcg: Define IN_TCG

Richard Henderson posted 52 patches 2 years, 7 months ago
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Michael Rolnik <mrolnik@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Taylor Simpson <tsimpson@quicinc.com>, Alessandro Di Federico <ale@rev.ng>, Anton Johansson <anjo@rev.ng>, Eduardo Habkost <eduardo@habkost.net>, Song Gao <gaosong@loongson.cn>, Xiaojuan Yang <yangxiaojuan@loongson.cn>, Laurent Vivier <laurent@vivier.eu>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Chris Wulff <crwulff@gmail.com>, Marek Vasut <marex@denx.de>, Stafford Horne <shorne@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liweiwei@iscas.ac.cn>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Max Filippov <jcmvbkbc@gmail.com>, WANG Xuerui <git@xen0n.name>, Huacai Chen <chenhuacai@kernel.org>, Stefan Weil <sw@weilnetz.de>
There is a newer version of this series
[PATCH v2 45/52] tcg: Define IN_TCG
Posted by Richard Henderson 2 years, 7 months ago
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 tcg/region.c      | 2 ++
 tcg/tcg-common.c  | 2 ++
 tcg/tcg-op-gvec.c | 2 ++
 tcg/tcg-op-ldst.c | 2 ++
 tcg/tcg-op-vec.c  | 2 ++
 tcg/tcg-op.c      | 2 ++
 tcg/tcg.c         | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/tcg/region.c b/tcg/region.c
index bef4c4756f..34ac124081 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#define IN_TCG
+
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/madvise.h"
diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
index 35e7616ae9..678ab482f7 100644
--- a/tcg/tcg-common.c
+++ b/tcg/tcg-common.c
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#define IN_TCG
+
 #include "qemu/osdep.h"
 #include "tcg/tcg.h"
 
diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c
index 95a588d6d2..0ecde731f4 100644
--- a/tcg/tcg-op-gvec.c
+++ b/tcg/tcg-op-gvec.c
@@ -17,6 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#define IN_TCG
+
 #include "qemu/osdep.h"
 #include "tcg/tcg.h"
 #include "tcg/tcg-temp-internal.h"
diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c
index f32c0fda35..dc8dcd8b4f 100644
--- a/tcg/tcg-op-ldst.c
+++ b/tcg/tcg-op-ldst.c
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#define IN_TCG
+
 #include "qemu/osdep.h"
 #include "tcg/tcg.h"
 #include "tcg/tcg-temp-internal.h"
diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c
index 35d67eeda0..6c70178e9e 100644
--- a/tcg/tcg-op-vec.c
+++ b/tcg/tcg-op-vec.c
@@ -17,6 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#define IN_TCG
+
 #include "qemu/osdep.h"
 #include "tcg/tcg.h"
 #include "tcg/tcg-temp-internal.h"
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 8c1ad49c4e..16ff61c65d 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#define IN_TCG
+
 #include "qemu/osdep.h"
 #include "exec/exec-all.h"
 #include "tcg/tcg.h"
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 7d0449f6a9..38321d6d54 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 
+#define IN_TCG
+
 #include "qemu/osdep.h"
 
 /* Define to jump the ELF file used to communicate with GDB.  */
-- 
2.34.1
Re: [PATCH v2 45/52] tcg: Define IN_TCG
Posted by Philippe Mathieu-Daudé 2 years, 7 months ago
On 23/5/23 15:53, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   tcg/region.c      | 2 ++
>   tcg/tcg-common.c  | 2 ++
>   tcg/tcg-op-gvec.c | 2 ++
>   tcg/tcg-op-ldst.c | 2 ++
>   tcg/tcg-op-vec.c  | 2 ++
>   tcg/tcg-op.c      | 2 ++
>   tcg/tcg.c         | 2 ++
>   7 files changed, 14 insertions(+)
> 
> diff --git a/tcg/region.c b/tcg/region.c
> index bef4c4756f..34ac124081 100644
> --- a/tcg/region.c
> +++ b/tcg/region.c
> @@ -22,6 +22,8 @@
>    * THE SOFTWARE.
>    */
>   
> +#define IN_TCG
> +
>   #include "qemu/osdep.h"
>   #include "qemu/units.h"
>   #include "qemu/madvise.h"
> diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
> index 35e7616ae9..678ab482f7 100644
> --- a/tcg/tcg-common.c
> +++ b/tcg/tcg-common.c
> @@ -22,6 +22,8 @@
>    * THE SOFTWARE.
>    */
>   
> +#define IN_TCG
> +
>   #include "qemu/osdep.h"
>   #include "tcg/tcg.h"

[...]

Could this be enforced via meson instead? Smth like:

   static_library(tcgcommon.fa,
                  [tcgcommon_ss.sources()],
                  c_args: [-DIN_TCG], ...)
Re: [PATCH v2 45/52] tcg: Define IN_TCG
Posted by Richard Henderson 2 years, 6 months ago
On 5/23/23 09:45, Philippe Mathieu-Daudé wrote:
> On 23/5/23 15:53, Richard Henderson wrote:
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>   tcg/region.c      | 2 ++
>>   tcg/tcg-common.c  | 2 ++
>>   tcg/tcg-op-gvec.c | 2 ++
>>   tcg/tcg-op-ldst.c | 2 ++
>>   tcg/tcg-op-vec.c  | 2 ++
>>   tcg/tcg-op.c      | 2 ++
>>   tcg/tcg.c         | 2 ++
>>   7 files changed, 14 insertions(+)
>>
>> diff --git a/tcg/region.c b/tcg/region.c
>> index bef4c4756f..34ac124081 100644
>> --- a/tcg/region.c
>> +++ b/tcg/region.c
>> @@ -22,6 +22,8 @@
>>    * THE SOFTWARE.
>>    */
>> +#define IN_TCG
>> +
>>   #include "qemu/osdep.h"
>>   #include "qemu/units.h"
>>   #include "qemu/madvise.h"
>> diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
>> index 35e7616ae9..678ab482f7 100644
>> --- a/tcg/tcg-common.c
>> +++ b/tcg/tcg-common.c
>> @@ -22,6 +22,8 @@
>>    * THE SOFTWARE.
>>    */
>> +#define IN_TCG
>> +
>>   #include "qemu/osdep.h"
>>   #include "tcg/tcg.h"
> 
> [...]
> 
> Could this be enforced via meson instead? Smth like:
> 
>    static_library(tcgcommon.fa,
>                   [tcgcommon_ss.sources()],
>                   c_args: [-DIN_TCG], ...)

Actually, it's rubbish now.  I think this was meant for exec/poison.h, but I'm not 
currently using it there.

r~


Re: [PATCH v2 45/52] tcg: Define IN_TCG
Posted by Philippe Mathieu-Daudé 2 years, 7 months ago
On 23/5/23 18:45, Philippe Mathieu-Daudé wrote:
> On 23/5/23 15:53, Richard Henderson wrote:
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>   tcg/region.c      | 2 ++
>>   tcg/tcg-common.c  | 2 ++
>>   tcg/tcg-op-gvec.c | 2 ++
>>   tcg/tcg-op-ldst.c | 2 ++
>>   tcg/tcg-op-vec.c  | 2 ++
>>   tcg/tcg-op.c      | 2 ++
>>   tcg/tcg.c         | 2 ++
>>   7 files changed, 14 insertions(+)
>>
>> diff --git a/tcg/region.c b/tcg/region.c
>> index bef4c4756f..34ac124081 100644
>> --- a/tcg/region.c
>> +++ b/tcg/region.c
>> @@ -22,6 +22,8 @@
>>    * THE SOFTWARE.
>>    */
>> +#define IN_TCG
>> +
>>   #include "qemu/osdep.h"
>>   #include "qemu/units.h"
>>   #include "qemu/madvise.h"
>> diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
>> index 35e7616ae9..678ab482f7 100644
>> --- a/tcg/tcg-common.c
>> +++ b/tcg/tcg-common.c
>> @@ -22,6 +22,8 @@
>>    * THE SOFTWARE.
>>    */
>> +#define IN_TCG
>> +
>>   #include "qemu/osdep.h"
>>   #include "tcg/tcg.h"
> 
> [...]
> 
> Could this be enforced via meson instead? Smth like:
> 
>    static_library(tcgcommon.fa,
>                   [tcgcommon_ss.sources()],
>                   c_args: [-DIN_TCG], ...)
> 

Just noticed that in the last patch of this series (52/52):
https://lore.kernel.org/qemu-devel/20230523135322.678948-53-richard.henderson@linaro.org/