From patchwork Mon Oct 2 08:02:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kito Cheng X-Patchwork-Id: 1841952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=IqpGSGnV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RzYNY5xJGz1yng for ; Mon, 2 Oct 2023 19:03:08 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C942A385C6DF for ; Mon, 2 Oct 2023 08:03:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by sourceware.org (Postfix) with ESMTPS id 614893858D35 for ; Mon, 2 Oct 2023 08:02:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 614893858D35 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sifive.com Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-351250be257so47045275ab.0 for ; Mon, 02 Oct 2023 01:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1696233771; x=1696838571; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MxgzLIX+WcBd6RU1OFmiTEvdwOc5IthXphJQSUz0Bb4=; b=IqpGSGnVdiBGUFIRFbsww183npTDIq+G7QY4fRX7c51hfmd1EPZIb3XDX1g0FPlCJR 2nvEmqaFrKuPCaQy0JD8exRRoyqs99EYbgKy9DgwnWxhmHterrgxRUPmNspbsDrsxx4S ENUEMClyXW4xWLEBhJAI3IFuhkmAqzs9QA5+ebSwaLdHC2R105W7lhr1nDyALvQbeQ8F /iihYx5L9m/8c8MNVdrPdPviHtBTJEWoGWGTDSx6vj68x4O52HJCukqcThUmLHey/hVR OGN8SRxQZeiUj9SGOxI0KDPHopvFwfEvHAyyi42IITr1cbB9FhlFeNCjGkRvqOo7wEe3 UizA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696233771; x=1696838571; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MxgzLIX+WcBd6RU1OFmiTEvdwOc5IthXphJQSUz0Bb4=; b=wJhXefKwR9jQ/JaSoGaaU8FfrqtrXwVa6SPZj1JSzK4K0h82JgAv/wcEeeT/Y26mSG vS9OZTx741O+xrO+/xn07ZFKCv8H3Q4KMqXMBlg6FaO9H/K1EkqKRcmfqldBmEL1YSsl 2E5NThC4PmAaTzKUv17dZEqJklpjdS7zcXyCFTbibdtR8EYbVOLj+qzgHGsAUdCdN4+F MCeRY5Cps+j8lxovYN5bkjgIVCXjt3ecLFXjoNbDMnio8aTWEJ9KooG198bJDTw2i4QV rdU8Jbmevdo1Si8HWgBdbJwYE4q2adFQH1D4PFydnoSBstLIFDS2fT7WutSB7VH0vhyt YO8Q== X-Gm-Message-State: AOJu0YwI+PCrx7c2PsZdmOyo0C/Q4pc3dlJb99P1p13ybv31eoaVuqOn ow6R6BanN7lBqJ+8Rb6zaqOI+Q== X-Google-Smtp-Source: AGHT+IEMAjhg+q++Vv70fqiT5gFNrmjYfx6nQtLEMIL3mXbHGTfPY15PD4krH1+vxJ9T1k1AxlwUjw== X-Received: by 2002:a6b:dc10:0:b0:794:e96f:b87d with SMTP id s16-20020a6bdc10000000b00794e96fb87dmr10813669ioc.0.1696233771356; Mon, 02 Oct 2023 01:02:51 -0700 (PDT) Received: from hsinchu02.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id v14-20020a17090ad58e00b002777ba600fdsm5642431pju.25.2023.10.02.01.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 01:02:50 -0700 (PDT) From: Kito Cheng To: gerald@pfeifer.com, jbglaw@lug-owl.de, gcc-patches@gcc.gnu.org, kito.cheng@gmail.com, jeffreyalaw@gmail.com, wangfeng@eswincomputing.com Cc: Kito Cheng Subject: [PATCH] options: Prevent multidimensional arrays Date: Mon, 2 Oct 2023 16:02:44 +0800 Message-Id: <20231002080244.105205-1-kito.cheng@sifive.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Multidimensional arrary is gawk extension, and we accidentally introduced that in recent commit[1]. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e4a4b8e983bac865eb435b11798e38d633b98942 gcc/ChangeLog: * opt-read.awk: Drop multidimensional arrays. * opth-gen.awk: Ditto. --- gcc/opt-read.awk | 4 ++-- gcc/opth-gen.awk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/opt-read.awk b/gcc/opt-read.awk index fcf92853957..f74d8478f72 100644 --- a/gcc/opt-read.awk +++ b/gcc/opt-read.awk @@ -123,7 +123,7 @@ BEGIN { } else { target_var = opt_args("Var", $0) - if (target_var) + if (target_var) { target_var = opt_args("Var", $1) var_index = find_index(target_var, target_vars, n_target_vars) @@ -131,7 +131,7 @@ BEGIN { { target_vars[n_target_vars++] = target_var } - other_masks[var_index][n_other_mask[var_index]++] = name + other_masks[var_index "," n_other_mask[var_index]++] = name } else { diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk index 70ca3d37719..c4398be2f3a 100644 --- a/gcc/opth-gen.awk +++ b/gcc/opth-gen.awk @@ -412,9 +412,9 @@ for (i = 0; i < n_target_vars; i++) continue for (j = 0; j < n_other_mask[i]; j++) { - print "#define MASK_" other_masks[i][j] " (1U << " other_masknum[i][""]++ ")" + print "#define MASK_" other_masks[i "," j] " (1U << " other_masknum[i]++ ")" } - if (other_masknum[i][""] > 32) + if (other_masknum[i] > 32) print "#error too many target masks for" extra_target_vars[i] } @@ -437,8 +437,8 @@ for (i = 0; i < n_target_vars; i++) continue for (j = 0; j < n_other_mask[i]; j++) { - print "#define TARGET_" other_masks[i][j] \ - " ((" target_vars[i] " & MASK_" other_masks[i][j] ") != 0)" + print "#define TARGET_" other_masks[i "," j] \ + " ((" target_vars[i] " & MASK_" other_masks[i "," j] ") != 0)" } } print ""