From nobody Sun Nov 16 07:41:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1741808795; cv=none; d=zohomail.com; s=zohoarc; b=fRt/DEWuFOaa1g8TrQD44I08a3uYCroK8KEtPN9r/uDJe56BSFmawLG3HVk8yjZhg1MaaTeFbBrgfgvYJYGY713lCiQL/IU0ejH+vuyI+nt6QYd7o+oWxQmkWLe4uPu77zapzZyLWQafiKPXjSuL/B9JAsi/FpjBHZHYqV3EuSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741808795; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=Vf5A7KBZlzsyqIWWXH3VfGxXpwBCB6/c4drzHp9C6y4=; b=Bz4fdzvlQJlyP7CFpVsRMIAW/fin6wO75aFX9fZ1h/NXISjZR71DCknaKIdTFZhKV1UJBDqYPCgFEZVg3vjmNq2s242PWOQhWn6ijf62m92qdENDivjO9mAjgqFOgacD1fzk+D5Mv4cWQ+AZC/HRyc7e6fOrFmgmqpsk1sxDhPc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741808795634873.7297657606277; Wed, 12 Mar 2025 12:46:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tsS1m-0001jk-8k; Wed, 12 Mar 2025 15:46:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tsS1E-0001h5-Ct for qemu-devel@nongnu.org; Wed, 12 Mar 2025 15:45:33 -0400 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tsS19-0006My-K6 for qemu-devel@nongnu.org; Wed, 12 Mar 2025 15:45:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=Vf5A7KBZlzsyqIWWXH3VfGxXpwBCB6/c4drzHp9C6y4=; b=wmk5y5NCd9fWFmu mZMFb1Y7pCV9Tui9Ong+6kkPPEVyfptl1WhgplEWJ5CKZxX0yX73JNz3ygBz6QCKfKGaaWyTBonSr pDLrKAy2JSkCqng0NNf2ToR/Lqaq+z638MopYufSpBkUHmXgbZI5SnRj/Al4BGJV5v9VtbqaP16B1 +E=; To: qemu-devel@nongnu.org Cc: ale@rev.ng, ltaylorsimpson@gmail.com, brian.cain@oss.qualcomm.com, philmd@linaro.org Subject: [PATCH 1/2] target/hexagon: Replace `prepare` script with meson target Date: Wed, 12 Mar 2025 20:45:46 +0100 Message-ID: <20250312194547.7364-2-anjo@rev.ng> In-Reply-To: <20250312194547.7364-1-anjo@rev.ng> References: <20250312194547.7364-1-anjo@rev.ng> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741808798673019000 Content-Type: text/plain; charset="utf-8" The purpose of the prepare script is to invoke `cpp` to preprocess input to idef-parser by expanding a few select macros. On mac osx `cpp` expands into `clang ... -traditional-cpp` which breaks macro concatenation. Replace `cpp` with `${compiler} -E` and replace the script with a meson custom_target. Signed-off-by: Anton Johansson --- target/hexagon/idef-parser/prepare | 24 ------------------------ target/hexagon/meson.build | 3 ++- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100755 target/hexagon/idef-parser/prepare diff --git a/target/hexagon/idef-parser/prepare b/target/hexagon/idef-parse= r/prepare deleted file mode 100755 index cb3622d4f8..0000000000 --- a/target/hexagon/idef-parser/prepare +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# -# Copyright(c) 2019-2021 rev.ng Labs Srl. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# - -set -e -set -o pipefail - -# Run the preprocessor and drop comments -cpp "$@" diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index bb4ebaae81..abcf00ca1f 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -280,12 +280,13 @@ if idef_parser_enabled and 'hexagon-linux-user' in ta= rget_dirs command: [python, files('gen_idef_parser_funcs.py'), semantics_gen= erated, '@OUTPUT@'], ) =20 + compiler =3D meson.get_compiler('c').get_id() preprocessed_idef_parser_input_generated =3D custom_target( 'idef_parser_input.preprocessed.h.inc', output: 'idef_parser_input.preprocessed.h.inc', input: idef_parser_input_generated, depend_files: [idef_parser_dir / 'macros.h.inc'], - command: [idef_parser_dir / 'prepare', '@INPUT@', '-I' + idef_pars= er_dir, '-o', '@OUTPUT@'], + command: [compiler, '-x', 'c', '-E', '-I', idef_parser_dir, '-o', = '@OUTPUT@', '@INPUT@'], ) =20 flex =3D generator( --=20 2.47.1 From nobody Sun Nov 16 07:41:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1741808820; cv=none; d=zohomail.com; s=zohoarc; b=iqVS8IVkuVCbof1ZIwlUI8iJFeMbfdLWDb3Poanxs21x5Kq4fG4Zgiknw71gYPE0LeRhsQBp/MpqEOrNTRsCmohBcyBsOAi32wBmua0IoXIzAG8LnzkNj+cEdIEzqToU42cbgul9osAHPh2OHXOfPOdpp8fuLb9GVyGJQBZbgcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741808820; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=lAJ7z9+A1MxQwCRsU5x2nT+Gzbox9DbplSabX+doYYY=; b=Zehs/tieFYdNuw6IfvWGm9Q1HrPJ+DttKVzpCMX2CnEaIt8isjVDgKeL+4ldehNJXhUtdTxChR60Gs4gHJR+aoOSXNxZ8hFC+g+lj5+kY+krXeSGdTlzOmxHccRigqRN6Ey6ot6kGTo9tEwhHmiu1qPKSXraMd2oJW1sjXRRXpE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741808820322432.4377001019726; Wed, 12 Mar 2025 12:47:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tsS20-0001mp-9a; Wed, 12 Mar 2025 15:46:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tsS1E-0001h7-EI for qemu-devel@nongnu.org; Wed, 12 Mar 2025 15:45:33 -0400 Received: from rev.ng ([94.130.142.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tsS19-0006N4-KI for qemu-devel@nongnu.org; Wed, 12 Mar 2025 15:45:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive:List-Unsubscribe:List-Unsubscribe-Post: List-Help; bh=lAJ7z9+A1MxQwCRsU5x2nT+Gzbox9DbplSabX+doYYY=; b=nHH1/J8JHpWBCzT HMR4eXE8vqK7/yIlg2dIypvT+CHLXfW067Tr9Zn4KH+mTtNVYyilDQLlwDrxbjrj5zZex7pluxHo3 G+pt9PFfeFOmRODNlRR41G7VD/TgleVQ/13eYiOXWvzaEz42eD15uoHkAM6MzM2m/B+k7mj2l9INB QA=; To: qemu-devel@nongnu.org Cc: ale@rev.ng, ltaylorsimpson@gmail.com, brian.cain@oss.qualcomm.com, philmd@linaro.org Subject: [PATCH 2/2] target/hexagon: Drop `ident` postprocess step Date: Wed, 12 Mar 2025 20:45:47 +0100 Message-ID: <20250312194547.7364-3-anjo@rev.ng> In-Reply-To: <20250312194547.7364-1-anjo@rev.ng> References: <20250312194547.7364-1-anjo@rev.ng> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.130.142.21; envelope-from=anjo@rev.ng; helo=rev.ng X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741808823537019100 Content-Type: text/plain; charset="utf-8" The indent command is not available on a default mac osx setup with xcode cli tools installed. While it does make idef-parser generated code nicer to debug, it's not crucial and can be dropped. Signed-off-by: Anton Johansson --- target/hexagon/meson.build | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index abcf00ca1f..246dc7b241 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -323,30 +323,13 @@ if idef_parser_enabled and 'hexagon-linux-user' in ta= rget_dirs command: [idef_parser, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@', '@OUTP= UT2@'] ) =20 - indent =3D find_program('indent', required: false) - if indent.found() - idef_generated_tcg_c =3D custom_target( - 'indent', - input: idef_generated_tcg[0], - output: 'idef-generated-emitter.indented.c', - command: [indent, '-linux', '@INPUT@', '-o', '@OUTPUT@'] - ) - else - idef_generated_tcg_c =3D custom_target( - 'copy', - input: idef_generated_tcg[0], - output: 'idef-generated-emitter.indented.c', - command: ['cp', '@INPUT@', '@OUTPUT@'] - ) - endif - idef_generated_list =3D idef_generated_tcg[2].full_path() =20 - hexagon_ss.add(idef_generated_tcg_c) + hexagon_ss.add(idef_generated_tcg[0]) =20 # Setup input and dependencies for the next step, this depends on whet= her or # not idef-parser is enabled - helper_dep =3D [semantics_generated, idef_generated_tcg_c, idef_genera= ted_tcg] + helper_dep =3D [semantics_generated, idef_generated_tcg] helper_in =3D [semantics_generated, gen_tcg_h, gen_tcg_hvx_h, '--idef-= parser', idef_generated_list] else # Setup input and dependencies for the next step, this depends on whet= her or --=20 2.47.1