* [PATCH 1/2] predefine: add helper predefine_{strong,weak}()
2020-07-05 13:16 [PATCH 0/2] add helper predefine_{strong,weak}() Luc Van Oostenryck
@ 2020-07-05 13:16 ` Luc Van Oostenryck
2020-07-05 13:16 ` [PATCH 2/2] predefine: avoid add_pre_buffer() for targets Luc Van Oostenryck
1 sibling, 0 replies; 3+ messages in thread
From: Luc Van Oostenryck @ 2020-07-05 13:16 UTC (permalink / raw)
To: linux-sparse; +Cc: Luc Van Oostenryck
A lot of predefined macros are just set to the value '1' and
of them have a name that is not statically known. OTOH, the
function predefine() is designed for a statically known name
but a variable value.
Add a set of helpers to cover the first case: predefine_strong()
and predefine_weak().
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
lib.h | 2 ++
pre-process.c | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/lib.h b/lib.h
index 46483f2bed5c..a3288a3abf4e 100644
--- a/lib.h
+++ b/lib.h
@@ -127,6 +127,8 @@ enum phase {
extern void add_pre_buffer(const char *fmt, ...) FORMAT_ATTR(1);
extern void predefine(const char *name, int weak, const char *fmt, ...) FORMAT_ATTR(3);
+extern void predefine_strong(const char *name, ...) FORMAT_ATTR(1);
+extern void predefine_weak(const char *name, ...) FORMAT_ATTR(1);
extern void predefine_nostd(const char *name);
extern void predefined_macros(void);
diff --git a/pre-process.c b/pre-process.c
index 38167802f465..403e3507611c 100644
--- a/pre-process.c
+++ b/pre-process.c
@@ -1439,6 +1439,32 @@ void predefine_nostd(const char *name)
predefine(name, 1, "1");
}
+static void predefine_fmt(const char *fmt, int weak, va_list ap)
+{
+ static char buf[256];
+
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ predefine(buf, weak, "1");
+}
+
+void predefine_strong(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ predefine_fmt(fmt, 0, ap);
+ va_end(ap);
+}
+
+void predefine_weak(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ predefine_fmt(fmt, 1, ap);
+ va_end(ap);
+}
+
static int do_handle_define(struct stream *stream, struct token **line, struct token *token, int attr)
{
struct token *arglist, *expansion;
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] predefine: avoid add_pre_buffer() for targets
2020-07-05 13:16 [PATCH 0/2] add helper predefine_{strong,weak}() Luc Van Oostenryck
2020-07-05 13:16 ` [PATCH 1/2] predefine: " Luc Van Oostenryck
@ 2020-07-05 13:16 ` Luc Van Oostenryck
1 sibling, 0 replies; 3+ messages in thread
From: Luc Van Oostenryck @ 2020-07-05 13:16 UTC (permalink / raw)
To: linux-sparse; +Cc: Luc Van Oostenryck
Avoid add_pre_buffer() and use one of the predefine...()
variant instead.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
target-arm64.c | 2 +-
target-riscv.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target-arm64.c b/target-arm64.c
index d491b65e5154..8619bd842f9b 100644
--- a/target-arm64.c
+++ b/target-arm64.c
@@ -21,7 +21,7 @@ static void predefine_arm64(const struct target *self)
predefine("__aarch64__", 1, "1");
if (cmodel)
- add_pre_buffer("#define __AARCH64_CMODEL_%s__ 1\n", cmodel);
+ predefine_strong("__AARCH64_CMODEL_%s__", cmodel);
}
const struct target target_arm64 = {
diff --git a/target-riscv.c b/target-riscv.c
index 08d036ca04b7..d68fb585c254 100644
--- a/target-riscv.c
+++ b/target-riscv.c
@@ -24,7 +24,7 @@ static void predefine_riscv(const struct target *self)
predefine("__riscv_xlen", 1, "%d", ptr_ctype.bit_size);
if (cmodel)
- add_pre_buffer("#define __riscv_cmodel_%s 1\n", cmodel);
+ predefine_strong("__riscv_cmodel_%s", cmodel);
}
const struct target target_riscv32 = {
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread