From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Sam Ravnborg <sam@ravnborg.org>,
Ulf Magnusson <ulfalizer@gmail.com>,
Nicholas Piggin <npiggin@gmail.com>,
Kees Cook <keescook@chromium.org>,
Emese Revfy <re.emese@gmail.com>,
x86@kernel.org, Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 08/30] kconfig: add built-in function support
Date: Fri, 13 Apr 2018 14:06:17 +0900 [thread overview]
Message-ID: <1523595999-27433-9-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1523595999-27433-1-git-send-email-yamada.masahiro@socionext.com>
This commit adds a new concept 'function' to do more text processing
in Kconfig.
A function call looks like this:
$(function arg1, arg2, arg3, ...)
This commit adds the basic infrastructure to expand functions.
Change the text expansion helpers to take arguments.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v3:
- Split base infrastructure and 'shell' function
into separate patches.
Changes in v2:
- Use 'shell' for getting stdout from the comment.
It was 'shell-stdout' in the previous version.
- Symplify the implementation since the expansion has been moved to
lexer.
scripts/kconfig/preprocess.c | 142 +++++++++++++++++++++++++++++++++++++++----
1 file changed, 130 insertions(+), 12 deletions(-)
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
index fa4abc8..e77cf7c 100644
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
@@ -8,6 +8,10 @@
#include "list.h"
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+static char *expand_string_with_args(const char *in, int argc, char *argv[]);
+
/*
* Environment variables
*/
@@ -74,9 +78,47 @@ void env_write_dep(FILE *f, const char *autoconfig_name)
}
}
-static char *eval_clause(const char *in)
+/*
+ * Built-in Functions
+ */
+struct function {
+ char *name;
+ char *(*func)(int argc, char *argv[]);
+};
+
+static const struct function function_table[] = {
+};
+
+static char *function_call(const char *name, int argc, char *argv[])
{
- char *res, *name;
+ const struct function *f;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(function_table); i++) {
+ f = &function_table[i];
+ if (!strcmp(f->name, name))
+ return f->func(argc, argv);
+ }
+
+ return NULL;
+}
+
+#define FUNCTION_MAX_ARGS 16
+
+/*
+ * Evaluate a clause with arguments. argc/argv are arguments from the upper
+ * function call.
+ *
+ * Returned string must be freed when done
+ */
+static char *eval_clause(const char *in, int argc, char *argv[])
+{
+ char *tmp, *prev, *p, *res, *name;
+ char delim = ' ';
+ int new_argc = 0;
+ char *new_argv[FUNCTION_MAX_ARGS];
+ int nest = 0;
+ int i;
/*
* Returns an empty string because '$()' should be evaluated
@@ -85,10 +127,73 @@ static char *eval_clause(const char *in)
if (!*in)
return xstrdup("");
- name = expand_string(in);
+ tmp = xstrdup(in);
+
+ prev = p = tmp;
- res = env_expand(name);
+ /*
+ * Split into tokens
+ * The function name and the first argument are separated by a space.
+ * Arguments are separated by a comma.
+ * For example, if the function call is like this:
+ * $(foo abc,$(x),$(y))
+ *
+ * The input string for this helper should be:
+ * foo abc,$(x),$(y)
+ *
+ * and split into:
+ * new_argv[0]: foo
+ * new_argv[1]: abc
+ * new_argv[2]: $(x)
+ * new_argv[3]: $(y)
+ */
+ while (*p) {
+ if (nest == 0 && *p == delim) {
+ *p = 0;
+ new_argv[new_argc++] = prev;
+ prev = p + 1;
+ delim = ',';
+ } else if (*p == '(') {
+ nest++;
+ } else if (*p == ')') {
+ nest--;
+ }
+
+ p++;
+ }
+ new_argv[new_argc++] = prev;
+
+ /*
+ * Shift arguments
+ * new_argv[0] represents a function name or a variable name. Put it
+ * into 'name', then shift the rest of the arguments. This simplifies
+ * 'const' handling.
+ */
+ name = expand_string_with_args(new_argv[0], argc, argv);
+ new_argc--;
+ for (i = 0; i < new_argc; i++)
+ new_argv[i] = expand_string_with_args(new_argv[i + 1],
+ argc, argv);
+
+ free(tmp);
+
+ /* Look for built-in functions */
+ res = function_call(name, new_argc, new_argv);
+ if (res)
+ goto out;
+
+ /* Last, try environment variable */
+ if (new_argc == 0) {
+ res = env_expand(name);
+ if (res)
+ goto out;
+ }
+
+ res = xstrdup("");
+out:
free(name);
+ for (i = 0; i < new_argc; i++)
+ free(new_argv[i]);
return res;
}
@@ -115,7 +220,7 @@ static char *eval_clause(const char *in)
* This is because $ABC is equivalent to $(A)BC. (Like Make, you can omit
* parentheses if the variable name consists of a single character.
*/
-char *expand_dollar(const char **str)
+static char *expand_dollar_with_args(const char **str, int argc, char *argv[])
{
const char *p = *str;
const char *q;
@@ -124,6 +229,9 @@ char *expand_dollar(const char **str)
/*
* A standalone '$' at the end of a token is treated as-is.
+ * For example, the '$' before the comma in $(foo $,A) and the '$'
+ * before the closing parenthesis in $(shell echo $) lose the special
+ * meaning. This is the behavior of Make 4.2 or newer.
*/
if (!*p)
return xstrdup("$");
@@ -140,15 +248,15 @@ char *expand_dollar(const char **str)
tmp[0] = *p;
tmp[1] = 0;
*str = p + 1;
- out = eval_clause(tmp);
+ out = eval_clause(tmp, argc, argv);
free(tmp);
return out;
}
/*
- * Variables that consist of multiple letters
+ * Variables that consist of multiple letters, and function calls
* must be surrounded with parentheses.
- * For example, $(FOO)
+ * For example, $(FOO), $(shell echo helloworld)
*/
p++;
q = p;
@@ -163,7 +271,7 @@ char *expand_dollar(const char **str)
memcpy(tmp, p, q - p);
tmp[q - p] = 0;
*str = q + 1;
- out = eval_clause(tmp);
+ out = eval_clause(tmp, argc, argv);
free(tmp);
return out;
}
@@ -179,11 +287,11 @@ char *expand_dollar(const char **str)
}
/*
- * Expand variables in the given string. Undefined variables
+ * Expand variables, functions, etc. in the given string. Undefined variables
* expand to an empty string.
* The returned string must be freed when done.
*/
-char *expand_string(const char *in)
+static char *expand_string_with_args(const char *in, int argc, char *argv[])
{
const char *prev_in, *p;
char *new, *out;
@@ -195,7 +303,7 @@ char *expand_string(const char *in)
while ((p = strchr(in, '$'))) {
prev_in = in;
in = p + 1;
- new = expand_dollar(&in);
+ new = expand_dollar_with_args(&in, argc, argv);
outlen = strlen(out) + (p - prev_in) + strlen(new) + 1;
out = xrealloc(out, outlen);
strncat(out, prev_in, p - prev_in);
@@ -210,6 +318,16 @@ char *expand_string(const char *in)
return out;
}
+char *expand_string(const char *in)
+{
+ return expand_string_with_args(in, 0, NULL);
+}
+
+char *expand_dollar(const char **str)
+{
+ return expand_dollar_with_args(str, 0, NULL);
+}
+
/*
* Expand variables in a token. The parsing stops when a token separater
* (in most cases, it is a whitespace) is encountered. 'str' is updated to
--
2.7.4
next prev parent reply other threads:[~2018-04-13 5:08 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-13 5:06 [PATCH 00/30] kconfig: move compiler capability tests to Kconfig Masahiro Yamada
2018-04-13 5:06 ` [PATCH 01/30] gcc-plugins: fix build condition of SANCOV plugin Masahiro Yamada
2018-05-04 14:21 ` Masahiro Yamada
2018-05-04 16:21 ` Kees Cook
2018-05-05 1:35 ` Masahiro Yamada
2018-04-13 5:06 ` [PATCH 02/30] kbuild: remove kbuild cache Masahiro Yamada
2018-04-13 5:06 ` [PATCH 03/30] kbuild: remove CONFIG_CROSS_COMPILE support Masahiro Yamada
2018-04-13 5:06 ` [PATCH 04/30] kconfig: reference environment variables directly and remove 'option env=' Masahiro Yamada
2018-04-13 5:06 ` [PATCH 05/30] kconfig: remove string expansion in file_lookup() Masahiro Yamada
2018-04-13 5:06 ` [PATCH 06/30] kconfig: remove string expansion for mainmenu after yyparse() Masahiro Yamada
2018-04-13 5:06 ` [PATCH 07/30] kconfig: remove sym_expand_string_value() Masahiro Yamada
2018-04-13 5:06 ` Masahiro Yamada [this message]
2018-04-15 7:57 ` [PATCH 08/30] kconfig: add built-in function support Ulf Magnusson
2018-04-15 15:12 ` Masahiro Yamada
2018-04-13 5:06 ` [PATCH 09/30] kconfig: add 'shell' built-in function Masahiro Yamada
2018-04-13 5:06 ` [PATCH 10/30] kconfig: replace $(UNAME_RELEASE) with function call Masahiro Yamada
2018-04-13 5:06 ` [PATCH 11/30] kconfig: begin PARAM state only when seeing a command keyword Masahiro Yamada
2018-04-13 5:06 ` [PATCH 12/30] kconfig: support variable and user-defined function Masahiro Yamada
2018-04-13 5:06 ` [PATCH 13/30] kconfig: support simply expanded variable Masahiro Yamada
2018-04-13 5:06 ` [PATCH 14/30] kconfig: support append assignment operator Masahiro Yamada
2018-04-13 5:06 ` [PATCH 15/30] kconfig: expand lefthand side of assignment statement Masahiro Yamada
2018-04-13 5:06 ` [PATCH 16/30] kconfig: add 'info' and 'warning' built-in functions Masahiro Yamada
2018-04-13 5:06 ` [PATCH 17/30] Documentation: kconfig: document a new Kconfig macro language Masahiro Yamada
2018-04-14 23:33 ` Randy Dunlap
2018-04-17 15:05 ` Masahiro Yamada
2018-04-15 8:08 ` Ulf Magnusson
2018-04-17 15:07 ` Masahiro Yamada
2018-04-18 8:33 ` Ulf Magnusson
2018-04-13 5:06 ` [PATCH 18/30] kconfig: test: test text expansion Masahiro Yamada
2018-04-13 5:06 ` [PATCH 19/30] kconfig: show compiler version text in the top comment Masahiro Yamada
2018-04-13 5:06 ` [PATCH 20/30] kconfig: add basic helper macros to scripts/Kconfig.include Masahiro Yamada
2018-04-15 7:41 ` Ulf Magnusson
2018-04-15 15:02 ` Masahiro Yamada
2018-04-13 5:06 ` [PATCH 21/30] stack-protector: test compiler capability in Kconfig and drop AUTO mode Masahiro Yamada
2018-04-13 16:41 ` Kees Cook
2018-04-13 18:11 ` Linus Torvalds
2018-04-13 20:41 ` Kees Cook
2018-04-15 13:28 ` Masahiro Yamada
2018-04-15 16:04 ` Kees Cook
2018-04-15 9:40 ` Masahiro Yamada
2018-04-13 5:06 ` [PATCH 22/30] kconfig: add CC_IS_GCC and GCC_VERSION Masahiro Yamada
2018-04-13 5:06 ` [PATCH 23/30] kconfig: add CC_IS_CLANG and CLANG_VERSION Masahiro Yamada
2018-04-13 5:06 ` [PATCH 24/30] gcov: remove CONFIG_GCOV_FORMAT_AUTODETECT Masahiro Yamada
2018-04-13 5:06 ` [PATCH 25/30] kcov: test compiler capability in Kconfig and correct dependency Masahiro Yamada
2018-04-13 5:06 ` [PATCH 26/30] gcc-plugins: move GCC version check for PowerPC to Kconfig Masahiro Yamada
2018-04-13 5:06 ` [PATCH 27/30] gcc-plugins: test plugin support in Kconfig and clean up Makefile Masahiro Yamada
2018-04-13 5:06 ` [PATCH 28/30] gcc-plugins: allow to enable GCC_PLUGINS for COMPILE_TEST Masahiro Yamada
2018-04-13 5:06 ` [PATCH 29/30] arm64: move GCC version check for ARCH_SUPPORTS_INT128 to Kconfig Masahiro Yamada
2018-04-13 5:06 ` [PATCH 30/30] kbuild: test dead code/data elimination support in Kconfig Masahiro Yamada
2018-04-13 5:17 ` [PATCH 00/30] kconfig: move compiler capability tests to Kconfig Masahiro Yamada
2018-04-13 5:52 ` Kees Cook
2018-04-13 12:21 ` Masahiro Yamada
2018-04-13 13:55 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1523595999-27433-9-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=keescook@chromium.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=npiggin@gmail.com \
--cc=re.emese@gmail.com \
--cc=sam@ravnborg.org \
--cc=torvalds@linux-foundation.org \
--cc=ulfalizer@gmail.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).