diff options
| -rw-r--r-- | lib.c | 9 | ||||
| -rw-r--r-- | lib.h | 2 | ||||
| -rw-r--r-- | pre-process.c | 26 | ||||
| -rw-r--r-- | predefine.c | 2 | ||||
| -rw-r--r-- | target-arm64.c | 2 | ||||
| -rw-r--r-- | target-riscv.c | 2 | ||||
| -rw-r--r-- | validation/preprocessor/predef-token.c | 5 |
7 files changed, 39 insertions, 9 deletions
@@ -173,7 +173,7 @@ void die(const char *fmt, ...) //////////////////////////////////////////////////////////////////////////////// static struct token *pre_buffer_begin = NULL; -static struct token *pre_buffer_end = NULL; +static struct token **pre_buffer_next = &pre_buffer_begin; void add_pre_buffer(const char *fmt, ...) { @@ -186,11 +186,8 @@ void add_pre_buffer(const char *fmt, ...) size = vsnprintf(buffer, sizeof(buffer), fmt, args); va_end(args); begin = tokenize_buffer(buffer, size, &end); - if (!pre_buffer_begin) - pre_buffer_begin = begin; - if (pre_buffer_end) - pre_buffer_end->next = begin; - pre_buffer_end = end; + *pre_buffer_next = begin; + pre_buffer_next = &end->next; } static void create_builtin_stream(void) @@ -123,6 +123,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 38167802..403e3507 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; diff --git a/predefine.c b/predefine.c index ff457b38..d05b1018 100644 --- a/predefine.c +++ b/predefine.c @@ -52,7 +52,7 @@ static void predefined_min(const char *name, struct symbol *type) snprintf(buf, sizeof(buf), "__%s_MIN__", name); if (is_signed_type(type)) - predefine(buf, 1, "(-__%s_MAX__ - 1)", name); + add_pre_buffer("#weak_define %s (-__%s_MAX__ - 1)\n", buf, name); else predefine(buf, 1, "0%s", suffix); } diff --git a/target-arm64.c b/target-arm64.c index d491b65e..8619bd84 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 08d036ca..d68fb585 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 = { diff --git a/validation/preprocessor/predef-token.c b/validation/preprocessor/predef-token.c new file mode 100644 index 00000000..6df8ea40 --- /dev/null +++ b/validation/preprocessor/predef-token.c @@ -0,0 +1,5 @@ +static __UINT8_TYPE__ u8; + +/* + * check-name: predef-token + */ |