From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F1E7C636D6 for ; Wed, 22 Feb 2023 16:44:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC92085B74; Wed, 22 Feb 2023 17:37:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="d7e42x0v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 69CC585B1F; Wed, 22 Feb 2023 17:35:59 +0100 (CET) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0DFAA85B28 for ; Wed, 22 Feb 2023 17:35:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd31.google.com with SMTP id m13so1852109ioq.13 for ; Wed, 22 Feb 2023 08:35:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UMflheyp/rfONyU1OZH2Ww0QQ5pNU9CIBqN0mTOhzKo=; b=d7e42x0vwUMBRnmhZ7rSTWVJo/aaNMUu/VOfHUu4MOR47wQs0dDpV48gWqkUZaowbE USW3I5X5LplmSIevC1tsoaktn2I5NzelGitHaNWRgA8koTOJ2jdaZpzkgpeBkInI7ubj 3w3xsCeTWT7glt2pNC2d48S/s+t+m2d1IuU8Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UMflheyp/rfONyU1OZH2Ww0QQ5pNU9CIBqN0mTOhzKo=; b=vm2m/tZsp1kSx09vLfYCItTvx4gOm+k1hZP2pnCs8pcV3zRX85TQWIRecqAjN3N7dn 3uwaBg0fpLQFQGceV6IVwiMmQX2nRwZp+OqIYrgoPxrDIOaRleLbnx36ChxPlQDNGw1U aClRNhnOtWuB8A9h0L93ZilacBxVz/F/rChF7ID5tSWDLY/41LjJN2ZAw1+jTc766zpt i3XKHXZ2wUjO0z45T10847EGfHPKkao0+czBkjAXQvutOmMOCs8d3T5m/owuhONWl0EF ta26gkYtviIdUDlaHjVYFUGxp/9AyZ2Fj8c6igY2Ak9Ogp3YUXR4ytwWIUD6fr8vThvh LH3w== X-Gm-Message-State: AO0yUKXtqWmAf0AHUq4ekm2EeA4Gz7niPJ2FbCyUFL4dH8e6eodARNL0 Pv1sKIMpCoCQ8mseRkhI7fGoRFa4agV6gDiI X-Google-Smtp-Source: AK7set9o6uu3x137hMOwoAQpB8Myqosp4rAPEDCKzLQbmGfZT0EGtNEa2qSuaRASY8QBkKr9nxj1Hg== X-Received: by 2002:a5d:9ec3:0:b0:74c:7f3d:10d2 with SMTP id a3-20020a5d9ec3000000b0074c7f3d10d2mr4395259ioe.12.1677083705052; Wed, 22 Feb 2023 08:35:05 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z26-20020a056602005a00b00716eb44b97esm2164541ioz.27.2023.02.22.08.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 08:35:04 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v5 27/44] fixdep: Refactor to make testing easier Date: Wed, 22 Feb 2023 09:34:08 -0700 Message-Id: <20230222163425.2043934-28-sjg@chromium.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <20230222163425.2043934-1-sjg@chromium.org> References: <20230222163425.2043934-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Move the config parsing into a separate function so that it is possible to write tests for the function. Signed-off-by: Simon Glass --- (no changes since v1) scripts/basic/fixdep.c | 87 ++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 3d40bd7ee25..a49d35ba5f6 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -236,47 +236,68 @@ static int str_ends_with(const char *s, int slen, const char *sub) return !memcmp(s + slen - sublen, sub, sublen); } -static void parse_config_file(const char *p) +static const char *parse_config_line(const char *p, const char **endp) { const char *q, *r; - const char *start = p; - while ((p = strstr(p, "CONFIG_"))) { - if (p > start && (isalnum(p[-1]) || p[-1] == '_')) { - p += 7; - continue; - } - p += 7; + p = strstr(p, "CONFIG_"); + if (!p) { + *endp = NULL; + return NULL; + } + if ((isalnum(p[-1]) || p[-1] == '_')) { + *endp = p + 7; + return NULL; + } + p += 7; + q = p; + while (isalnum(*q) || *q == '_') + q++; + if (str_ends_with(p, q - p, "_MODULE")) + r = q - 7; + else + r = q; + /* + * U-Boot also handles + * CONFIG_IS_ENABLED(...) + * CONFIG_VAL(...) + */ + if ((q - p == 10 && !memcmp(p, "IS_ENABLED(", 11)) || + (q - p == 3 && !memcmp(p, "VAL(", 4))) { + p = q + 1; q = p; while (isalnum(*q) || *q == '_') q++; - if (str_ends_with(p, q - p, "_MODULE")) - r = q - 7; - else - r = q; - /* - * U-Boot also handles - * CONFIG_IS_ENABLED(...) - * CONFIG_VAL(...) - */ - if ((q - p == 10 && !memcmp(p, "IS_ENABLED(", 11)) || - (q - p == 3 && !memcmp(p, "VAL(", 4))) { - p = q + 1; - q = p; - while (isalnum(*q) || *q == '_') - q++; - r = q; - if (r > p && tmp_buf[0]) { - memcpy(tmp_buf + 4, p, r - p); - r = tmp_buf + 4 + (r - p); - p = tmp_buf; - } + r = q; + if (r > p && tmp_buf[0]) { + memcpy(tmp_buf + 4, p, r - p); + r = tmp_buf + 4 + (r - p); + p = tmp_buf; } - /* end U-Boot hack */ + } + /* end U-Boot hack */ + *endp = r; + + if (r > p) + return p; - if (r > p) - use_config(p, r - p); - p = q; + return NULL; +} + +static void parse_config_file(const char *base) +{ + const char *p; + + if (!*base) + return; + p = base + 1; + while (p) { + const char *out, *end; + + out = parse_config_line(p, &end); + if (out) + use_config(out, end - out); + p = end; } } -- 2.39.2.637.g21b0678d19-goog