From 60ffe1dd0fd4c982addde1dfa9c2452cecafe59b Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Mon, 17 Dec 2018 06:43:00 +0100 Subject: options: let handle_onoff_switch() use null terminated arrays This makes things slightly easier to use. Signed-off-by: Luc Van Oostenryck --- lib.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib.c b/lib.c index e5678826..709dd517 100644 --- a/lib.c +++ b/lib.c @@ -529,14 +529,14 @@ enum { WARNING_FORCE_OFF }; -static char **handle_onoff_switch(char *arg, char **next, const struct flag warnings[], int n) +static char **handle_onoff_switch(char *arg, char **next, const struct flag warnings[]) { int flag = WARNING_ON; char *p = arg + 1; unsigned i; if (!strcmp(p, "sparse-all")) { - for (i = 0; i < n; i++) { + for (i = 0; warnings[i].name; i++) { if (*warnings[i].flag != WARNING_FORCE_OFF && warnings[i].flag != &Wsparse_error) *warnings[i].flag = WARNING_ON; } @@ -551,7 +551,7 @@ static char **handle_onoff_switch(char *arg, char **next, const struct flag warn flag = WARNING_FORCE_OFF; } - for (i = 0; i < n; i++) { + for (i = 0; warnings[i].name; i++) { if (!strcmp(p,warnings[i].name)) { *warnings[i].flag = flag; return next; @@ -789,11 +789,12 @@ static const struct flag warnings[] = { { "universal-initializer", &Wuniversal_initializer }, { "unknown-attribute", &Wunknown_attribute }, { "vla", &Wvla }, + { } }; static char **handle_switch_W(char *arg, char **next) { - char ** ret = handle_onoff_switch(arg, next, warnings, ARRAY_SIZE(warnings)); + char ** ret = handle_onoff_switch(arg, next, warnings); if (ret) return ret; @@ -808,12 +809,13 @@ static struct flag debugs[] = { { "entry", &dbg_entry}, { "ir", &dbg_ir}, { "postorder", &dbg_postorder}, + { } }; static char **handle_switch_v(char *arg, char **next) { - char ** ret = handle_onoff_switch(arg, next, debugs, ARRAY_SIZE(debugs)); + char ** ret = handle_onoff_switch(arg, next, debugs); if (ret) return ret; @@ -856,11 +858,11 @@ static char **handle_switch_d(char *arg, char **next) } -static void handle_onoff_switch_finalize(const struct flag warnings[], int n) +static void handle_onoff_switch_finalize(const struct flag warnings[]) { unsigned i; - for (i = 0; i < n; i++) { + for (i = 0; warnings[i].name; i++) { if (*warnings[i].flag == WARNING_FORCE_OFF) *warnings[i].flag = WARNING_OFF; } @@ -868,7 +870,7 @@ static void handle_onoff_switch_finalize(const struct flag warnings[], int n) static void handle_switch_W_finalize(void) { - handle_onoff_switch_finalize(warnings, ARRAY_SIZE(warnings)); + handle_onoff_switch_finalize(warnings); /* default Wdeclarationafterstatement based on the C dialect */ if (-1 == Wdeclarationafterstatement) { @@ -886,7 +888,7 @@ static void handle_switch_W_finalize(void) static void handle_switch_v_finalize(void) { - handle_onoff_switch_finalize(debugs, ARRAY_SIZE(debugs)); + handle_onoff_switch_finalize(debugs); } static char **handle_switch_U(char *arg, char **next) -- cgit 1.2.3-korg From 851b48b8129bcb763447b908b0793b2782987441 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Mon, 17 Dec 2018 06:44:48 +0100 Subject: options: move -Wsparse-all's processing out of handle_onoff_switch() Since handle_onoff_switch() can be used for other flags than the warnings, the processing of -Wsparse-all should move elsewhere. So move it into handle_switch_W(). Signed-off-by: Luc Van Oostenryck --- lib.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib.c b/lib.c index 709dd517..5128a5b6 100644 --- a/lib.c +++ b/lib.c @@ -535,14 +535,6 @@ static char **handle_onoff_switch(char *arg, char **next, const struct flag warn char *p = arg + 1; unsigned i; - if (!strcmp(p, "sparse-all")) { - for (i = 0; warnings[i].name; i++) { - if (*warnings[i].flag != WARNING_FORCE_OFF && warnings[i].flag != &Wsparse_error) - *warnings[i].flag = WARNING_ON; - } - return NULL; - } - // Prefixes "no" and "no-" mean to turn warning off. if (p[0] == 'n' && p[1] == 'o') { p += 2; @@ -798,6 +790,14 @@ static char **handle_switch_W(char *arg, char **next) if (ret) return ret; + if (!strcmp(arg, "Wsparse-all")) { + int i; + for (i = 0; warnings[i].name; i++) { + if (*warnings[i].flag != WARNING_FORCE_OFF && warnings[i].flag != &Wsparse_error) + *warnings[i].flag = WARNING_ON; + } + } + // Unknown. return next; } -- cgit 1.2.3-korg From 626e61ab54cd77666976f8c66c705a9012d2984c Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Mon, 17 Dec 2018 06:49:33 +0100 Subject: options: move on top the definition of warning type enums This allows to reuse these enums in earlier helpers. Signed-off-by: Luc Van Oostenryck --- lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib.c b/lib.c index 5128a5b6..43d55a06 100644 --- a/lib.c +++ b/lib.c @@ -250,6 +250,12 @@ void die(const char *fmt, ...) static struct token *pre_buffer_begin = NULL; static struct token *pre_buffer_end = NULL; +enum warning_type { + WARNING_OFF, + WARNING_ON, + WARNING_FORCE_OFF +}; + int Waddress = 0; int Waddress_space = 1; int Wbitwise = 1; @@ -523,12 +529,6 @@ static int opt_##NAME(const char *arg, const char *opt, TYPE *ptr, int flag) \ OPT_NUMERIC(ullong, unsigned long long, strtoull) OPT_NUMERIC(uint, unsigned int, strtoul) -enum { - WARNING_OFF, - WARNING_ON, - WARNING_FORCE_OFF -}; - static char **handle_onoff_switch(char *arg, char **next, const struct flag warnings[]) { int flag = WARNING_ON; -- cgit 1.2.3-korg From 763d239e13f9298d32dd34dc5a58b0cf6360f32a Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Mon, 17 Dec 2018 06:50:10 +0100 Subject: options: make Wsparse_error less special -Wsparse-error should not be enabled with -Wsparse-all, this is special cased in the condition in loop handling -Wsparse-all. However, the condition already handle warnings forced to off. So instead of explicitly checking for &Wsparse_error, it's enough to force Wsparse_error off. Signed-off-by: Luc Van Oostenryck --- lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib.c b/lib.c index 43d55a06..9acdc60f 100644 --- a/lib.c +++ b/lib.c @@ -276,7 +276,6 @@ int Winit_cstring = 0; int Wint_to_pointer_cast = 1; int Wenum_mismatch = 1; int Wexternal_function_has_definition = 1; -int Wsparse_error = 0; int Wmemcpy_max_count = 1; int Wnewline_eof = 1; int Wnon_pointer_null = 1; @@ -296,6 +295,7 @@ int Wshadow = 0; int Wshift_count_negative = 1; int Wshift_count_overflow = 1; int Wsizeof_bool = 0; +int Wsparse_error = WARNING_FORCE_OFF; int Wstrict_prototypes = 1; int Wtautological_compare = 0; int Wtransparent_union = 0; @@ -793,7 +793,7 @@ static char **handle_switch_W(char *arg, char **next) if (!strcmp(arg, "Wsparse-all")) { int i; for (i = 0; warnings[i].name; i++) { - if (*warnings[i].flag != WARNING_FORCE_OFF && warnings[i].flag != &Wsparse_error) + if (*warnings[i].flag != WARNING_FORCE_OFF) *warnings[i].flag = WARNING_ON; } } -- cgit 1.2.3-korg From daaeb83f8232d390802a724c327f13810f630e78 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Mon, 17 Dec 2018 07:05:19 +0100 Subject: options: handle_onoff_switch() can handle any flags, not only warnings So, use 'flag' instead of 'warning' for variable and function names. Signed-off-by: Luc Van Oostenryck --- lib.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib.c b/lib.c index 9acdc60f..c2777309 100644 --- a/lib.c +++ b/lib.c @@ -250,10 +250,10 @@ void die(const char *fmt, ...) static struct token *pre_buffer_begin = NULL; static struct token *pre_buffer_end = NULL; -enum warning_type { - WARNING_OFF, - WARNING_ON, - WARNING_FORCE_OFF +enum flag_type { + FLAG_OFF, + FLAG_ON, + FLAG_FORCE_OFF }; int Waddress = 0; @@ -295,7 +295,7 @@ int Wshadow = 0; int Wshift_count_negative = 1; int Wshift_count_overflow = 1; int Wsizeof_bool = 0; -int Wsparse_error = WARNING_FORCE_OFF; +int Wsparse_error = FLAG_FORCE_OFF; int Wstrict_prototypes = 1; int Wtautological_compare = 0; int Wtransparent_union = 0; @@ -529,9 +529,9 @@ static int opt_##NAME(const char *arg, const char *opt, TYPE *ptr, int flag) \ OPT_NUMERIC(ullong, unsigned long long, strtoull) OPT_NUMERIC(uint, unsigned int, strtoul) -static char **handle_onoff_switch(char *arg, char **next, const struct flag warnings[]) +static char **handle_onoff_switch(char *arg, char **next, const struct flag flags[]) { - int flag = WARNING_ON; + int flag = FLAG_ON; char *p = arg + 1; unsigned i; @@ -540,12 +540,12 @@ static char **handle_onoff_switch(char *arg, char **next, const struct flag warn p += 2; if (p[0] == '-') p++; - flag = WARNING_FORCE_OFF; + flag = FLAG_FORCE_OFF; } - for (i = 0; warnings[i].name; i++) { - if (!strcmp(p,warnings[i].name)) { - *warnings[i].flag = flag; + for (i = 0; flags[i].name; i++) { + if (!strcmp(p,flags[i].name)) { + *flags[i].flag = flag; return next; } } @@ -722,7 +722,7 @@ static char **handle_switch_o(char *arg, char **next) } static const struct flag pflags[] = { - { "pedantic", &Wpedantic, NULL, OPT_VAL, WARNING_ON }, + { "pedantic", &Wpedantic, NULL, OPT_VAL, FLAG_ON }, { } }; @@ -793,8 +793,8 @@ static char **handle_switch_W(char *arg, char **next) if (!strcmp(arg, "Wsparse-all")) { int i; for (i = 0; warnings[i].name; i++) { - if (*warnings[i].flag != WARNING_FORCE_OFF) - *warnings[i].flag = WARNING_ON; + if (*warnings[i].flag != FLAG_FORCE_OFF) + *warnings[i].flag = FLAG_ON; } } @@ -858,13 +858,13 @@ static char **handle_switch_d(char *arg, char **next) } -static void handle_onoff_switch_finalize(const struct flag warnings[]) +static void handle_onoff_switch_finalize(const struct flag flags[]) { unsigned i; - for (i = 0; warnings[i].name; i++) { - if (*warnings[i].flag == WARNING_FORCE_OFF) - *warnings[i].flag = WARNING_OFF; + for (i = 0; flags[i].name; i++) { + if (*flags[i].flag == FLAG_FORCE_OFF) + *flags[i].flag = FLAG_OFF; } } -- cgit 1.2.3-korg From 9e9ee8433d21912b87300a9c8957d4148e64b1c0 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Fri, 9 Aug 2019 11:58:40 +0200 Subject: options: move helpers up The helpers for parsing the options are often situated just above the first function using them. As result, these helpers can be found a bit everywhere in the code, it's messy and doesn't help to reuse these helpers. So, move all these helpers to the top. Signed-off-by: Luc Van Oostenryck --- lib.c | 87 ++++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/lib.c b/lib.c index c2777309..4868154f 100644 --- a/lib.c +++ b/lib.c @@ -364,6 +364,15 @@ void add_pre_buffer(const char *fmt, ...) //////////////////////////////////////////////////////////////////////////////// // Helpers for option parsing +static const char *match_option(const char *arg, const char *prefix) +{ + unsigned int n = strlen(prefix); + if (strncmp(arg, prefix, n) == 0) + return arg + n; + return NULL; +} + + struct val_map { const char *name; int val; @@ -438,14 +447,6 @@ end: } -static const char *match_option(const char *arg, const char *prefix) -{ - unsigned int n = strlen(prefix); - if (strncmp(arg, prefix, n) == 0) - return arg + n; - return NULL; -} - #define OPT_INVERSE 1 #define OPT_VAL 2 struct flag { @@ -497,6 +498,41 @@ static int handle_switches(const char *ori, const char *opt, const struct flag * return 0; } +static char **handle_onoff_switch(char *arg, char **next, const struct flag flags[]) +{ + int flag = FLAG_ON; + char *p = arg + 1; + unsigned i; + + // Prefixes "no" and "no-" mean to turn warning off. + if (p[0] == 'n' && p[1] == 'o') { + p += 2; + if (p[0] == '-') + p++; + flag = FLAG_FORCE_OFF; + } + + for (i = 0; flags[i].name; i++) { + if (!strcmp(p,flags[i].name)) { + *flags[i].flag = flag; + return next; + } + } + + // Unknown. + return NULL; +} + +static void handle_onoff_switch_finalize(const struct flag flags[]) +{ + unsigned i; + + for (i = 0; flags[i].name; i++) { + if (*flags[i].flag == FLAG_FORCE_OFF) + *flags[i].flag = FLAG_OFF; + } +} + static int handle_switch_setval(const char *arg, const char *opt, const struct flag *flag, int options) { *(flag->flag) = flag->mask; @@ -529,31 +565,6 @@ static int opt_##NAME(const char *arg, const char *opt, TYPE *ptr, int flag) \ OPT_NUMERIC(ullong, unsigned long long, strtoull) OPT_NUMERIC(uint, unsigned int, strtoul) -static char **handle_onoff_switch(char *arg, char **next, const struct flag flags[]) -{ - int flag = FLAG_ON; - char *p = arg + 1; - unsigned i; - - // Prefixes "no" and "no-" mean to turn warning off. - if (p[0] == 'n' && p[1] == 'o') { - p += 2; - if (p[0] == '-') - p++; - flag = FLAG_FORCE_OFF; - } - - for (i = 0; flags[i].name; i++) { - if (!strcmp(p,flags[i].name)) { - *flags[i].flag = flag; - return next; - } - } - - // Unknown. - return NULL; -} - //////////////////////////////////////////////////////////////////////////////// // Option parsing @@ -858,16 +869,6 @@ static char **handle_switch_d(char *arg, char **next) } -static void handle_onoff_switch_finalize(const struct flag flags[]) -{ - unsigned i; - - for (i = 0; flags[i].name; i++) { - if (*flags[i].flag == FLAG_FORCE_OFF) - *flags[i].flag = FLAG_OFF; - } -} - static void handle_switch_W_finalize(void) { handle_onoff_switch_finalize(warnings); -- cgit 1.2.3-korg From be21656fd77e421a609ca0ea0497911ff080b55e Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Fri, 9 Aug 2019 13:51:07 +0200 Subject: options: alphasort the handle_switch_[a-zA_Z]() These function have probably been added in 'historical order' and as result it's not easy to quickly see where they're defined. Change this arranging them in asciibetical order. Signed-off-by: Luc Van Oostenryck --- lib.c | 656 +++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 327 insertions(+), 329 deletions(-) diff --git a/lib.c b/lib.c index 4868154f..5f4e6b2d 100644 --- a/lib.c +++ b/lib.c @@ -568,6 +568,14 @@ OPT_NUMERIC(uint, unsigned int, strtoul) //////////////////////////////////////////////////////////////////////////////// // Option parsing +static char **handle_switch_a(char *arg, char **next) +{ + if (!strcmp (arg, "ansi")) + standard = STANDARD_C89; + + return next; +} + static char **handle_switch_D(char *arg, char **next) { const char *name = arg + 1; @@ -595,6 +603,37 @@ static char **handle_switch_D(char *arg, char **next) return next; } +static char **handle_switch_d(char *arg, char **next) +{ + char *arg_char = arg + 1; + + /* + * -d, where is a sequence of characters, not preceded + * by a space. If you specify characters whose behaviour conflicts, + * the result is undefined. + */ + while (*arg_char) { + switch (*arg_char) { + case 'M': /* dump just the macro definitions */ + dump_macros_only = 1; + dump_macro_defs = 0; + break; + case 'D': /* like 'M', but also output pre-processed text */ + dump_macro_defs = 1; + dump_macros_only = 0; + break; + case 'N': /* like 'D', but only output macro names not bodies */ + break; + case 'I': /* like 'D', but also output #include directives */ + break; + case 'U': /* like 'D', but only output expanded macros */ + break; + } + arg_char++; + } + return next; +} + static char **handle_switch_E(char *arg, char **next) { if (arg[1] == '\0') @@ -602,6 +641,146 @@ static char **handle_switch_E(char *arg, char **next) return next; } +static int handle_ftabstop(const char *arg, const char *opt, const struct flag *flag, int options) +{ + unsigned long val; + char *end; + + if (*opt == '\0') + die("error: missing argument to \"%s\"", arg); + + /* we silently ignore silly values */ + val = strtoul(opt, &end, 10); + if (*end == '\0' && 1 <= val && val <= 100) + tabstop = val; + + return 1; +} + +static int handle_fpasses(const char *arg, const char *opt, const struct flag *flag, int options) +{ + unsigned long mask; + + mask = flag->mask; + if (*opt == '\0') { + if (options & OPT_INVERSE) + fpasses &= ~mask; + else + fpasses |= mask; + return 1; + } + if (options & OPT_INVERSE) + return 0; + if (!strcmp(opt, "-enable")) { + fpasses |= mask; + return 1; + } + if (!strcmp(opt, "-disable")) { + fpasses &= ~mask; + return 1; + } + if (!strcmp(opt, "=last")) { + // clear everything above + mask |= mask - 1; + fpasses &= mask; + return 1; + } + return 0; +} + +static int handle_fdiagnostic_prefix(const char *arg, const char *opt, const struct flag *flag, int options) +{ + switch (*opt) { + case '\0': + diag_prefix = "sparse: "; + return 1; + case '=': + diag_prefix = xasprintf("%s: ", opt+1); + return 1; + default: + return 0; + } +} + +static int handle_fdump_ir(const char *arg, const char *opt, const struct flag *flag, int options) +{ + static const struct mask_map dump_ir_options[] = { + { "", PASS_LINEARIZE }, + { "linearize", PASS_LINEARIZE }, + { "mem2reg", PASS_MEM2REG }, + { "final", PASS_FINAL }, + { }, + }; + + return handle_suboption_mask(arg, opt, dump_ir_options, &fdump_ir); +} + +static int handle_fmemcpy_max_count(const char *arg, const char *opt, const struct flag *flag, int options) +{ + opt_ullong(arg, opt, &fmemcpy_max_count, OPTNUM_ZERO_IS_INF|OPTNUM_UNLIMITED); + return 1; +} + +static int handle_fmax_warnings(const char *arg, const char *opt, const struct flag *flag, int options) +{ + opt_uint(arg, opt, &fmax_warnings, OPTNUM_UNLIMITED); + return 1; +} + +static struct flag fflags[] = { + { "diagnostic-prefix", NULL, handle_fdiagnostic_prefix }, + { "dump-ir", NULL, handle_fdump_ir }, + { "freestanding", &fhosted, NULL, OPT_INVERSE }, + { "hosted", &fhosted }, + { "linearize", NULL, handle_fpasses, PASS_LINEARIZE }, + { "max-warnings=", NULL, handle_fmax_warnings }, + { "mem-report", &fmem_report }, + { "memcpy-max-count=", NULL, handle_fmemcpy_max_count }, + { "tabstop=", NULL, handle_ftabstop }, + { "mem2reg", NULL, handle_fpasses, PASS_MEM2REG }, + { "optim", NULL, handle_fpasses, PASS_OPTIM }, + { "pic", &fpic, handle_switch_setval, 1 }, + { "PIC", &fpic, handle_switch_setval, 2 }, + { "pie", &fpie, handle_switch_setval, 1 }, + { "PIE", &fpie, handle_switch_setval, 2 }, + { "signed-char", &funsigned_char, NULL, OPT_INVERSE }, + { "short-wchar", &fshort_wchar }, + { "unsigned-char", &funsigned_char, NULL, }, + { }, +}; + +static char **handle_switch_f(char *arg, char **next) +{ + if (handle_switches(arg-1, arg+1, fflags)) + return next; + + return next; +} + +static char **handle_switch_G(char *arg, char **next) +{ + if (!strcmp (arg, "G") && *next) + return next + 1; // "-G 0" + else + return next; // "-G0" or (bogus) terminal "-G" +} + +static char **handle_base_dir(char *arg, char **next) +{ + gcc_base_dir = *++next; + if (!gcc_base_dir) + die("missing argument for -gcc-base-dir option"); + return next; +} + +static char **handle_switch_g(char *arg, char **next) +{ + if (!strcmp (arg, "gcc-base-dir")) + return handle_base_dir(arg, next); + + return next; +} + static char **handle_switch_I(char *arg, char **next) { char *path = arg+1; @@ -659,15 +838,7 @@ static char **handle_switch_M(char *arg, char **next) return next; } -static char **handle_multiarch_dir(char *arg, char **next) -{ - multiarch_dir = *++next; - if (!multiarch_dir) - die("missing argument for -multiarch-dir option"); - return next; -} - -static int handle_cmodel(const char *opt, const char *arg, const struct flag *flag, int options) +static int handle_mcmodel(const char *opt, const char *arg, const struct flag *flag, int options) { static const struct val_map cmodels[] = { { "kernel", CMODEL_KERNEL }, @@ -682,7 +853,7 @@ static int handle_cmodel(const char *opt, const char *arg, const struct flag *fl return handle_subopt_val(opt, arg, cmodels, flag->flag); } -static int handle_float_abi(const char *opt, const char *arg, const struct flag *flag, int options) { +static int handle_mfloat_abi(const char *opt, const char *arg, const struct flag *flag, int options) { static const struct val_map fp_abis[] = { { "hard", FP_ABI_HARD }, { "soft", FP_ABI_SOFT }, @@ -692,6 +863,14 @@ static int handle_float_abi(const char *opt, const char *arg, const struct flag return handle_subopt_val(opt, arg, fp_abis, flag->flag); } +static char **handle_multiarch_dir(char *arg, char **next) +{ + multiarch_dir = *++next; + if (!multiarch_dir) + die("missing argument for -multiarch-dir option"); + return next; +} + static const struct flag mflags[] = { { "64", &arch_m64, NULL, OPT_VAL, ARCH_LP64 }, { "32", &arch_m64, NULL, OPT_VAL, ARCH_LP32 }, @@ -702,8 +881,8 @@ static const struct flag mflags[] = { { "size-long", &arch_msize_long }, { "big-endian", &arch_big_endian, NULL }, { "little-endian", &arch_big_endian, NULL, OPT_INVERSE }, - { "cmodel", &arch_cmodel, handle_cmodel }, - { "float-abi", &arch_fp_abi, handle_float_abi }, + { "cmodel", &arch_cmodel, handle_mcmodel }, + { "float-abi", &arch_fp_abi, handle_mfloat_abi }, { "hard-float", &arch_fp_abi, NULL, OPT_VAL, FP_ABI_HARD }, { "soft-float", &arch_fp_abi, NULL, OPT_VAL, FP_ABI_SOFT }, { } @@ -720,6 +899,30 @@ static char **handle_switch_m(char *arg, char **next) return next; } +static char **handle_nostdinc(char *arg, char **next) +{ + add_pre_buffer("#nostdinc\n"); + return next; +} + +static char **handle_switch_n(char *arg, char **next) +{ + if (!strcmp (arg, "nostdinc")) + return handle_nostdinc(arg, next); + + return next; +} + +static char **handle_switch_O(char *arg, char **next) +{ + int level = 1; + if (arg[1] >= '0' && arg[1] <= '9') + level = arg[1] - '0'; + optimize_level = level; + optimize_size = arg[1] == 's'; + return next; +} + static char **handle_switch_o(char *arg, char **next) { if (!strcmp (arg, "o")) { // "-o foo" @@ -743,304 +946,6 @@ static char **handle_switch_p(char *arg, char **next) return next; } -static const struct flag warnings[] = { - { "address", &Waddress }, - { "address-space", &Waddress_space }, - { "bitwise", &Wbitwise }, - { "bitwise-pointer", &Wbitwise_pointer}, - { "cast-from-as", &Wcast_from_as }, - { "cast-to-as", &Wcast_to_as }, - { "cast-truncate", &Wcast_truncate }, - { "constant-suffix", &Wconstant_suffix }, - { "constexpr-not-const", &Wconstexpr_not_const}, - { "context", &Wcontext }, - { "decl", &Wdecl }, - { "declaration-after-statement", &Wdeclarationafterstatement }, - { "default-bitfield-sign", &Wdefault_bitfield_sign }, - { "designated-init", &Wdesignated_init }, - { "do-while", &Wdo_while }, - { "enum-mismatch", &Wenum_mismatch }, - { "external-function-has-definition", &Wexternal_function_has_definition }, - { "implicit-int", &Wimplicit_int }, - { "init-cstring", &Winit_cstring }, - { "int-to-pointer-cast", &Wint_to_pointer_cast }, - { "memcpy-max-count", &Wmemcpy_max_count }, - { "non-pointer-null", &Wnon_pointer_null }, - { "newline-eof", &Wnewline_eof }, - { "old-initializer", &Wold_initializer }, - { "old-style-definition", &Wold_style_definition }, - { "one-bit-signed-bitfield", &Wone_bit_signed_bitfield }, - { "override-init", &Woverride_init }, - { "override-init-all", &Woverride_init_all }, - { "paren-string", &Wparen_string }, - { "pedantic", &Wpedantic }, - { "pointer-to-int-cast", &Wpointer_to_int_cast }, - { "ptr-subtraction-blows", &Wptr_subtraction_blows }, - { "return-void", &Wreturn_void }, - { "shadow", &Wshadow }, - { "shift-count-negative", &Wshift_count_negative }, - { "shift-count-overflow", &Wshift_count_overflow }, - { "sizeof-bool", &Wsizeof_bool }, - { "strict-prototypes", &Wstrict_prototypes }, - { "pointer-arith", &Wpointer_arith }, - { "sparse-error", &Wsparse_error }, - { "tautological-compare", &Wtautological_compare }, - { "transparent-union", &Wtransparent_union }, - { "typesign", &Wtypesign }, - { "undef", &Wundef }, - { "uninitialized", &Wuninitialized }, - { "universal-initializer", &Wuniversal_initializer }, - { "unknown-attribute", &Wunknown_attribute }, - { "vla", &Wvla }, - { } -}; - -static char **handle_switch_W(char *arg, char **next) -{ - char ** ret = handle_onoff_switch(arg, next, warnings); - if (ret) - return ret; - - if (!strcmp(arg, "Wsparse-all")) { - int i; - for (i = 0; warnings[i].name; i++) { - if (*warnings[i].flag != FLAG_FORCE_OFF) - *warnings[i].flag = FLAG_ON; - } - } - - // Unknown. - return next; -} - -static struct flag debugs[] = { - { "compound", &dbg_compound}, - { "dead", &dbg_dead}, - { "domtree", &dbg_domtree}, - { "entry", &dbg_entry}, - { "ir", &dbg_ir}, - { "postorder", &dbg_postorder}, - { } -}; - - -static char **handle_switch_v(char *arg, char **next) -{ - char ** ret = handle_onoff_switch(arg, next, debugs); - if (ret) - return ret; - - // Unknown. - do { - verbose++; - } while (*++arg == 'v'); - return next; -} - -static char **handle_switch_d(char *arg, char **next) -{ - char *arg_char = arg + 1; - - /* - * -d, where is a sequence of characters, not preceded - * by a space. If you specify characters whose behaviour conflicts, - * the result is undefined. - */ - while (*arg_char) { - switch (*arg_char) { - case 'M': /* dump just the macro definitions */ - dump_macros_only = 1; - dump_macro_defs = 0; - break; - case 'D': /* like 'M', but also output pre-processed text */ - dump_macro_defs = 1; - dump_macros_only = 0; - break; - case 'N': /* like 'D', but only output macro names not bodies */ - break; - case 'I': /* like 'D', but also output #include directives */ - break; - case 'U': /* like 'D', but only output expanded macros */ - break; - } - arg_char++; - } - return next; -} - - -static void handle_switch_W_finalize(void) -{ - handle_onoff_switch_finalize(warnings); - - /* default Wdeclarationafterstatement based on the C dialect */ - if (-1 == Wdeclarationafterstatement) { - switch (standard) { - case STANDARD_C89: - case STANDARD_C94: - Wdeclarationafterstatement = 1; - break; - default: - Wdeclarationafterstatement = 0; - break; - } - } -} - -static void handle_switch_v_finalize(void) -{ - handle_onoff_switch_finalize(debugs); -} - -static char **handle_switch_U(char *arg, char **next) -{ - const char *name = arg + 1; - add_pre_buffer ("#undef %s\n", name); - return next; -} - -static char **handle_switch_O(char *arg, char **next) -{ - int level = 1; - if (arg[1] >= '0' && arg[1] <= '9') - level = arg[1] - '0'; - optimize_level = level; - optimize_size = arg[1] == 's'; - return next; -} - -static int handle_ftabstop(const char *arg, const char *opt, const struct flag *flag, int options) -{ - unsigned long val; - char *end; - - if (*opt == '\0') - die("error: missing argument to \"%s\"", arg); - - /* we silently ignore silly values */ - val = strtoul(opt, &end, 10); - if (*end == '\0' && 1 <= val && val <= 100) - tabstop = val; - - return 1; -} - -static int handle_fpasses(const char *arg, const char *opt, const struct flag *flag, int options) -{ - unsigned long mask; - - mask = flag->mask; - if (*opt == '\0') { - if (options & OPT_INVERSE) - fpasses &= ~mask; - else - fpasses |= mask; - return 1; - } - if (options & OPT_INVERSE) - return 0; - if (!strcmp(opt, "-enable")) { - fpasses |= mask; - return 1; - } - if (!strcmp(opt, "-disable")) { - fpasses &= ~mask; - return 1; - } - if (!strcmp(opt, "=last")) { - // clear everything above - mask |= mask - 1; - fpasses &= mask; - return 1; - } - return 0; -} - -static int handle_fdiagnostic_prefix(const char *arg, const char *opt, const struct flag *flag, int options) -{ - switch (*opt) { - case '\0': - diag_prefix = "sparse: "; - return 1; - case '=': - diag_prefix = xasprintf("%s: ", opt+1); - return 1; - default: - return 0; - } -} - -static int handle_fdump_ir(const char *arg, const char *opt, const struct flag *flag, int options) -{ - static const struct mask_map dump_ir_options[] = { - { "", PASS_LINEARIZE }, - { "linearize", PASS_LINEARIZE }, - { "mem2reg", PASS_MEM2REG }, - { "final", PASS_FINAL }, - { }, - }; - - return handle_suboption_mask(arg, opt, dump_ir_options, &fdump_ir); -} - -static int handle_fmemcpy_max_count(const char *arg, const char *opt, const struct flag *flag, int options) -{ - opt_ullong(arg, opt, &fmemcpy_max_count, OPTNUM_ZERO_IS_INF|OPTNUM_UNLIMITED); - return 1; -} - -static int handle_fmax_warnings(const char *arg, const char *opt, const struct flag *flag, int options) -{ - opt_uint(arg, opt, &fmax_warnings, OPTNUM_UNLIMITED); - return 1; -} - -static struct flag fflags[] = { - { "diagnostic-prefix", NULL, handle_fdiagnostic_prefix }, - { "dump-ir", NULL, handle_fdump_ir }, - { "freestanding", &fhosted, NULL, OPT_INVERSE }, - { "hosted", &fhosted }, - { "linearize", NULL, handle_fpasses, PASS_LINEARIZE }, - { "max-warnings=", NULL, handle_fmax_warnings }, - { "mem-report", &fmem_report }, - { "memcpy-max-count=", NULL, handle_fmemcpy_max_count }, - { "tabstop=", NULL, handle_ftabstop }, - { "mem2reg", NULL, handle_fpasses, PASS_MEM2REG }, - { "optim", NULL, handle_fpasses, PASS_OPTIM }, - { "pic", &fpic, handle_switch_setval, 1 }, - { "PIC", &fpic, handle_switch_setval, 2 }, - { "pie", &fpie, handle_switch_setval, 1 }, - { "PIE", &fpie, handle_switch_setval, 2 }, - { "signed-char", &funsigned_char, NULL, OPT_INVERSE }, - { "short-wchar", &fshort_wchar }, - { "unsigned-char", &funsigned_char, NULL, }, - { }, -}; - -static char **handle_switch_f(char *arg, char **next) -{ - if (handle_switches(arg-1, arg+1, fflags)) - return next; - - return next; -} - -static char **handle_switch_G(char *arg, char **next) -{ - if (!strcmp (arg, "G") && *next) - return next + 1; // "-G 0" - else - return next; // "-G0" or (bogus) terminal "-G" -} - -static char **handle_switch_a(char *arg, char **next) -{ - if (!strcmp (arg, "ansi")) - standard = STANDARD_C89; - - return next; -} - static char **handle_switch_s(const char *arg, char **next) { if ((arg = match_option(arg, "std="))) { @@ -1087,36 +992,129 @@ static char **handle_switch_s(const char *arg, char **next) return next; } -static char **handle_nostdinc(char *arg, char **next) +static char **handle_switch_U(char *arg, char **next) { - add_pre_buffer("#nostdinc\n"); + const char *name = arg + 1; + add_pre_buffer ("#undef %s\n", name); return next; } -static char **handle_switch_n(char *arg, char **next) +static struct flag debugs[] = { + { "compound", &dbg_compound}, + { "dead", &dbg_dead}, + { "domtree", &dbg_domtree}, + { "entry", &dbg_entry}, + { "ir", &dbg_ir}, + { "postorder", &dbg_postorder}, + { } +}; + +static char **handle_switch_v(char *arg, char **next) { - if (!strcmp (arg, "nostdinc")) - return handle_nostdinc(arg, next); + char ** ret = handle_onoff_switch(arg, next, debugs); + if (ret) + return ret; + // Unknown. + do { + verbose++; + } while (*++arg == 'v'); return next; } -static char **handle_base_dir(char *arg, char **next) +static void handle_switch_v_finalize(void) { - gcc_base_dir = *++next; - if (!gcc_base_dir) - die("missing argument for -gcc-base-dir option"); - return next; + handle_onoff_switch_finalize(debugs); } -static char **handle_switch_g(char *arg, char **next) +static const struct flag warnings[] = { + { "address", &Waddress }, + { "address-space", &Waddress_space }, + { "bitwise", &Wbitwise }, + { "bitwise-pointer", &Wbitwise_pointer}, + { "cast-from-as", &Wcast_from_as }, + { "cast-to-as", &Wcast_to_as }, + { "cast-truncate", &Wcast_truncate }, + { "constant-suffix", &Wconstant_suffix }, + { "constexpr-not-const", &Wconstexpr_not_const}, + { "context", &Wcontext }, + { "decl", &Wdecl }, + { "declaration-after-statement", &Wdeclarationafterstatement }, + { "default-bitfield-sign", &Wdefault_bitfield_sign }, + { "designated-init", &Wdesignated_init }, + { "do-while", &Wdo_while }, + { "enum-mismatch", &Wenum_mismatch }, + { "external-function-has-definition", &Wexternal_function_has_definition }, + { "implicit-int", &Wimplicit_int }, + { "init-cstring", &Winit_cstring }, + { "int-to-pointer-cast", &Wint_to_pointer_cast }, + { "memcpy-max-count", &Wmemcpy_max_count }, + { "non-pointer-null", &Wnon_pointer_null }, + { "newline-eof", &Wnewline_eof }, + { "old-initializer", &Wold_initializer }, + { "old-style-definition", &Wold_style_definition }, + { "one-bit-signed-bitfield", &Wone_bit_signed_bitfield }, + { "override-init", &Woverride_init }, + { "override-init-all", &Woverride_init_all }, + { "paren-string", &Wparen_string }, + { "pedantic", &Wpedantic }, + { "pointer-to-int-cast", &Wpointer_to_int_cast }, + { "ptr-subtraction-blows", &Wptr_subtraction_blows }, + { "return-void", &Wreturn_void }, + { "shadow", &Wshadow }, + { "shift-count-negative", &Wshift_count_negative }, + { "shift-count-overflow", &Wshift_count_overflow }, + { "sizeof-bool", &Wsizeof_bool }, + { "strict-prototypes", &Wstrict_prototypes }, + { "pointer-arith", &Wpointer_arith }, + { "sparse-error", &Wsparse_error }, + { "tautological-compare", &Wtautological_compare }, + { "transparent-union", &Wtransparent_union }, + { "typesign", &Wtypesign }, + { "undef", &Wundef }, + { "uninitialized", &Wuninitialized }, + { "universal-initializer", &Wuniversal_initializer }, + { "unknown-attribute", &Wunknown_attribute }, + { "vla", &Wvla }, + { } +}; + +static char **handle_switch_W(char *arg, char **next) { - if (!strcmp (arg, "gcc-base-dir")) - return handle_base_dir(arg, next); + char ** ret = handle_onoff_switch(arg, next, warnings); + if (ret) + return ret; + if (!strcmp(arg, "Wsparse-all")) { + int i; + for (i = 0; warnings[i].name; i++) { + if (*warnings[i].flag != FLAG_FORCE_OFF) + *warnings[i].flag = FLAG_ON; + } + } + + // Unknown. return next; } +static void handle_switch_W_finalize(void) +{ + handle_onoff_switch_finalize(warnings); + + /* default Wdeclarationafterstatement based on the C dialect */ + if (-1 == Wdeclarationafterstatement) { + switch (standard) { + case STANDARD_C89: + case STANDARD_C94: + Wdeclarationafterstatement = 1; + break; + default: + Wdeclarationafterstatement = 0; + break; + } + } +} + static char **handle_switch_x(char *arg, char **next) { if (!*++next) @@ -1139,12 +1137,6 @@ static char **handle_arch(char *arg, char **next) return next; } -static char **handle_version(char *arg, char **next) -{ - printf("%s\n", SPARSE_VERSION); - exit(0); -} - static char **handle_param(char *arg, char **next) { char *value = NULL; @@ -1162,6 +1154,12 @@ static char **handle_param(char *arg, char **next) return next; } +static char **handle_version(char *arg, char **next) +{ + printf("%s\n", SPARSE_VERSION); + exit(0); +} + struct switches { const char *name; char **(*fn)(char *, char **); -- cgit 1.2.3-korg From 6e43ab07fa278305978ece365f97ec72c2ef5bde Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Wed, 1 Jul 2020 21:23:38 +0200 Subject: options: avoid spaces between function name and arguments list It's a stylistic detail but a lot of the strcmp() calls used for the processing of the options are written 'strcmp (...)'. Two other functions calls are also in the case. Reformat them to the usual style for function calls: without the space between the function name and the arguments. Signed-off-by: Luc Van Oostenryck --- lib.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib.c b/lib.c index 5f4e6b2d..b3bacb18 100644 --- a/lib.c +++ b/lib.c @@ -570,7 +570,7 @@ OPT_NUMERIC(uint, unsigned int, strtoul) static char **handle_switch_a(char *arg, char **next) { - if (!strcmp (arg, "ansi")) + if (!strcmp(arg, "ansi")) standard = STANDARD_C89; return next; @@ -759,7 +759,7 @@ static char **handle_switch_f(char *arg, char **next) static char **handle_switch_G(char *arg, char **next) { - if (!strcmp (arg, "G") && *next) + if (!strcmp(arg, "G") && *next) return next + 1; // "-G 0" else return next; // "-G0" or (bogus) terminal "-G" @@ -775,7 +775,7 @@ static char **handle_base_dir(char *arg, char **next) static char **handle_switch_g(char *arg, char **next) { - if (!strcmp (arg, "gcc-base-dir")) + if (!strcmp(arg, "gcc-base-dir")) return handle_base_dir(arg, next); return next; @@ -907,7 +907,7 @@ static char **handle_nostdinc(char *arg, char **next) static char **handle_switch_n(char *arg, char **next) { - if (!strcmp (arg, "nostdinc")) + if (!strcmp(arg, "nostdinc")) return handle_nostdinc(arg, next); return next; @@ -925,7 +925,7 @@ static char **handle_switch_O(char *arg, char **next) static char **handle_switch_o(char *arg, char **next) { - if (!strcmp (arg, "o")) { // "-o foo" + if (!strcmp(arg, "o")) { // "-o foo" if (!*++next) die("argument to '-o' is missing"); outfile = *next; @@ -949,23 +949,23 @@ static char **handle_switch_p(char *arg, char **next) static char **handle_switch_s(const char *arg, char **next) { if ((arg = match_option(arg, "std="))) { - if (!strcmp (arg, "c89") || - !strcmp (arg, "iso9899:1990")) + if (!strcmp(arg, "c89") || + !strcmp(arg, "iso9899:1990")) standard = STANDARD_C89; - else if (!strcmp (arg, "iso9899:199409")) + else if (!strcmp(arg, "iso9899:199409")) standard = STANDARD_C94; - else if (!strcmp (arg, "c99") || - !strcmp (arg, "c9x") || - !strcmp (arg, "iso9899:1999") || - !strcmp (arg, "iso9899:199x")) + else if (!strcmp(arg, "c99") || + !strcmp(arg, "c9x") || + !strcmp(arg, "iso9899:1999") || + !strcmp(arg, "iso9899:199x")) standard = STANDARD_C99; - else if (!strcmp (arg, "gnu89")) + else if (!strcmp(arg, "gnu89")) standard = STANDARD_GNU89; - else if (!strcmp (arg, "gnu99") || !strcmp (arg, "gnu9x")) + else if (!strcmp(arg, "gnu99") || !strcmp(arg, "gnu9x")) standard = STANDARD_GNU99; else if (!strcmp(arg, "c11") || @@ -986,7 +986,7 @@ static char **handle_switch_s(const char *arg, char **next) standard = STANDARD_GNU17; else - die ("Unsupported C dialect"); + die("Unsupported C dialect"); } return next; @@ -995,7 +995,7 @@ static char **handle_switch_s(const char *arg, char **next) static char **handle_switch_U(char *arg, char **next) { const char *name = arg + 1; - add_pre_buffer ("#undef %s\n", name); + add_pre_buffer("#undef %s\n", name); return next; } @@ -1516,7 +1516,7 @@ static struct symbol_list *sparse_file(const char *filename) int fd; struct token *token; - if (strcmp (filename, "-") == 0) { + if (strcmp(filename, "-") == 0) { fd = 0; } else { fd = open(filename, O_RDONLY); -- cgit 1.2.3-korg From a717e30bdf1ade23a28b644d1cb9f1161030d3b3 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Wed, 1 Jul 2020 23:36:05 +0200 Subject: options: move declaration of tabstop out of "token.h" 'tabstop' is unusual in the sense that it's one the few (the only?) variable defined via an option flag which is not declared in "lib.h" but in "token.h". This for to have to include "token.h" in the code doing the parsing of the options ... Move this declaration to "lib.h". Signed-off-by: Luc Van Oostenryck --- lib.h | 1 + token.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib.h b/lib.h index 4f67958e..e938f18d 100644 --- a/lib.h +++ b/lib.h @@ -48,6 +48,7 @@ extern int die_if_error; extern int repeat_phase; extern int do_output; extern int gcc_major, gcc_minor, gcc_patchlevel; +extern unsigned int tabstop; extern const char *base_filename; diff --git a/token.h b/token.h index 33a6eda1..c5fdf3d0 100644 --- a/token.h +++ b/token.h @@ -64,7 +64,6 @@ struct stream { extern int input_stream_nr; extern struct stream *input_streams; -extern unsigned int tabstop; extern int *hash_stream(const char *name); struct ident { -- cgit 1.2.3-korg From 5784e53b392cbda40e2828d7dcdee38ee589a18a Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Wed, 1 Jul 2020 23:32:06 +0200 Subject: options: add a small helper: handle_switch_finalize() This is just to isolate the details about which switch need an extra 'finalization' in a separate function in preparation to moving all the parsing code in a separate file. Signed-off-by: Luc Van Oostenryck --- lib.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib.c b/lib.c index b3bacb18..a56efcaa 100644 --- a/lib.c +++ b/lib.c @@ -1220,6 +1220,12 @@ static char **handle_switch(char *arg, char **next) return next; } +static void handle_switch_finalize(void) +{ + handle_switch_v_finalize(); + handle_switch_W_finalize(); +} + //////////////////////////////////////////////////////////////////////////////// // Predefines @@ -1576,8 +1582,7 @@ struct symbol_list *sparse_initialize(int argc, char **argv, struct string_list } add_ptr_list(filelist, arg); } - handle_switch_W_finalize(); - handle_switch_v_finalize(); + handle_switch_finalize(); // Redirect stdout if needed if (dump_macro_defs || preprocess_only) -- cgit 1.2.3-korg From 4c12284169f2977b8061cef6f93d1f12c9248f45 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Wed, 1 Jul 2020 23:26:42 +0200 Subject: options: move option parsing in a separate file lib.c contains to much things and is too hard to keep tidy. So, move everything related to option parsing in it's own file. Signed-off-by: Luc Van Oostenryck --- Makefile | 1 + lib.c | 982 +------------------------------------------------------------ lib.h | 117 +------- options.c | 998 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ options.h | 132 +++++++++ 5 files changed, 1134 insertions(+), 1096 deletions(-) create mode 100644 options.c create mode 100644 options.h diff --git a/Makefile b/Makefile index a292e42a..dce666d2 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ LIB_OBJS += liveness.o LIB_OBJS += memops.o LIB_OBJS += opcode.o LIB_OBJS += optimize.o +LIB_OBJS += options.o LIB_OBJS += parse.o LIB_OBJS += pre-process.o LIB_OBJS += ptrlist.o diff --git a/lib.c b/lib.c index a56efcaa..53b107d2 100644 --- a/lib.c +++ b/lib.c @@ -49,27 +49,6 @@ #include "version.h" #include "bits.h" -int verbose, optimize_level, optimize_size, preprocessing; -int die_if_error = 0; -int has_error = 0; -int do_output = 1; - -#ifndef __GNUC__ -# define __GNUC__ 2 -# define __GNUC_MINOR__ 95 -# define __GNUC_PATCHLEVEL__ 0 -#endif - -int gcc_major = __GNUC__; -int gcc_minor = __GNUC_MINOR__; -int gcc_patchlevel = __GNUC_PATCHLEVEL__; - -const char *base_filename; - -static const char *diag_prefix = ""; -static const char *gcc_base_dir = GCC_BASE; -static const char *multiarch_dir = MULTIARCH_TRIPLET; -static const char *outfile = NULL; struct token *skip_to(struct token *token, int op) { @@ -143,7 +122,6 @@ static void do_warn(const char *type, struct position pos, const char * fmt, va_ name, pos.line, pos.pos, diag_prefix, type, buffer); } -unsigned int fmax_warnings = 100; static int show_info = 1; void info(struct position pos, const char * fmt, ...) @@ -247,102 +225,11 @@ void die(const char *fmt, ...) exit(1); } +//////////////////////////////////////////////////////////////////////////////// + static struct token *pre_buffer_begin = NULL; static struct token *pre_buffer_end = NULL; -enum flag_type { - FLAG_OFF, - FLAG_ON, - FLAG_FORCE_OFF -}; - -int Waddress = 0; -int Waddress_space = 1; -int Wbitwise = 1; -int Wbitwise_pointer = 0; -int Wcast_from_as = 0; -int Wcast_to_as = 0; -int Wcast_truncate = 1; -int Wconstant_suffix = 0; -int Wconstexpr_not_const = 0; -int Wcontext = 1; -int Wdecl = 1; -int Wdeclarationafterstatement = -1; -int Wdefault_bitfield_sign = 0; -int Wdesignated_init = 1; -int Wdo_while = 0; -int Wimplicit_int = 1; -int Winit_cstring = 0; -int Wint_to_pointer_cast = 1; -int Wenum_mismatch = 1; -int Wexternal_function_has_definition = 1; -int Wmemcpy_max_count = 1; -int Wnewline_eof = 1; -int Wnon_pointer_null = 1; -int Wold_initializer = 1; -int Wold_style_definition = 1; -int Wone_bit_signed_bitfield = 1; -int Woverride_init = 1; -int Woverride_init_all = 0; -int Woverride_init_whole_range = 0; -int Wparen_string = 0; -int Wpedantic = 0; -int Wpointer_arith = 0; -int Wpointer_to_int_cast = 1; -int Wptr_subtraction_blows = 0; -int Wreturn_void = 0; -int Wshadow = 0; -int Wshift_count_negative = 1; -int Wshift_count_overflow = 1; -int Wsizeof_bool = 0; -int Wsparse_error = FLAG_FORCE_OFF; -int Wstrict_prototypes = 1; -int Wtautological_compare = 0; -int Wtransparent_union = 0; -int Wtypesign = 0; -int Wundef = 0; -int Wuninitialized = 1; -int Wuniversal_initializer = 0; -int Wunknown_attribute = 0; -int Wvla = 1; - -int dump_macro_defs = 0; -int dump_macros_only = 0; - -int dbg_compound = 0; -int dbg_dead = 0; -int dbg_domtree = 0; -int dbg_entry = 0; -int dbg_ir = 0; -int dbg_postorder = 0; - -unsigned long fdump_ir; -int fhosted = 1; -int fmem_report = 0; -unsigned long long fmemcpy_max_count = 100000; -unsigned long fpasses = ~0UL; -int fpic = 0; -int fpie = 0; -int fshort_wchar = 0; -int funsigned_char = 0; - -int preprocess_only; - -enum standard standard = STANDARD_GNU89; - -int arch_msize_long = 0; -int arch_m64 = ARCH_M64_DEFAULT; -int arch_big_endian = ARCH_BIG_ENDIAN; -int arch_fp_abi = FP_ABI_NATIVE; -int arch_os = OS_NATIVE; -int arch_cmodel = CMODEL_UNKNOWN; - - -#define CMDLINE_INCLUDE 20 -static int cmdline_include_nr = 0; -static char *cmdline_include[CMDLINE_INCLUDE]; - - void add_pre_buffer(const char *fmt, ...) { va_list args; @@ -361,871 +248,6 @@ void add_pre_buffer(const char *fmt, ...) pre_buffer_end = end; } -//////////////////////////////////////////////////////////////////////////////// -// Helpers for option parsing - -static const char *match_option(const char *arg, const char *prefix) -{ - unsigned int n = strlen(prefix); - if (strncmp(arg, prefix, n) == 0) - return arg + n; - return NULL; -} - - -struct val_map { - const char *name; - int val; -}; - -static int handle_subopt_val(const char *opt, const char *arg, const struct val_map *map, int *flag) -{ - const char *name; - - if (*arg++ != '=') - die("missing argument for option '%s'", opt); - for (;(name = map->name); map++) { - if (strcmp(name, arg) == 0 || strcmp(name, "*") == 0) { - *flag = map->val; - return 1; - } - if (strcmp(name, "?") == 0) - die("invalid argument '%s' in option '%s'", arg, opt); - } - return 0; -} - - -struct mask_map { - const char *name; - unsigned long mask; -}; - -static int apply_mask(unsigned long *val, const char *str, unsigned len, const struct mask_map *map, int neg) -{ - const char *name; - - for (;(name = map->name); map++) { - if (!strncmp(name, str, len) && !name[len]) { - if (neg == 0) - *val |= map->mask; - else - *val &= ~map->mask; - return 0; - } - } - return 1; -} - -static int handle_suboption_mask(const char *arg, const char *opt, const struct mask_map *map, unsigned long *flag) -{ - if (*opt == '\0') { - apply_mask(flag, "", 0, map, 0); - return 1; - } - if (*opt++ != '=') - return 0; - while (1) { - unsigned int len = strcspn(opt, ",+"); - int neg = 0; - if (len == 0) - goto end; - if (!strncmp(opt, "no-", 3)) { - opt += 3; - len -= 3; - neg = 1; - } - if (apply_mask(flag, opt, len, map, neg)) - die("error: wrong option '%.*s' for \'%s\'", len, opt, arg); - -end: - opt += len; - if (*opt++ == '\0') - break; - } - return 1; -} - - -#define OPT_INVERSE 1 -#define OPT_VAL 2 -struct flag { - const char *name; - int *flag; - int (*fun)(const char *arg, const char *opt, const struct flag *, int options); - unsigned long mask; - int val; -}; - -static int handle_switches(const char *ori, const char *opt, const struct flag *flags) -{ - const char *arg = opt; - int val = 1; - - // Prefixe "no-" mean to turn flag off. - if (strncmp(arg, "no-", 3) == 0) { - arg += 3; - val = 0; - } - - for (; flags->name; flags++) { - const char *opt = match_option(arg, flags->name); - int rc; - - if (!opt) - continue; - - if (flags->fun) { - int options = 0; - if (!val) - options |= OPT_INVERSE; - if ((rc = flags->fun(ori, opt, flags, options))) - return rc; - } - - // boolean flag - if (opt[0] == '\0' && flags->flag) { - if (flags->mask & OPT_VAL) - val = flags->val; - if (flags->mask & OPT_INVERSE) - val = !val; - *flags->flag = val; - return 1; - } - } - - // not handled - return 0; -} - -static char **handle_onoff_switch(char *arg, char **next, const struct flag flags[]) -{ - int flag = FLAG_ON; - char *p = arg + 1; - unsigned i; - - // Prefixes "no" and "no-" mean to turn warning off. - if (p[0] == 'n' && p[1] == 'o') { - p += 2; - if (p[0] == '-') - p++; - flag = FLAG_FORCE_OFF; - } - - for (i = 0; flags[i].name; i++) { - if (!strcmp(p,flags[i].name)) { - *flags[i].flag = flag; - return next; - } - } - - // Unknown. - return NULL; -} - -static void handle_onoff_switch_finalize(const struct flag flags[]) -{ - unsigned i; - - for (i = 0; flags[i].name; i++) { - if (*flags[i].flag == FLAG_FORCE_OFF) - *flags[i].flag = FLAG_OFF; - } -} - -static int handle_switch_setval(const char *arg, const char *opt, const struct flag *flag, int options) -{ - *(flag->flag) = flag->mask; - return 1; -} - - -#define OPTNUM_ZERO_IS_INF 1 -#define OPTNUM_UNLIMITED 2 - -#define OPT_NUMERIC(NAME, TYPE, FUNCTION) \ -static int opt_##NAME(const char *arg, const char *opt, TYPE *ptr, int flag) \ -{ \ - char *end; \ - TYPE val; \ - \ - val = FUNCTION(opt, &end, 0); \ - if (*end != '\0' || end == opt) { \ - if ((flag & OPTNUM_UNLIMITED) && !strcmp(opt, "unlimited")) \ - val = ~val; \ - else \ - die("error: wrong argument to \'%s\'", arg); \ - } \ - if ((flag & OPTNUM_ZERO_IS_INF) && val == 0) \ - val = ~val; \ - *ptr = val; \ - return 1; \ -} - -OPT_NUMERIC(ullong, unsigned long long, strtoull) -OPT_NUMERIC(uint, unsigned int, strtoul) - -//////////////////////////////////////////////////////////////////////////////// -// Option parsing - -static char **handle_switch_a(char *arg, char **next) -{ - if (!strcmp(arg, "ansi")) - standard = STANDARD_C89; - - return next; -} - -static char **handle_switch_D(char *arg, char **next) -{ - const char *name = arg + 1; - const char *value = "1"; - - if (!*name) { - arg = *++next; - if (!arg) - die("argument to `-D' is missing"); - name = arg; - } - - for (;;arg++) { - char c; - c = *arg; - if (!c) - break; - if (c == '=') { - *arg = '\0'; - value = arg + 1; - break; - } - } - add_pre_buffer("#define %s %s\n", name, value); - return next; -} - -static char **handle_switch_d(char *arg, char **next) -{ - char *arg_char = arg + 1; - - /* - * -d, where is a sequence of characters, not preceded - * by a space. If you specify characters whose behaviour conflicts, - * the result is undefined. - */ - while (*arg_char) { - switch (*arg_char) { - case 'M': /* dump just the macro definitions */ - dump_macros_only = 1; - dump_macro_defs = 0; - break; - case 'D': /* like 'M', but also output pre-processed text */ - dump_macro_defs = 1; - dump_macros_only = 0; - break; - case 'N': /* like 'D', but only output macro names not bodies */ - break; - case 'I': /* like 'D', but also output #include directives */ - break; - case 'U': /* like 'D', but only output expanded macros */ - break; - } - arg_char++; - } - return next; -} - -static char **handle_switch_E(char *arg, char **next) -{ - if (arg[1] == '\0') - preprocess_only = 1; - return next; -} - -static int handle_ftabstop(const char *arg, const char *opt, const struct flag *flag, int options) -{ - unsigned long val; - char *end; - - if (*opt == '\0') - die("error: missing argument to \"%s\"", arg); - - /* we silently ignore silly values */ - val = strtoul(opt, &end, 10); - if (*end == '\0' && 1 <= val && val <= 100) - tabstop = val; - - return 1; -} - -static int handle_fpasses(const char *arg, const char *opt, const struct flag *flag, int options) -{ - unsigned long mask; - - mask = flag->mask; - if (*opt == '\0') { - if (options & OPT_INVERSE) - fpasses &= ~mask; - else - fpasses |= mask; - return 1; - } - if (options & OPT_INVERSE) - return 0; - if (!strcmp(opt, "-enable")) { - fpasses |= mask; - return 1; - } - if (!strcmp(opt, "-disable")) { - fpasses &= ~mask; - return 1; - } - if (!strcmp(opt, "=last")) { - // clear everything above - mask |= mask - 1; - fpasses &= mask; - return 1; - } - return 0; -} - -static int handle_fdiagnostic_prefix(const char *arg, const char *opt, const struct flag *flag, int options) -{ - switch (*opt) { - case '\0': - diag_prefix = "sparse: "; - return 1; - case '=': - diag_prefix = xasprintf("%s: ", opt+1); - return 1; - default: - return 0; - } -} - -static int handle_fdump_ir(const char *arg, const char *opt, const struct flag *flag, int options) -{ - static const struct mask_map dump_ir_options[] = { - { "", PASS_LINEARIZE }, - { "linearize", PASS_LINEARIZE }, - { "mem2reg", PASS_MEM2REG }, - { "final", PASS_FINAL }, - { }, - }; - - return handle_suboption_mask(arg, opt, dump_ir_options, &fdump_ir); -} - -static int handle_fmemcpy_max_count(const char *arg, const char *opt, const struct flag *flag, int options) -{ - opt_ullong(arg, opt, &fmemcpy_max_count, OPTNUM_ZERO_IS_INF|OPTNUM_UNLIMITED); - return 1; -} - -static int handle_fmax_warnings(const char *arg, const char *opt, const struct flag *flag, int options) -{ - opt_uint(arg, opt, &fmax_warnings, OPTNUM_UNLIMITED); - return 1; -} - -static struct flag fflags[] = { - { "diagnostic-prefix", NULL, handle_fdiagnostic_prefix }, - { "dump-ir", NULL, handle_fdump_ir }, - { "freestanding", &fhosted, NULL, OPT_INVERSE }, - { "hosted", &fhosted }, - { "linearize", NULL, handle_fpasses, PASS_LINEARIZE }, - { "max-warnings=", NULL, handle_fmax_warnings }, - { "mem-report", &fmem_report }, - { "memcpy-max-count=", NULL, handle_fmemcpy_max_count }, - { "tabstop=", NULL, handle_ftabstop }, - { "mem2reg", NULL, handle_fpasses, PASS_MEM2REG }, - { "optim", NULL, handle_fpasses, PASS_OPTIM }, - { "pic", &fpic, handle_switch_setval, 1 }, - { "PIC", &fpic, handle_switch_setval, 2 }, - { "pie", &fpie, handle_switch_setval, 1 }, - { "PIE", &fpie, handle_switch_setval, 2 }, - { "signed-char", &funsigned_char, NULL, OPT_INVERSE }, - { "short-wchar", &fshort_wchar }, - { "unsigned-char", &funsigned_char, NULL, }, - { }, -}; - -static char **handle_switch_f(char *arg, char **next) -{ - if (handle_switches(arg-1, arg+1, fflags)) - return next; - - return next; -} - -static char **handle_switch_G(char *arg, char **next) -{ - if (!strcmp(arg, "G") && *next) - return next + 1; // "-G 0" - else - return next; // "-G0" or (bogus) terminal "-G" -} - -static char **handle_base_dir(char *arg, char **next) -{ - gcc_base_dir = *++next; - if (!gcc_base_dir) - die("missing argument for -gcc-base-dir option"); - return next; -} - -static char **handle_switch_g(char *arg, char **next) -{ - if (!strcmp(arg, "gcc-base-dir")) - return handle_base_dir(arg, next); - - return next; -} - -static char **handle_switch_I(char *arg, char **next) -{ - char *path = arg+1; - - switch (arg[1]) { - case '-': - add_pre_buffer("#split_include\n"); - break; - - case '\0': /* Plain "-I" */ - path = *++next; - if (!path) - die("missing argument for -I option"); - /* Fall through */ - default: - add_pre_buffer("#add_include \"%s/\"\n", path); - } - return next; -} - -static void add_cmdline_include(char *filename) -{ - if (cmdline_include_nr >= CMDLINE_INCLUDE) - die("too many include files for %s\n", filename); - cmdline_include[cmdline_include_nr++] = filename; -} - -static char **handle_switch_i(char *arg, char **next) -{ - if (*next && !strcmp(arg, "include")) - add_cmdline_include(*++next); - else if (*next && !strcmp(arg, "imacros")) - add_cmdline_include(*++next); - else if (*next && !strcmp(arg, "isystem")) { - char *path = *++next; - if (!path) - die("missing argument for -isystem option"); - add_pre_buffer("#add_isystem \"%s/\"\n", path); - } else if (*next && !strcmp(arg, "idirafter")) { - char *path = *++next; - if (!path) - die("missing argument for -idirafter option"); - add_pre_buffer("#add_dirafter \"%s/\"\n", path); - } - return next; -} - -static char **handle_switch_M(char *arg, char **next) -{ - if (!strcmp(arg, "MF") || !strcmp(arg,"MQ") || !strcmp(arg,"MT")) { - if (!*next) - die("missing argument for -%s option", arg); - return next + 1; - } - return next; -} - -static int handle_mcmodel(const char *opt, const char *arg, const struct flag *flag, int options) -{ - static const struct val_map cmodels[] = { - { "kernel", CMODEL_KERNEL }, - { "large", CMODEL_LARGE }, - { "medany", CMODEL_MEDANY }, - { "medium", CMODEL_MEDIUM }, - { "medlow", CMODEL_MEDLOW }, - { "small", CMODEL_SMALL }, - { "tiny", CMODEL_TINY }, - { }, - }; - return handle_subopt_val(opt, arg, cmodels, flag->flag); -} - -static int handle_mfloat_abi(const char *opt, const char *arg, const struct flag *flag, int options) { - static const struct val_map fp_abis[] = { - { "hard", FP_ABI_HARD }, - { "soft", FP_ABI_SOFT }, - { "softfp", FP_ABI_HYBRID }, - { "?" }, - }; - return handle_subopt_val(opt, arg, fp_abis, flag->flag); -} - -static char **handle_multiarch_dir(char *arg, char **next) -{ - multiarch_dir = *++next; - if (!multiarch_dir) - die("missing argument for -multiarch-dir option"); - return next; -} - -static const struct flag mflags[] = { - { "64", &arch_m64, NULL, OPT_VAL, ARCH_LP64 }, - { "32", &arch_m64, NULL, OPT_VAL, ARCH_LP32 }, - { "31", &arch_m64, NULL, OPT_VAL, ARCH_LP32 }, - { "16", &arch_m64, NULL, OPT_VAL, ARCH_LP32 }, - { "x32",&arch_m64, NULL, OPT_VAL, ARCH_X32 }, - { "size-llp64", &arch_m64, NULL, OPT_VAL, ARCH_LLP64 }, - { "size-long", &arch_msize_long }, - { "big-endian", &arch_big_endian, NULL }, - { "little-endian", &arch_big_endian, NULL, OPT_INVERSE }, - { "cmodel", &arch_cmodel, handle_mcmodel }, - { "float-abi", &arch_fp_abi, handle_mfloat_abi }, - { "hard-float", &arch_fp_abi, NULL, OPT_VAL, FP_ABI_HARD }, - { "soft-float", &arch_fp_abi, NULL, OPT_VAL, FP_ABI_SOFT }, - { } -}; - -static char **handle_switch_m(char *arg, char **next) -{ - if (!strcmp(arg, "multiarch-dir")) { - return handle_multiarch_dir(arg, next); - } else { - handle_switches(arg-1, arg+1, mflags); - } - - return next; -} - -static char **handle_nostdinc(char *arg, char **next) -{ - add_pre_buffer("#nostdinc\n"); - return next; -} - -static char **handle_switch_n(char *arg, char **next) -{ - if (!strcmp(arg, "nostdinc")) - return handle_nostdinc(arg, next); - - return next; -} - -static char **handle_switch_O(char *arg, char **next) -{ - int level = 1; - if (arg[1] >= '0' && arg[1] <= '9') - level = arg[1] - '0'; - optimize_level = level; - optimize_size = arg[1] == 's'; - return next; -} - -static char **handle_switch_o(char *arg, char **next) -{ - if (!strcmp(arg, "o")) { // "-o foo" - if (!*++next) - die("argument to '-o' is missing"); - outfile = *next; - } - // else "-ofoo" - - return next; -} - -static const struct flag pflags[] = { - { "pedantic", &Wpedantic, NULL, OPT_VAL, FLAG_ON }, - { } -}; - -static char **handle_switch_p(char *arg, char **next) -{ - handle_switches(arg-1, arg, pflags); - return next; -} - -static char **handle_switch_s(const char *arg, char **next) -{ - if ((arg = match_option(arg, "std="))) { - if (!strcmp(arg, "c89") || - !strcmp(arg, "iso9899:1990")) - standard = STANDARD_C89; - - else if (!strcmp(arg, "iso9899:199409")) - standard = STANDARD_C94; - - else if (!strcmp(arg, "c99") || - !strcmp(arg, "c9x") || - !strcmp(arg, "iso9899:1999") || - !strcmp(arg, "iso9899:199x")) - standard = STANDARD_C99; - - else if (!strcmp(arg, "gnu89")) - standard = STANDARD_GNU89; - - else if (!strcmp(arg, "gnu99") || !strcmp(arg, "gnu9x")) - standard = STANDARD_GNU99; - - else if (!strcmp(arg, "c11") || - !strcmp(arg, "c1x") || - !strcmp(arg, "iso9899:2011")) - standard = STANDARD_C11; - - else if (!strcmp(arg, "gnu11")) - standard = STANDARD_GNU11; - - else if (!strcmp(arg, "c17") || - !strcmp(arg, "c18") || - !strcmp(arg, "iso9899:2017") || - !strcmp(arg, "iso9899:2018")) - standard = STANDARD_C17; - else if (!strcmp(arg, "gnu17") || - !strcmp(arg, "gnu18")) - standard = STANDARD_GNU17; - - else - die("Unsupported C dialect"); - } - - return next; -} - -static char **handle_switch_U(char *arg, char **next) -{ - const char *name = arg + 1; - add_pre_buffer("#undef %s\n", name); - return next; -} - -static struct flag debugs[] = { - { "compound", &dbg_compound}, - { "dead", &dbg_dead}, - { "domtree", &dbg_domtree}, - { "entry", &dbg_entry}, - { "ir", &dbg_ir}, - { "postorder", &dbg_postorder}, - { } -}; - -static char **handle_switch_v(char *arg, char **next) -{ - char ** ret = handle_onoff_switch(arg, next, debugs); - if (ret) - return ret; - - // Unknown. - do { - verbose++; - } while (*++arg == 'v'); - return next; -} - -static void handle_switch_v_finalize(void) -{ - handle_onoff_switch_finalize(debugs); -} - -static const struct flag warnings[] = { - { "address", &Waddress }, - { "address-space", &Waddress_space }, - { "bitwise", &Wbitwise }, - { "bitwise-pointer", &Wbitwise_pointer}, - { "cast-from-as", &Wcast_from_as }, - { "cast-to-as", &Wcast_to_as }, - { "cast-truncate", &Wcast_truncate }, - { "constant-suffix", &Wconstant_suffix }, - { "constexpr-not-const", &Wconstexpr_not_const}, - { "context", &Wcontext }, - { "decl", &Wdecl }, - { "declaration-after-statement", &Wdeclarationafterstatement }, - { "default-bitfield-sign", &Wdefault_bitfield_sign }, - { "designated-init", &Wdesignated_init }, - { "do-while", &Wdo_while }, - { "enum-mismatch", &Wenum_mismatch }, - { "external-function-has-definition", &Wexternal_function_has_definition }, - { "implicit-int", &Wimplicit_int }, - { "init-cstring", &Winit_cstring }, - { "int-to-pointer-cast", &Wint_to_pointer_cast }, - { "memcpy-max-count", &Wmemcpy_max_count }, - { "non-pointer-null", &Wnon_pointer_null }, - { "newline-eof", &Wnewline_eof }, - { "old-initializer", &Wold_initializer }, - { "old-style-definition", &Wold_style_definition }, - { "one-bit-signed-bitfield", &Wone_bit_signed_bitfield }, - { "override-init", &Woverride_init }, - { "override-init-all", &Woverride_init_all }, - { "paren-string", &Wparen_string }, - { "pedantic", &Wpedantic }, - { "pointer-to-int-cast", &Wpointer_to_int_cast }, - { "ptr-subtraction-blows", &Wptr_subtraction_blows }, - { "return-void", &Wreturn_void }, - { "shadow", &Wshadow }, - { "shift-count-negative", &Wshift_count_negative }, - { "shift-count-overflow", &Wshift_count_overflow }, - { "sizeof-bool", &Wsizeof_bool }, - { "strict-prototypes", &Wstrict_prototypes }, - { "pointer-arith", &Wpointer_arith }, - { "sparse-error", &Wsparse_error }, - { "tautological-compare", &Wtautological_compare }, - { "transparent-union", &Wtransparent_union }, - { "typesign", &Wtypesign }, - { "undef", &Wundef }, - { "uninitialized", &Wuninitialized }, - { "universal-initializer", &Wuniversal_initializer }, - { "unknown-attribute", &Wunknown_attribute }, - { "vla", &Wvla }, - { } -}; - -static char **handle_switch_W(char *arg, char **next) -{ - char ** ret = handle_onoff_switch(arg, next, warnings); - if (ret) - return ret; - - if (!strcmp(arg, "Wsparse-all")) { - int i; - for (i = 0; warnings[i].name; i++) { - if (*warnings[i].flag != FLAG_FORCE_OFF) - *warnings[i].flag = FLAG_ON; - } - } - - // Unknown. - return next; -} - -static void handle_switch_W_finalize(void) -{ - handle_onoff_switch_finalize(warnings); - - /* default Wdeclarationafterstatement based on the C dialect */ - if (-1 == Wdeclarationafterstatement) { - switch (standard) { - case STANDARD_C89: - case STANDARD_C94: - Wdeclarationafterstatement = 1; - break; - default: - Wdeclarationafterstatement = 0; - break; - } - } -} - -static char **handle_switch_x(char *arg, char **next) -{ - if (!*++next) - die("missing argument for -x option"); - return next; -} - - -static char **handle_arch(char *arg, char **next) -{ - enum machine mach; - - if (*arg++ != '=') - die("missing argument for --arch option"); - - mach = target_parse(arg); - if (mach != MACH_UNKNOWN) - target_config(mach); - - return next; -} - -static char **handle_param(char *arg, char **next) -{ - char *value = NULL; - - /* For now just skip any '--param=*' or '--param *' */ - if (*arg == '\0') { - value = *++next; - } else if (isspace((unsigned char)*arg) || *arg == '=') { - value = ++arg; - } - - if (!value) - die("missing argument for --param option"); - - return next; -} - -static char **handle_version(char *arg, char **next) -{ - printf("%s\n", SPARSE_VERSION); - exit(0); -} - -struct switches { - const char *name; - char **(*fn)(char *, char **); - unsigned int prefix:1; -}; - -static char **handle_long_options(char *arg, char **next) -{ - static struct switches cmd[] = { - { "arch", handle_arch, 1 }, - { "param", handle_param, 1 }, - { "version", handle_version }, - { NULL, NULL } - }; - struct switches *s = cmd; - - while (s->name) { - int optlen = strlen(s->name); - if (!strncmp(s->name, arg, optlen + !s->prefix)) - return s->fn(arg + optlen, next); - s++; - } - return next; -} - -static char **handle_switch(char *arg, char **next) -{ - switch (*arg) { - case 'a': return handle_switch_a(arg, next); - case 'D': return handle_switch_D(arg, next); - case 'd': return handle_switch_d(arg, next); - case 'E': return handle_switch_E(arg, next); - case 'f': return handle_switch_f(arg, next); - case 'g': return handle_switch_g(arg, next); - case 'G': return handle_switch_G(arg, next); - case 'I': return handle_switch_I(arg, next); - case 'i': return handle_switch_i(arg, next); - case 'M': return handle_switch_M(arg, next); - case 'm': return handle_switch_m(arg, next); - case 'n': return handle_switch_n(arg, next); - case 'o': return handle_switch_o(arg, next); - case 'O': return handle_switch_O(arg, next); - case 'p': return handle_switch_p(arg, next); - case 's': return handle_switch_s(arg, next); - case 'U': return handle_switch_U(arg, next); - case 'v': return handle_switch_v(arg, next); - case 'W': return handle_switch_W(arg, next); - case 'x': return handle_switch_x(arg, next); - case '-': return handle_long_options(arg + 1, next); - default: - break; - } - - /* - * Ignore unknown command line options: - * they're probably gcc switches - */ - return next; -} - -static void handle_switch_finalize(void) -{ - handle_switch_v_finalize(); - handle_switch_W_finalize(); -} - //////////////////////////////////////////////////////////////////////////////// // Predefines diff --git a/lib.h b/lib.h index e938f18d..b47505f6 100644 --- a/lib.h +++ b/lib.h @@ -35,6 +35,7 @@ #include "ptrlist.h" #include "utils.h" #include "bits.h" +#include "options.h" #define DO_STRINGIFY(x) #x #define STRINGIFY(x) DO_STRINGIFY(x) @@ -43,14 +44,6 @@ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) #endif -extern int verbose, optimize_level, optimize_size, preprocessing; -extern int die_if_error; -extern int repeat_phase; -extern int do_output; -extern int gcc_major, gcc_minor, gcc_patchlevel; -extern unsigned int tabstop; - -extern const char *base_filename; extern unsigned int hexval(unsigned int c); @@ -138,114 +131,6 @@ 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_nostd(const char *name); -extern int preprocess_only; - -extern int Waddress; -extern int Waddress_space; -extern int Wbitwise; -extern int Wbitwise_pointer; -extern int Wcast_from_as; -extern int Wcast_to_as; -extern int Wcast_truncate; -extern int Wconstant_suffix; -extern int Wconstexpr_not_const; -extern int Wcontext; -extern int Wdecl; -extern int Wdeclarationafterstatement; -extern int Wdefault_bitfield_sign; -extern int Wdesignated_init; -extern int Wdo_while; -extern int Wenum_mismatch; -extern int Wexternal_function_has_definition; -extern int Wsparse_error; -extern int Wimplicit_int; -extern int Winit_cstring; -extern int Wint_to_pointer_cast; -extern int Wmemcpy_max_count; -extern int Wnewline_eof; -extern int Wnon_pointer_null; -extern int Wold_initializer; -extern int Wold_style_definition; -extern int Wone_bit_signed_bitfield; -extern int Woverride_init; -extern int Woverride_init_all; -extern int Woverride_init_whole_range; -extern int Wparen_string; -extern int Wpedantic; -extern int Wpointer_arith; -extern int Wpointer_to_int_cast; -extern int Wptr_subtraction_blows; -extern int Wreturn_void; -extern int Wshadow; -extern int Wshift_count_negative; -extern int Wshift_count_overflow; -extern int Wsizeof_bool; -extern int Wstrict_prototypes; -extern int Wtautological_compare; -extern int Wtransparent_union; -extern int Wtypesign; -extern int Wundef; -extern int Wuninitialized; -extern int Wuniversal_initializer; -extern int Wunknown_attribute; -extern int Wvla; - -extern int dump_macro_defs; -extern int dump_macros_only; - -extern int dbg_compound; -extern int dbg_dead; -extern int dbg_domtree; -extern int dbg_entry; -extern int dbg_ir; -extern int dbg_postorder; - -extern unsigned int fmax_warnings; -extern int fmem_report; -extern unsigned long fdump_ir; -extern int fhosted; -extern unsigned long long fmemcpy_max_count; -extern unsigned long fpasses; -extern int fpic; -extern int fpie; -extern int fshort_wchar; -extern int funsigned_char; - -extern int arch_msize_long; -extern int arch_m64; -extern int arch_big_endian; -extern int arch_fp_abi; -extern int arch_os; - -enum { - CMODEL_UNKNOWN, - CMODEL_KERNEL, - CMODEL_LARGE, - CMODEL_MEDANY, - CMODEL_MEDIUM, - CMODEL_MEDLOW, - CMODEL_PIC, - CMODEL_SMALL, - CMODEL_TINY, - CMODEL_LAST, -}; -extern int arch_cmodel; - -enum standard { - STANDARD_NONE, - STANDARD_GNU, - STANDARD_C89, - STANDARD_GNU89 = STANDARD_C89 | STANDARD_GNU, - STANDARD_C94, - STANDARD_GNU94 = STANDARD_C94 | STANDARD_GNU, - STANDARD_C99, - STANDARD_GNU99 = STANDARD_C99 | STANDARD_GNU, - STANDARD_C11, - STANDARD_GNU11 = STANDARD_C11 | STANDARD_GNU, - STANDARD_C17, - STANDARD_GNU17 = STANDARD_C17 | STANDARD_GNU, -}; -extern enum standard standard; extern void dump_macro_definitions(void); extern struct symbol_list *sparse_initialize(int argc, char **argv, struct string_list **files); diff --git a/options.c b/options.c new file mode 100644 index 00000000..092c8690 --- /dev/null +++ b/options.c @@ -0,0 +1,998 @@ +// SPDX-License-Identifier: MIT +/* + * 'sparse' library helper routines. + * + * Copyright (C) 2003 Transmeta Corp. + * 2003-2004 Linus Torvalds + * 2017-2020 Luc Van Oostenryck + */ + +#include "options.h" +#include "lib.h" +#include "machine.h" +#include "target.h" +#include "version.h" +#include +#include +#include +#include + + +int verbose, optimize_level, optimize_size, preprocessing; +int die_if_error = 0; +int has_error = 0; +int do_output = 1; + +#ifndef __GNUC__ +# define __GNUC__ 2 +# define __GNUC_MINOR__ 95 +# define __GNUC_PATCHLEVEL__ 0 +#endif + +int gcc_major = __GNUC__; +int gcc_minor = __GNUC_MINOR__; +int gcc_patchlevel = __GNUC_PATCHLEVEL__; + +const char *base_filename; +const char *diag_prefix = ""; +const char *gcc_base_dir = GCC_BASE; +const char *multiarch_dir = MULTIARCH_TRIPLET; +const char *outfile = NULL; + +enum flag_type { + FLAG_OFF, + FLAG_ON, + FLAG_FORCE_OFF +}; + +int Waddress = 0; +int Waddress_space = 1; +int Wbitwise = 1; +int Wbitwise_pointer = 0; +int Wcast_from_as = 0; +int Wcast_to_as = 0; +int Wcast_truncate = 1; +int Wconstant_suffix = 0; +int Wconstexpr_not_const = 0; +int Wcontext = 1; +int Wdecl = 1; +int Wdeclarationafterstatement = -1; +int Wdefault_bitfield_sign = 0; +int Wdesignated_init = 1; +int Wdo_while = 0; +int Wimplicit_int = 1; +int Winit_cstring = 0; +int Wint_to_pointer_cast = 1; +int Wenum_mismatch = 1; +int Wexternal_function_has_definition = 1; +int Wmemcpy_max_count = 1; +int Wnewline_eof = 1; +int Wnon_pointer_null = 1; +int Wold_initializer = 1; +int Wold_style_definition = 1; +int Wone_bit_signed_bitfield = 1; +int Woverride_init = 1; +int Woverride_init_all = 0; +int Woverride_init_whole_range = 0; +int Wparen_string = 0; +int Wpedantic = 0; +int Wpointer_arith = 0; +int Wpointer_to_int_cast = 1; +int Wptr_subtraction_blows = 0; +int Wreturn_void = 0; +int Wshadow = 0; +int Wshift_count_negative = 1; +int Wshift_count_overflow = 1; +int Wsizeof_bool = 0; +int Wsparse_error = FLAG_FORCE_OFF; +int Wstrict_prototypes = 1; +int Wtautological_compare = 0; +int Wtransparent_union = 0; +int Wtypesign = 0; +int Wundef = 0; +int Wuninitialized = 1; +int Wuniversal_initializer = 0; +int Wunknown_attribute = 0; +int Wvla = 1; + +int dump_macro_defs = 0; +int dump_macros_only = 0; + +int dbg_compound = 0; +int dbg_dead = 0; +int dbg_domtree = 0; +int dbg_entry = 0; +int dbg_ir = 0; +int dbg_postorder = 0; + +unsigned long fdump_ir; +int fhosted = 1; +unsigned int fmax_warnings = 100; +int fmem_report = 0; +unsigned long long fmemcpy_max_count = 100000; +unsigned long fpasses = ~0UL; +int fpic = 0; +int fpie = 0; +int fshort_wchar = 0; +int funsigned_char = 0; + +int preprocess_only; + +enum standard standard = STANDARD_GNU89; + +int arch_msize_long = 0; +int arch_m64 = ARCH_M64_DEFAULT; +int arch_big_endian = ARCH_BIG_ENDIAN; +int arch_fp_abi = FP_ABI_NATIVE; +int arch_os = OS_NATIVE; +int arch_cmodel = CMODEL_UNKNOWN; + + +#define CMDLINE_INCLUDE 20 +int cmdline_include_nr = 0; +char *cmdline_include[CMDLINE_INCLUDE]; + +//////////////////////////////////////////////////////////////////////////////// +// Helpers for option parsing + +static const char *match_option(const char *arg, const char *prefix) +{ + unsigned int n = strlen(prefix); + if (strncmp(arg, prefix, n) == 0) + return arg + n; + return NULL; +} + + +struct val_map { + const char *name; + int val; +}; + +static int handle_subopt_val(const char *opt, const char *arg, const struct val_map *map, int *flag) +{ + const char *name; + + if (*arg++ != '=') + die("missing argument for option '%s'", opt); + for (;(name = map->name); map++) { + if (strcmp(name, arg) == 0 || strcmp(name, "*") == 0) { + *flag = map->val; + return 1; + } + if (strcmp(name, "?") == 0) + die("invalid argument '%s' in option '%s'", arg, opt); + } + return 0; +} + + +struct mask_map { + const char *name; + unsigned long mask; +}; + +static int apply_mask(unsigned long *val, const char *str, unsigned len, const struct mask_map *map, int neg) +{ + const char *name; + + for (;(name = map->name); map++) { + if (!strncmp(name, str, len) && !name[len]) { + if (neg == 0) + *val |= map->mask; + else + *val &= ~map->mask; + return 0; + } + } + return 1; +} + +static int handle_suboption_mask(const char *arg, const char *opt, const struct mask_map *map, unsigned long *flag) +{ + if (*opt == '\0') { + apply_mask(flag, "", 0, map, 0); + return 1; + } + if (*opt++ != '=') + return 0; + while (1) { + unsigned int len = strcspn(opt, ",+"); + int neg = 0; + if (len == 0) + goto end; + if (!strncmp(opt, "no-", 3)) { + opt += 3; + len -= 3; + neg = 1; + } + if (apply_mask(flag, opt, len, map, neg)) + die("error: wrong option '%.*s' for \'%s\'", len, opt, arg); + +end: + opt += len; + if (*opt++ == '\0') + break; + } + return 1; +} + + +#define OPT_INVERSE 1 +#define OPT_VAL 2 +struct flag { + const char *name; + int *flag; + int (*fun)(const char *arg, const char *opt, const struct flag *, int options); + unsigned long mask; + int val; +}; + +static int handle_switches(const char *ori, const char *opt, const struct flag *flags) +{ + const char *arg = opt; + int val = 1; + + // Prefixe "no-" mean to turn flag off. + if (strncmp(arg, "no-", 3) == 0) { + arg += 3; + val = 0; + } + + for (; flags->name; flags++) { + const char *opt = match_option(arg, flags->name); + int rc; + + if (!opt) + continue; + + if (flags->fun) { + int options = 0; + if (!val) + options |= OPT_INVERSE; + if ((rc = flags->fun(ori, opt, flags, options))) + return rc; + } + + // boolean flag + if (opt[0] == '\0' && flags->flag) { + if (flags->mask & OPT_VAL) + val = flags->val; + if (flags->mask & OPT_INVERSE) + val = !val; + *flags->flag = val; + return 1; + } + } + + // not handled + return 0; +} + +static char **handle_onoff_switch(char *arg, char **next, const struct flag flags[]) +{ + int flag = FLAG_ON; + char *p = arg + 1; + unsigned i; + + // Prefixes "no" and "no-" mean to turn warning off. + if (p[0] == 'n' && p[1] == 'o') { + p += 2; + if (p[0] == '-') + p++; + flag = FLAG_FORCE_OFF; + } + + for (i = 0; flags[i].name; i++) { + if (!strcmp(p,flags[i].name)) { + *flags[i].flag = flag; + return next; + } + } + + // Unknown. + return NULL; +} + +static void handle_onoff_switch_finalize(const struct flag flags[]) +{ + unsigned i; + + for (i = 0; flags[i].name; i++) { + if (*flags[i].flag == FLAG_FORCE_OFF) + *flags[i].flag = FLAG_OFF; + } +} + +static int handle_switch_setval(const char *arg, const char *opt, const struct flag *flag, int options) +{ + *(flag->flag) = flag->mask; + return 1; +} + + +#define OPTNUM_ZERO_IS_INF 1 +#define OPTNUM_UNLIMITED 2 + +#define OPT_NUMERIC(NAME, TYPE, FUNCTION) \ +static int opt_##NAME(const char *arg, const char *opt, TYPE *ptr, int flag) \ +{ \ + char *end; \ + TYPE val; \ + \ + val = FUNCTION(opt, &end, 0); \ + if (*end != '\0' || end == opt) { \ + if ((flag & OPTNUM_UNLIMITED) && !strcmp(opt, "unlimited")) \ + val = ~val; \ + else \ + die("error: wrong argument to \'%s\'", arg); \ + } \ + if ((flag & OPTNUM_ZERO_IS_INF) && val == 0) \ + val = ~val; \ + *ptr = val; \ + return 1; \ +} + +OPT_NUMERIC(ullong, unsigned long long, strtoull) +OPT_NUMERIC(uint, unsigned int, strtoul) + +//////////////////////////////////////////////////////////////////////////////// +// Option parsing + +static char **handle_switch_a(char *arg, char **next) +{ + if (!strcmp(arg, "ansi")) + standard = STANDARD_C89; + + return next; +} + +static char **handle_switch_D(char *arg, char **next) +{ + const char *name = arg + 1; + const char *value = "1"; + + if (!*name) { + arg = *++next; + if (!arg) + die("argument to `-D' is missing"); + name = arg; + } + + for (;;arg++) { + char c; + c = *arg; + if (!c) + break; + if (c == '=') { + *arg = '\0'; + value = arg + 1; + break; + } + } + add_pre_buffer("#define %s %s\n", name, value); + return next; +} + +static char **handle_switch_d(char *arg, char **next) +{ + char *arg_char = arg + 1; + + /* + * -d, where is a sequence of characters, not preceded + * by a space. If you specify characters whose behaviour conflicts, + * the result is undefined. + */ + while (*arg_char) { + switch (*arg_char) { + case 'M': /* dump just the macro definitions */ + dump_macros_only = 1; + dump_macro_defs = 0; + break; + case 'D': /* like 'M', but also output pre-processed text */ + dump_macro_defs = 1; + dump_macros_only = 0; + break; + case 'N': /* like 'D', but only output macro names not bodies */ + break; + case 'I': /* like 'D', but also output #include directives */ + break; + case 'U': /* like 'D', but only output expanded macros */ + break; + } + arg_char++; + } + return next; +} + +static char **handle_switch_E(char *arg, char **next) +{ + if (arg[1] == '\0') + preprocess_only = 1; + return next; +} + +static int handle_ftabstop(const char *arg, const char *opt, const struct flag *flag, int options) +{ + unsigned long val; + char *end; + + if (*opt == '\0') + die("error: missing argument to \"%s\"", arg); + + /* we silently ignore silly values */ + val = strtoul(opt, &end, 10); + if (*end == '\0' && 1 <= val && val <= 100) + tabstop = val; + + return 1; +} + +static int handle_fpasses(const char *arg, const char *opt, const struct flag *flag, int options) +{ + unsigned long mask; + + mask = flag->mask; + if (*opt == '\0') { + if (options & OPT_INVERSE) + fpasses &= ~mask; + else + fpasses |= mask; + return 1; + } + if (options & OPT_INVERSE) + return 0; + if (!strcmp(opt, "-enable")) { + fpasses |= mask; + return 1; + } + if (!strcmp(opt, "-disable")) { + fpasses &= ~mask; + return 1; + } + if (!strcmp(opt, "=last")) { + // clear everything above + mask |= mask - 1; + fpasses &= mask; + return 1; + } + return 0; +} + +static int handle_fdiagnostic_prefix(const char *arg, const char *opt, const struct flag *flag, int options) +{ + switch (*opt) { + case '\0': + diag_prefix = "sparse: "; + return 1; + case '=': + diag_prefix = xasprintf("%s: ", opt+1); + return 1; + default: + return 0; + } +} + +static int handle_fdump_ir(const char *arg, const char *opt, const struct flag *flag, int options) +{ + static const struct mask_map dump_ir_options[] = { + { "", PASS_LINEARIZE }, + { "linearize", PASS_LINEARIZE }, + { "mem2reg", PASS_MEM2REG }, + { "final", PASS_FINAL }, + { }, + }; + + return handle_suboption_mask(arg, opt, dump_ir_options, &fdump_ir); +} + +static int handle_fmemcpy_max_count(const char *arg, const char *opt, const struct flag *flag, int options) +{ + opt_ullong(arg, opt, &fmemcpy_max_count, OPTNUM_ZERO_IS_INF|OPTNUM_UNLIMITED); + return 1; +} + +static int handle_fmax_warnings(const char *arg, const char *opt, const struct flag *flag, int options) +{ + opt_uint(arg, opt, &fmax_warnings, OPTNUM_UNLIMITED); + return 1; +} + +static struct flag fflags[] = { + { "diagnostic-prefix", NULL, handle_fdiagnostic_prefix }, + { "dump-ir", NULL, handle_fdump_ir }, + { "freestanding", &fhosted, NULL, OPT_INVERSE }, + { "hosted", &fhosted }, + { "linearize", NULL, handle_fpasses, PASS_LINEARIZE }, + { "max-warnings=", NULL, handle_fmax_warnings }, + { "mem-report", &fmem_report }, + { "memcpy-max-count=", NULL, handle_fmemcpy_max_count }, + { "tabstop=", NULL, handle_ftabstop }, + { "mem2reg", NULL, handle_fpasses, PASS_MEM2REG }, + { "optim", NULL, handle_fpasses, PASS_OPTIM }, + { "pic", &fpic, handle_switch_setval, 1 }, + { "PIC", &fpic, handle_switch_setval, 2 }, + { "pie", &fpie, handle_switch_setval, 1 }, + { "PIE", &fpie, handle_switch_setval, 2 }, + { "signed-char", &funsigned_char, NULL, OPT_INVERSE }, + { "short-wchar", &fshort_wchar }, + { "unsigned-char", &funsigned_char, NULL, }, + { }, +}; + +static char **handle_switch_f(char *arg, char **next) +{ + if (handle_switches(arg-1, arg+1, fflags)) + return next; + + return next; +} + +static char **handle_switch_G(char *arg, char **next) +{ + if (!strcmp(arg, "G") && *next) + return next + 1; // "-G 0" + else + return next; // "-G0" or (bogus) terminal "-G" +} + +static char **handle_base_dir(char *arg, char **next) +{ + gcc_base_dir = *++next; + if (!gcc_base_dir) + die("missing argument for -gcc-base-dir option"); + return next; +} + +static char **handle_switch_g(char *arg, char **next) +{ + if (!strcmp(arg, "gcc-base-dir")) + return handle_base_dir(arg, next); + + return next; +} + +static char **handle_switch_I(char *arg, char **next) +{ + char *path = arg+1; + + switch (arg[1]) { + case '-': + add_pre_buffer("#split_include\n"); + break; + + case '\0': /* Plain "-I" */ + path = *++next; + if (!path) + die("missing argument for -I option"); + /* Fall through */ + default: + add_pre_buffer("#add_include \"%s/\"\n", path); + } + return next; +} + +static void add_cmdline_include(char *filename) +{ + if (cmdline_include_nr >= CMDLINE_INCLUDE) + die("too many include files for %s\n", filename); + cmdline_include[cmdline_include_nr++] = filename; +} + +static char **handle_switch_i(char *arg, char **next) +{ + if (*next && !strcmp(arg, "include")) + add_cmdline_include(*++next); + else if (*next && !strcmp(arg, "imacros")) + add_cmdline_include(*++next); + else if (*next && !strcmp(arg, "isystem")) { + char *path = *++next; + if (!path) + die("missing argument for -isystem option"); + add_pre_buffer("#add_isystem \"%s/\"\n", path); + } else if (*next && !strcmp(arg, "idirafter")) { + char *path = *++next; + if (!path) + die("missing argument for -idirafter option"); + add_pre_buffer("#add_dirafter \"%s/\"\n", path); + } + return next; +} + +static char **handle_switch_M(char *arg, char **next) +{ + if (!strcmp(arg, "MF") || !strcmp(arg,"MQ") || !strcmp(arg,"MT")) { + if (!*next) + die("missing argument for -%s option", arg); + return next + 1; + } + return next; +} + +static int handle_mcmodel(const char *opt, const char *arg, const struct flag *flag, int options) +{ + static const struct val_map cmodels[] = { + { "kernel", CMODEL_KERNEL }, + { "large", CMODEL_LARGE }, + { "medany", CMODEL_MEDANY }, + { "medium", CMODEL_MEDIUM }, + { "medlow", CMODEL_MEDLOW }, + { "small", CMODEL_SMALL }, + { "tiny", CMODEL_TINY }, + { }, + }; + return handle_subopt_val(opt, arg, cmodels, flag->flag); +} + +static int handle_mfloat_abi(const char *opt, const char *arg, const struct flag *flag, int options) { + static const struct val_map fp_abis[] = { + { "hard", FP_ABI_HARD }, + { "soft", FP_ABI_SOFT }, + { "softfp", FP_ABI_HYBRID }, + { "?" }, + }; + return handle_subopt_val(opt, arg, fp_abis, flag->flag); +} + +static char **handle_multiarch_dir(char *arg, char **next) +{ + multiarch_dir = *++next; + if (!multiarch_dir) + die("missing argument for -multiarch-dir option"); + return next; +} + +static const struct flag mflags[] = { + { "64", &arch_m64, NULL, OPT_VAL, ARCH_LP64 }, + { "32", &arch_m64, NULL, OPT_VAL, ARCH_LP32 }, + { "31", &arch_m64, NULL, OPT_VAL, ARCH_LP32 }, + { "16", &arch_m64, NULL, OPT_VAL, ARCH_LP32 }, + { "x32",&arch_m64, NULL, OPT_VAL, ARCH_X32 }, + { "size-llp64", &arch_m64, NULL, OPT_VAL, ARCH_LLP64 }, + { "size-long", &arch_msize_long }, + { "big-endian", &arch_big_endian, NULL }, + { "little-endian", &arch_big_endian, NULL, OPT_INVERSE }, + { "cmodel", &arch_cmodel, handle_mcmodel }, + { "float-abi", &arch_fp_abi, handle_mfloat_abi }, + { "hard-float", &arch_fp_abi, NULL, OPT_VAL, FP_ABI_HARD }, + { "soft-float", &arch_fp_abi, NULL, OPT_VAL, FP_ABI_SOFT }, + { } +}; + +static char **handle_switch_m(char *arg, char **next) +{ + if (!strcmp(arg, "multiarch-dir")) { + return handle_multiarch_dir(arg, next); + } else { + handle_switches(arg-1, arg+1, mflags); + } + + return next; +} + +static char **handle_nostdinc(char *arg, char **next) +{ + add_pre_buffer("#nostdinc\n"); + return next; +} + +static char **handle_switch_n(char *arg, char **next) +{ + if (!strcmp(arg, "nostdinc")) + return handle_nostdinc(arg, next); + + return next; +} + +static char **handle_switch_O(char *arg, char **next) +{ + int level = 1; + if (arg[1] >= '0' && arg[1] <= '9') + level = arg[1] - '0'; + optimize_level = level; + optimize_size = arg[1] == 's'; + return next; +} + +static char **handle_switch_o(char *arg, char **next) +{ + if (!strcmp(arg, "o")) { // "-o foo" + if (!*++next) + die("argument to '-o' is missing"); + outfile = *next; + } + // else "-ofoo" + + return next; +} + +static const struct flag pflags[] = { + { "pedantic", &Wpedantic, NULL, OPT_VAL, FLAG_ON }, + { } +}; + +static char **handle_switch_p(char *arg, char **next) +{ + handle_switches(arg-1, arg, pflags); + return next; +} + +static char **handle_switch_s(const char *arg, char **next) +{ + if ((arg = match_option(arg, "std="))) { + if (!strcmp(arg, "c89") || + !strcmp(arg, "iso9899:1990")) + standard = STANDARD_C89; + + else if (!strcmp(arg, "iso9899:199409")) + standard = STANDARD_C94; + + else if (!strcmp(arg, "c99") || + !strcmp(arg, "c9x") || + !strcmp(arg, "iso9899:1999") || + !strcmp(arg, "iso9899:199x")) + standard = STANDARD_C99; + + else if (!strcmp(arg, "gnu89")) + standard = STANDARD_GNU89; + + else if (!strcmp(arg, "gnu99") || !strcmp(arg, "gnu9x")) + standard = STANDARD_GNU99; + + else if (!strcmp(arg, "c11") || + !strcmp(arg, "c1x") || + !strcmp(arg, "iso9899:2011")) + standard = STANDARD_C11; + + else if (!strcmp(arg, "gnu11")) + standard = STANDARD_GNU11; + + else if (!strcmp(arg, "c17") || + !strcmp(arg, "c18") || + !strcmp(arg, "iso9899:2017") || + !strcmp(arg, "iso9899:2018")) + standard = STANDARD_C17; + else if (!strcmp(arg, "gnu17") || + !strcmp(arg, "gnu18")) + standard = STANDARD_GNU17; + + else + die("Unsupported C dialect"); + } + + return next; +} + +static char **handle_switch_U(char *arg, char **next) +{ + const char *name = arg + 1; + add_pre_buffer("#undef %s\n", name); + return next; +} + +static struct flag debugs[] = { + { "compound", &dbg_compound}, + { "dead", &dbg_dead}, + { "domtree", &dbg_domtree}, + { "entry", &dbg_entry}, + { "ir", &dbg_ir}, + { "postorder", &dbg_postorder}, + { } +}; + +static char **handle_switch_v(char *arg, char **next) +{ + char ** ret = handle_onoff_switch(arg, next, debugs); + if (ret) + return ret; + + // Unknown. + do { + verbose++; + } while (*++arg == 'v'); + return next; +} + +static void handle_switch_v_finalize(void) +{ + handle_onoff_switch_finalize(debugs); +} + +static const struct flag warnings[] = { + { "address", &Waddress }, + { "address-space", &Waddress_space }, + { "bitwise", &Wbitwise }, + { "bitwise-pointer", &Wbitwise_pointer}, + { "cast-from-as", &Wcast_from_as }, + { "cast-to-as", &Wcast_to_as }, + { "cast-truncate", &Wcast_truncate }, + { "constant-suffix", &Wconstant_suffix }, + { "constexpr-not-const", &Wconstexpr_not_const}, + { "context", &Wcontext }, + { "decl", &Wdecl }, + { "declaration-after-statement", &Wdeclarationafterstatement }, + { "default-bitfield-sign", &Wdefault_bitfield_sign }, + { "designated-init", &Wdesignated_init }, + { "do-while", &Wdo_while }, + { "enum-mismatch", &Wenum_mismatch }, + { "external-function-has-definition", &Wexternal_function_has_definition }, + { "implicit-int", &Wimplicit_int }, + { "init-cstring", &Winit_cstring }, + { "int-to-pointer-cast", &Wint_to_pointer_cast }, + { "memcpy-max-count", &Wmemcpy_max_count }, + { "non-pointer-null", &Wnon_pointer_null }, + { "newline-eof", &Wnewline_eof }, + { "old-initializer", &Wold_initializer }, + { "old-style-definition", &Wold_style_definition }, + { "one-bit-signed-bitfield", &Wone_bit_signed_bitfield }, + { "override-init", &Woverride_init }, + { "override-init-all", &Woverride_init_all }, + { "paren-string", &Wparen_string }, + { "pedantic", &Wpedantic }, + { "pointer-to-int-cast", &Wpointer_to_int_cast }, + { "ptr-subtraction-blows", &Wptr_subtraction_blows }, + { "return-void", &Wreturn_void }, + { "shadow", &Wshadow }, + { "shift-count-negative", &Wshift_count_negative }, + { "shift-count-overflow", &Wshift_count_overflow }, + { "sizeof-bool", &Wsizeof_bool }, + { "strict-prototypes", &Wstrict_prototypes }, + { "pointer-arith", &Wpointer_arith }, + { "sparse-error", &Wsparse_error }, + { "tautological-compare", &Wtautological_compare }, + { "transparent-union", &Wtransparent_union }, + { "typesign", &Wtypesign }, + { "undef", &Wundef }, + { "uninitialized", &Wuninitialized }, + { "universal-initializer", &Wuniversal_initializer }, + { "unknown-attribute", &Wunknown_attribute }, + { "vla", &Wvla }, + { } +}; + +static char **handle_switch_W(char *arg, char **next) +{ + char ** ret = handle_onoff_switch(arg, next, warnings); + if (ret) + return ret; + + if (!strcmp(arg, "Wsparse-all")) { + int i; + for (i = 0; warnings[i].name; i++) { + if (*warnings[i].flag != FLAG_FORCE_OFF) + *warnings[i].flag = FLAG_ON; + } + } + + // Unknown. + return next; +} + +static void handle_switch_W_finalize(void) +{ + handle_onoff_switch_finalize(warnings); + + /* default Wdeclarationafterstatement based on the C dialect */ + if (-1 == Wdeclarationafterstatement) { + switch (standard) { + case STANDARD_C89: + case STANDARD_C94: + Wdeclarationafterstatement = 1; + break; + default: + Wdeclarationafterstatement = 0; + break; + } + } +} + +static char **handle_switch_x(char *arg, char **next) +{ + if (!*++next) + die("missing argument for -x option"); + return next; +} + + +static char **handle_arch(char *arg, char **next) +{ + enum machine mach; + + if (*arg++ != '=') + die("missing argument for --arch option"); + + mach = target_parse(arg); + if (mach != MACH_UNKNOWN) + target_config(mach); + + return next; +} + +static char **handle_param(char *arg, char **next) +{ + char *value = NULL; + + /* For now just skip any '--param=*' or '--param *' */ + if (*arg == '\0') { + value = *++next; + } else if (isspace((unsigned char)*arg) || *arg == '=') { + value = ++arg; + } + + if (!value) + die("missing argument for --param option"); + + return next; +} + +static char **handle_version(char *arg, char **next) +{ + printf("%s\n", SPARSE_VERSION); + exit(0); +} + +struct switches { + const char *name; + char **(*fn)(char *, char **); + unsigned int prefix:1; +}; + +static char **handle_long_options(char *arg, char **next) +{ + static struct switches cmd[] = { + { "arch", handle_arch, 1 }, + { "param", handle_param, 1 }, + { "version", handle_version }, + { NULL, NULL } + }; + struct switches *s = cmd; + + while (s->name) { + int optlen = strlen(s->name); + if (!strncmp(s->name, arg, optlen + !s->prefix)) + return s->fn(arg + optlen, next); + s++; + } + return next; +} + +char **handle_switch(char *arg, char **next) +{ + switch (*arg) { + case 'a': return handle_switch_a(arg, next); + case 'D': return handle_switch_D(arg, next); + case 'd': return handle_switch_d(arg, next); + case 'E': return handle_switch_E(arg, next); + case 'f': return handle_switch_f(arg, next); + case 'g': return handle_switch_g(arg, next); + case 'G': return handle_switch_G(arg, next); + case 'I': return handle_switch_I(arg, next); + case 'i': return handle_switch_i(arg, next); + case 'M': return handle_switch_M(arg, next); + case 'm': return handle_switch_m(arg, next); + case 'n': return handle_switch_n(arg, next); + case 'o': return handle_switch_o(arg, next); + case 'O': return handle_switch_O(arg, next); + case 'p': return handle_switch_p(arg, next); + case 's': return handle_switch_s(arg, next); + case 'U': return handle_switch_U(arg, next); + case 'v': return handle_switch_v(arg, next); + case 'W': return handle_switch_W(arg, next); + case 'x': return handle_switch_x(arg, next); + case '-': return handle_long_options(arg + 1, next); + default: + break; + } + + /* + * Ignore unknown command line options: + * they're probably gcc switches + */ + return next; +} + +void handle_switch_finalize(void) +{ + handle_switch_v_finalize(); + handle_switch_W_finalize(); +} diff --git a/options.h b/options.h new file mode 100644 index 00000000..52d1106e --- /dev/null +++ b/options.h @@ -0,0 +1,132 @@ +#ifndef OPTIONS_H +#define OPTIONS_H + +extern int verbose, optimize_level, optimize_size, preprocessing; +extern int die_if_error; +extern int repeat_phase; +extern int do_output; +extern int gcc_major, gcc_minor, gcc_patchlevel; +extern unsigned int tabstop; + +extern const char *base_filename; +extern const char *diag_prefix; +extern const char *gcc_base_dir; +extern const char *multiarch_dir; +extern const char *outfile; +extern int cmdline_include_nr; +extern char *cmdline_include[]; + +extern char **handle_switch(char *arg, char **next); +extern void handle_switch_finalize(void); + + +extern int preprocess_only; + +extern int Waddress; +extern int Waddress_space; +extern int Wbitwise; +extern int Wbitwise_pointer; +extern int Wcast_from_as; +extern int Wcast_to_as; +extern int Wcast_truncate; +extern int Wconstant_suffix; +extern int Wconstexpr_not_const; +extern int Wcontext; +extern int Wdecl; +extern int Wdeclarationafterstatement; +extern int Wdefault_bitfield_sign; +extern int Wdesignated_init; +extern int Wdo_while; +extern int Wenum_mismatch; +extern int Wexternal_function_has_definition; +extern int Wsparse_error; +extern int Wimplicit_int; +extern int Winit_cstring; +extern int Wint_to_pointer_cast; +extern int Wmemcpy_max_count; +extern int Wnewline_eof; +extern int Wnon_pointer_null; +extern int Wold_initializer; +extern int Wold_style_definition; +extern int Wone_bit_signed_bitfield; +extern int Woverride_init; +extern int Woverride_init_all; +extern int Woverride_init_whole_range; +extern int Wparen_string; +extern int Wpedantic; +extern int Wpointer_arith; +extern int Wpointer_to_int_cast; +extern int Wptr_subtraction_blows; +extern int Wreturn_void; +extern int Wshadow; +extern int Wshift_count_negative; +extern int Wshift_count_overflow; +extern int Wsizeof_bool; +extern int Wstrict_prototypes; +extern int Wtautological_compare; +extern int Wtransparent_union; +extern int Wtypesign; +extern int Wundef; +extern int Wuninitialized; +extern int Wuniversal_initializer; +extern int Wunknown_attribute; +extern int Wvla; + +extern int dump_macro_defs; +extern int dump_macros_only; + +extern int dbg_compound; +extern int dbg_dead; +extern int dbg_domtree; +extern int dbg_entry; +extern int dbg_ir; +extern int dbg_postorder; + +extern unsigned int fmax_warnings; +extern int fmem_report; +extern unsigned long fdump_ir; +extern int fhosted; +extern unsigned long long fmemcpy_max_count; +extern unsigned long fpasses; +extern int fpic; +extern int fpie; +extern int fshort_wchar; +extern int funsigned_char; + +extern int arch_msize_long; +extern int arch_m64; +extern int arch_big_endian; +extern int arch_fp_abi; +extern int arch_os; + +enum { + CMODEL_UNKNOWN, + CMODEL_KERNEL, + CMODEL_LARGE, + CMODEL_MEDANY, + CMODEL_MEDIUM, + CMODEL_MEDLOW, + CMODEL_PIC, + CMODEL_SMALL, + CMODEL_TINY, + CMODEL_LAST, +}; +extern int arch_cmodel; + +enum standard { + STANDARD_NONE, + STANDARD_GNU, + STANDARD_C89, + STANDARD_GNU89 = STANDARD_C89 | STANDARD_GNU, + STANDARD_C94, + STANDARD_GNU94 = STANDARD_C94 | STANDARD_GNU, + STANDARD_C99, + STANDARD_GNU99 = STANDARD_C99 | STANDARD_GNU, + STANDARD_C11, + STANDARD_GNU11 = STANDARD_C11 | STANDARD_GNU, + STANDARD_C17, + STANDARD_GNU17 = STANDARD_C17 | STANDARD_GNU, +}; +extern enum standard standard; + +#endif -- cgit 1.2.3-korg From 50565794dbb3cbc75c0dcdba6155521f4b25cb23 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Thu, 2 Jul 2020 22:47:36 +0200 Subject: options: keep the options sorted The declarations and definitions of the variables corresponding to the options half-sorted half-unsorted. Sort them a little more. Signed-off-by: Luc Van Oostenryck --- options.c | 98 ++++++++++++++++++++++---------------------- options.h | 137 ++++++++++++++++++++++++++++++++------------------------------ 2 files changed, 120 insertions(+), 115 deletions(-) diff --git a/options.c b/options.c index 092c8690..9f05bdf9 100644 --- a/options.c +++ b/options.c @@ -18,20 +18,33 @@ #include -int verbose, optimize_level, optimize_size, preprocessing; -int die_if_error = 0; -int has_error = 0; -int do_output = 1; - #ifndef __GNUC__ # define __GNUC__ 2 # define __GNUC_MINOR__ 95 # define __GNUC_PATCHLEVEL__ 0 #endif +enum flag_type { + FLAG_OFF, + FLAG_ON, + FLAG_FORCE_OFF +}; + +int die_if_error = 0; +int do_output = 1; int gcc_major = __GNUC__; int gcc_minor = __GNUC_MINOR__; int gcc_patchlevel = __GNUC_PATCHLEVEL__; +int has_error = 0; +int optimize_level; +int optimize_size; +int preprocess_only; +int preprocessing; +int verbose; + +#define CMDLINE_INCLUDE 20 +int cmdline_include_nr = 0; +char *cmdline_include[CMDLINE_INCLUDE]; const char *base_filename; const char *diag_prefix = ""; @@ -39,11 +52,35 @@ const char *gcc_base_dir = GCC_BASE; const char *multiarch_dir = MULTIARCH_TRIPLET; const char *outfile = NULL; -enum flag_type { - FLAG_OFF, - FLAG_ON, - FLAG_FORCE_OFF -}; +enum standard standard = STANDARD_GNU89; + +int arch_big_endian = ARCH_BIG_ENDIAN; +int arch_cmodel = CMODEL_UNKNOWN; +int arch_fp_abi = FP_ABI_NATIVE; +int arch_m64 = ARCH_M64_DEFAULT; +int arch_msize_long = 0; +int arch_os = OS_NATIVE; + +int dbg_compound = 0; +int dbg_dead = 0; +int dbg_domtree = 0; +int dbg_entry = 0; +int dbg_ir = 0; +int dbg_postorder = 0; + +int dump_macro_defs = 0; +int dump_macros_only = 0; + +unsigned long fdump_ir; +int fhosted = 1; +unsigned int fmax_warnings = 100; +int fmem_report = 0; +unsigned long long fmemcpy_max_count = 100000; +unsigned long fpasses = ~0UL; +int fpic = 0; +int fpie = 0; +int fshort_wchar = 0; +int funsigned_char = 0; int Waddress = 0; int Waddress_space = 1; @@ -60,11 +97,11 @@ int Wdeclarationafterstatement = -1; int Wdefault_bitfield_sign = 0; int Wdesignated_init = 1; int Wdo_while = 0; +int Wenum_mismatch = 1; +int Wexternal_function_has_definition = 1; int Wimplicit_int = 1; int Winit_cstring = 0; int Wint_to_pointer_cast = 1; -int Wenum_mismatch = 1; -int Wexternal_function_has_definition = 1; int Wmemcpy_max_count = 1; int Wnewline_eof = 1; int Wnon_pointer_null = 1; @@ -95,43 +132,6 @@ int Wuniversal_initializer = 0; int Wunknown_attribute = 0; int Wvla = 1; -int dump_macro_defs = 0; -int dump_macros_only = 0; - -int dbg_compound = 0; -int dbg_dead = 0; -int dbg_domtree = 0; -int dbg_entry = 0; -int dbg_ir = 0; -int dbg_postorder = 0; - -unsigned long fdump_ir; -int fhosted = 1; -unsigned int fmax_warnings = 100; -int fmem_report = 0; -unsigned long long fmemcpy_max_count = 100000; -unsigned long fpasses = ~0UL; -int fpic = 0; -int fpie = 0; -int fshort_wchar = 0; -int funsigned_char = 0; - -int preprocess_only; - -enum standard standard = STANDARD_GNU89; - -int arch_msize_long = 0; -int arch_m64 = ARCH_M64_DEFAULT; -int arch_big_endian = ARCH_BIG_ENDIAN; -int arch_fp_abi = FP_ABI_NATIVE; -int arch_os = OS_NATIVE; -int arch_cmodel = CMODEL_UNKNOWN; - - -#define CMDLINE_INCLUDE 20 -int cmdline_include_nr = 0; -char *cmdline_include[CMDLINE_INCLUDE]; - //////////////////////////////////////////////////////////////////////////////// // Helpers for option parsing diff --git a/options.h b/options.h index 52d1106e..7fd01ec6 100644 --- a/options.h +++ b/options.h @@ -1,26 +1,85 @@ #ifndef OPTIONS_H #define OPTIONS_H -extern int verbose, optimize_level, optimize_size, preprocessing; +enum { + CMODEL_UNKNOWN, + CMODEL_KERNEL, + CMODEL_LARGE, + CMODEL_MEDANY, + CMODEL_MEDIUM, + CMODEL_MEDLOW, + CMODEL_PIC, + CMODEL_SMALL, + CMODEL_TINY, + CMODEL_LAST, +}; + +enum standard { + STANDARD_NONE, + STANDARD_GNU, + STANDARD_C89, + STANDARD_GNU89 = STANDARD_C89 | STANDARD_GNU, + STANDARD_C94, + STANDARD_GNU94 = STANDARD_C94 | STANDARD_GNU, + STANDARD_C99, + STANDARD_GNU99 = STANDARD_C99 | STANDARD_GNU, + STANDARD_C11, + STANDARD_GNU11 = STANDARD_C11 | STANDARD_GNU, + STANDARD_C17, + STANDARD_GNU17 = STANDARD_C17 | STANDARD_GNU, +}; + extern int die_if_error; -extern int repeat_phase; extern int do_output; -extern int gcc_major, gcc_minor, gcc_patchlevel; -extern unsigned int tabstop; +extern int gcc_major; +extern int gcc_minor; +extern int gcc_patchlevel; +extern int optimize_level; +extern int optimize_size; +extern int preprocess_only; +extern int preprocessing; +extern int repeat_phase; +extern int verbose; + +extern int cmdline_include_nr; +extern char *cmdline_include[]; extern const char *base_filename; extern const char *diag_prefix; extern const char *gcc_base_dir; extern const char *multiarch_dir; extern const char *outfile; -extern int cmdline_include_nr; -extern char *cmdline_include[]; -extern char **handle_switch(char *arg, char **next); -extern void handle_switch_finalize(void); +extern enum standard standard; +extern unsigned int tabstop; +extern int arch_big_endian; +extern int arch_cmodel; +extern int arch_fp_abi; +extern int arch_m64; +extern int arch_msize_long; +extern int arch_os; -extern int preprocess_only; +extern int dbg_compound; +extern int dbg_dead; +extern int dbg_domtree; +extern int dbg_entry; +extern int dbg_ir; +extern int dbg_postorder; + +extern int dump_macro_defs; +extern int dump_macros_only; + +extern unsigned long fdump_ir; +extern int fhosted; +extern unsigned int fmax_warnings; +extern int fmem_report; +extern unsigned long long fmemcpy_max_count; +extern unsigned long fpasses; +extern int fpic; +extern int fpie; +extern int fshort_wchar; +extern int funsigned_char; extern int Waddress; extern int Waddress_space; @@ -39,7 +98,6 @@ extern int Wdesignated_init; extern int Wdo_while; extern int Wenum_mismatch; extern int Wexternal_function_has_definition; -extern int Wsparse_error; extern int Wimplicit_int; extern int Winit_cstring; extern int Wint_to_pointer_cast; @@ -62,6 +120,7 @@ extern int Wshadow; extern int Wshift_count_negative; extern int Wshift_count_overflow; extern int Wsizeof_bool; +extern int Wsparse_error; extern int Wstrict_prototypes; extern int Wtautological_compare; extern int Wtransparent_union; @@ -72,61 +131,7 @@ extern int Wuniversal_initializer; extern int Wunknown_attribute; extern int Wvla; -extern int dump_macro_defs; -extern int dump_macros_only; - -extern int dbg_compound; -extern int dbg_dead; -extern int dbg_domtree; -extern int dbg_entry; -extern int dbg_ir; -extern int dbg_postorder; - -extern unsigned int fmax_warnings; -extern int fmem_report; -extern unsigned long fdump_ir; -extern int fhosted; -extern unsigned long long fmemcpy_max_count; -extern unsigned long fpasses; -extern int fpic; -extern int fpie; -extern int fshort_wchar; -extern int funsigned_char; - -extern int arch_msize_long; -extern int arch_m64; -extern int arch_big_endian; -extern int arch_fp_abi; -extern int arch_os; - -enum { - CMODEL_UNKNOWN, - CMODEL_KERNEL, - CMODEL_LARGE, - CMODEL_MEDANY, - CMODEL_MEDIUM, - CMODEL_MEDLOW, - CMODEL_PIC, - CMODEL_SMALL, - CMODEL_TINY, - CMODEL_LAST, -}; -extern int arch_cmodel; - -enum standard { - STANDARD_NONE, - STANDARD_GNU, - STANDARD_C89, - STANDARD_GNU89 = STANDARD_C89 | STANDARD_GNU, - STANDARD_C94, - STANDARD_GNU94 = STANDARD_C94 | STANDARD_GNU, - STANDARD_C99, - STANDARD_GNU99 = STANDARD_C99 | STANDARD_GNU, - STANDARD_C11, - STANDARD_GNU11 = STANDARD_C11 | STANDARD_GNU, - STANDARD_C17, - STANDARD_GNU17 = STANDARD_C17 | STANDARD_GNU, -}; -extern enum standard standard; +extern char **handle_switch(char *arg, char **next); +extern void handle_switch_finalize(void); #endif -- cgit 1.2.3-korg From 111956db3b21cee7cc09ca91fa139697da50d425 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Wed, 1 Jul 2020 23:48:57 +0200 Subject: cleanup: move predefines in a separate file Now that option parsing have moved to a separate file, move everything related to predefined macros to a separate file too. Signed-off-by: Luc Van Oostenryck --- Makefile | 1 + lib.c | 221 ---------------------------------------------------------- lib.h | 1 + predefine.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 227 insertions(+), 221 deletions(-) create mode 100644 predefine.c diff --git a/Makefile b/Makefile index dce666d2..f4483f5a 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ LIB_OBJS += opcode.o LIB_OBJS += optimize.o LIB_OBJS += options.o LIB_OBJS += parse.o +LIB_OBJS += predefine.o LIB_OBJS += pre-process.o LIB_OBJS += ptrlist.o LIB_OBJS += ptrmap.o diff --git a/lib.c b/lib.c index 53b107d2..fd1fe6cb 100644 --- a/lib.c +++ b/lib.c @@ -248,227 +248,6 @@ void add_pre_buffer(const char *fmt, ...) pre_buffer_end = end; } -//////////////////////////////////////////////////////////////////////////////// -// Predefines - -#define PTYPE_SIZEOF (1U << 0) -#define PTYPE_T (1U << 1) -#define PTYPE_MAX (1U << 2) -#define PTYPE_MIN (1U << 3) -#define PTYPE_WIDTH (1U << 4) -#define PTYPE_TYPE (1U << 5) -#define PTYPE_ALL (PTYPE_MAX|PTYPE_SIZEOF|PTYPE_WIDTH) -#define PTYPE_ALL_T (PTYPE_MAX|PTYPE_SIZEOF|PTYPE_WIDTH|PTYPE_T) - -static void predefined_sizeof(const char *name, const char *suffix, unsigned bits) -{ - char buf[32]; - - snprintf(buf, sizeof(buf), "__SIZEOF_%s%s__", name, suffix); - predefine(buf, 1, "%d", bits/8); -} - -static void predefined_width(const char *name, unsigned bits) -{ - char buf[32]; - - snprintf(buf, sizeof(buf), "__%s_WIDTH__", name); - predefine(buf, 1, "%d", bits); -} - -static void predefined_max(const char *name, struct symbol *type) -{ - const char *suffix = builtin_type_suffix(type); - unsigned bits = type->bit_size - is_signed_type(type); - unsigned long long max = bits_mask(bits); - char buf[32]; - - snprintf(buf, sizeof(buf), "__%s_MAX__", name); - predefine(buf, 1, "%#llx%s", max, suffix); -} - -static void predefined_min(const char *name, struct symbol *type) -{ - const char *suffix = builtin_type_suffix(type); - char buf[32]; - - snprintf(buf, sizeof(buf), "__%s_MIN__", name); - - if (is_signed_type(type)) - predefine(buf, 1, "(-__%s_MAX__ - 1)", name); - else - predefine(buf, 1, "0%s", suffix); -} - -static void predefined_type(const char *name, struct symbol *type) -{ - const char *typename = builtin_typename(type); - add_pre_buffer("#weak_define __%s_TYPE__ %s\n", name, typename); -} - -static void predefined_ctype(const char *name, struct symbol *type, int flags) -{ - unsigned bits = type->bit_size; - - if (flags & PTYPE_SIZEOF) { - const char *suffix = (flags & PTYPE_T) ? "_T" : ""; - predefined_sizeof(name, suffix, bits); - } - if (flags & PTYPE_MAX) - predefined_max(name, type); - if (flags & PTYPE_MIN) - predefined_min(name, type); - if (flags & PTYPE_TYPE) - predefined_type(name, type); - if (flags & PTYPE_WIDTH) - predefined_width(name, bits); -} - -static void predefined_macros(void) -{ - predefine("__CHECKER__", 0, "1"); - predefine("__GNUC__", 1, "%d", gcc_major); - predefine("__GNUC_MINOR__", 1, "%d", gcc_minor); - predefine("__GNUC_PATCHLEVEL__", 1, "%d", gcc_patchlevel); - - predefine("__STDC__", 1, "1"); - predefine("__STDC_HOSTED__", 0, fhosted ? "1" : "0"); - switch (standard) { - default: - break; - - case STANDARD_C94: - predefine("__STDC_VERSION__", 1, "199409L"); - break; - - case STANDARD_C99: - case STANDARD_GNU99: - predefine("__STDC_VERSION__", 1, "199901L"); - break; - - case STANDARD_C11: - case STANDARD_GNU11: - predefine("__STDC_VERSION__", 1, "201112L"); - break; - case STANDARD_C17: - case STANDARD_GNU17: - predefine("__STDC_VERSION__", 1, "201710L"); - break; - } - if (!(standard & STANDARD_GNU) && (standard != STANDARD_NONE)) - predefine("__STRICT_ANSI__", 1, "1"); - if (standard >= STANDARD_C11) { - predefine("__STDC_NO_ATOMICS__", 1, "1"); - predefine("__STDC_NO_COMPLEX__", 1, "1"); - predefine("__STDC_NO_THREADS__", 1, "1"); - } - - predefine("__CHAR_BIT__", 1, "%d", bits_in_char); - if (funsigned_char) - predefine("__CHAR_UNSIGNED__", 1, "1"); - - predefined_ctype("SHORT", &short_ctype, PTYPE_SIZEOF); - predefined_ctype("SHRT", &short_ctype, PTYPE_MAX|PTYPE_WIDTH); - predefined_ctype("SCHAR", &schar_ctype, PTYPE_MAX|PTYPE_WIDTH); - predefined_ctype("WCHAR", wchar_ctype, PTYPE_ALL_T|PTYPE_MIN|PTYPE_TYPE); - predefined_ctype("WINT", wint_ctype, PTYPE_ALL_T|PTYPE_MIN|PTYPE_TYPE); - predefined_ctype("CHAR16", &ushort_ctype, PTYPE_TYPE); - predefined_ctype("CHAR32", uint32_ctype, PTYPE_TYPE); - - predefined_ctype("INT", &int_ctype, PTYPE_ALL); - predefined_ctype("LONG", &long_ctype, PTYPE_ALL); - predefined_ctype("LONG_LONG", &llong_ctype, PTYPE_ALL); - - predefined_ctype("INT8", &schar_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("UINT8", &uchar_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("INT16", &short_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("UINT16", &ushort_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("INT32", int32_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("UINT32", uint32_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("INT64", int64_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("UINT64", uint64_ctype, PTYPE_MAX|PTYPE_TYPE); - - predefined_ctype("INTMAX", intmax_ctype, PTYPE_MAX|PTYPE_TYPE|PTYPE_WIDTH); - predefined_ctype("UINTMAX", uintmax_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("INTPTR", ssize_t_ctype, PTYPE_MAX|PTYPE_TYPE|PTYPE_WIDTH); - predefined_ctype("UINTPTR", size_t_ctype, PTYPE_MAX|PTYPE_TYPE); - predefined_ctype("PTRDIFF", ssize_t_ctype, PTYPE_ALL_T|PTYPE_TYPE); - predefined_ctype("SIZE", size_t_ctype, PTYPE_ALL_T|PTYPE_TYPE); - predefined_ctype("POINTER", &ptr_ctype, PTYPE_SIZEOF); - - predefined_sizeof("FLOAT", "", bits_in_float); - predefined_sizeof("DOUBLE", "", bits_in_double); - predefined_sizeof("LONG_DOUBLE", "", bits_in_longdouble); - - if (arch_target->has_int128) - predefined_sizeof("INT128", "", 128); - - predefine("__ORDER_LITTLE_ENDIAN__", 1, "1234"); - predefine("__ORDER_BIG_ENDIAN__", 1, "4321"); - predefine("__ORDER_PDP_ENDIAN__", 1, "3412"); - if (arch_big_endian) { - predefine("__BIG_ENDIAN__", 1, "1"); - predefine("__BYTE_ORDER__", 1, "__ORDER_BIG_ENDIAN__"); - } else { - predefine("__LITTLE_ENDIAN__", 1, "1"); - predefine("__BYTE_ORDER__", 1, "__ORDER_LITTLE_ENDIAN__"); - } - - if (optimize_level) - predefine("__OPTIMIZE__", 0, "1"); - if (optimize_size) - predefine("__OPTIMIZE_SIZE__", 0, "1"); - - predefine("__PRAGMA_REDEFINE_EXTNAME", 1, "1"); - - // Temporary hacks - predefine("__extension__", 0, NULL); - predefine("__pragma__", 0, NULL); - - switch (arch_m64) { - case ARCH_LP32: - break; - case ARCH_X32: - predefine("__ILP32__", 1, "1"); - predefine("_ILP32", 1, "1"); - break; - case ARCH_LP64: - predefine("__LP64__", 1, "1"); - predefine("_LP64", 1, "1"); - break; - case ARCH_LLP64: - predefine("__LLP64__", 1, "1"); - break; - } - - if (fpic) { - predefine("__pic__", 0, "%d", fpic); - predefine("__PIC__", 0, "%d", fpic); - } - if (fpie) { - predefine("__pie__", 0, "%d", fpie); - predefine("__PIE__", 0, "%d", fpie); - } - - if (arch_target->predefine) - arch_target->predefine(arch_target); - - if (arch_os >= OS_UNIX) { - predefine("__unix__", 1, "1"); - predefine("__unix", 1, "1"); - predefine_nostd("unix"); - } - - if (arch_os == OS_SUNOS) { - predefine("__sun__", 1, "1"); - predefine("__sun", 1, "1"); - predefine_nostd("sun"); - predefine("__svr4__", 1, "1"); - } -} - -//////////////////////////////////////////////////////////////////////////////// - static void create_builtin_stream(void) { // Temporary hack diff --git a/lib.h b/lib.h index b47505f6..81253a3e 100644 --- a/lib.h +++ b/lib.h @@ -130,6 +130,7 @@ 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_nostd(const char *name); +extern void predefined_macros(void); extern void dump_macro_definitions(void); diff --git a/predefine.c b/predefine.c new file mode 100644 index 00000000..ff457b38 --- /dev/null +++ b/predefine.c @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: MIT +// Copyright (C) 2017-2020 Luc Van Oostenryck. + +#include + +#include "lib.h" +#include "machine.h" +#include "symbol.h" + +#define PTYPE_SIZEOF (1U << 0) +#define PTYPE_T (1U << 1) +#define PTYPE_MAX (1U << 2) +#define PTYPE_MIN (1U << 3) +#define PTYPE_WIDTH (1U << 4) +#define PTYPE_TYPE (1U << 5) +#define PTYPE_ALL (PTYPE_MAX|PTYPE_SIZEOF|PTYPE_WIDTH) +#define PTYPE_ALL_T (PTYPE_MAX|PTYPE_SIZEOF|PTYPE_WIDTH|PTYPE_T) + + +static void predefined_sizeof(const char *name, const char *suffix, unsigned bits) +{ + char buf[32]; + + snprintf(buf, sizeof(buf), "__SIZEOF_%s%s__", name, suffix); + predefine(buf, 1, "%d", bits/8); +} + +static void predefined_width(const char *name, unsigned bits) +{ + char buf[32]; + + snprintf(buf, sizeof(buf), "__%s_WIDTH__", name); + predefine(buf, 1, "%d", bits); +} + +static void predefined_max(const char *name, struct symbol *type) +{ + const char *suffix = builtin_type_suffix(type); + unsigned bits = type->bit_size - is_signed_type(type); + unsigned long long max = bits_mask(bits); + char buf[32]; + + snprintf(buf, sizeof(buf), "__%s_MAX__", name); + predefine(buf, 1, "%#llx%s", max, suffix); +} + +static void predefined_min(const char *name, struct symbol *type) +{ + const char *suffix = builtin_type_suffix(type); + char buf[32]; + + snprintf(buf, sizeof(buf), "__%s_MIN__", name); + + if (is_signed_type(type)) + predefine(buf, 1, "(-__%s_MAX__ - 1)", name); + else + predefine(buf, 1, "0%s", suffix); +} + +static void predefined_type(const char *name, struct symbol *type) +{ + const char *typename = builtin_typename(type); + add_pre_buffer("#weak_define __%s_TYPE__ %s\n", name, typename); +} + +static void predefined_ctype(const char *name, struct symbol *type, int flags) +{ + unsigned bits = type->bit_size; + + if (flags & PTYPE_SIZEOF) { + const char *suffix = (flags & PTYPE_T) ? "_T" : ""; + predefined_sizeof(name, suffix, bits); + } + if (flags & PTYPE_MAX) + predefined_max(name, type); + if (flags & PTYPE_MIN) + predefined_min(name, type); + if (flags & PTYPE_TYPE) + predefined_type(name, type); + if (flags & PTYPE_WIDTH) + predefined_width(name, bits); +} + +void predefined_macros(void) +{ + predefine("__CHECKER__", 0, "1"); + predefine("__GNUC__", 1, "%d", gcc_major); + predefine("__GNUC_MINOR__", 1, "%d", gcc_minor); + predefine("__GNUC_PATCHLEVEL__", 1, "%d", gcc_patchlevel); + + predefine("__STDC__", 1, "1"); + predefine("__STDC_HOSTED__", 0, fhosted ? "1" : "0"); + switch (standard) { + default: + break; + + case STANDARD_C94: + predefine("__STDC_VERSION__", 1, "199409L"); + break; + + case STANDARD_C99: + case STANDARD_GNU99: + predefine("__STDC_VERSION__", 1, "199901L"); + break; + + case STANDARD_C11: + case STANDARD_GNU11: + predefine("__STDC_VERSION__", 1, "201112L"); + break; + case STANDARD_C17: + case STANDARD_GNU17: + predefine("__STDC_VERSION__", 1, "201710L"); + break; + } + if (!(standard & STANDARD_GNU) && (standard != STANDARD_NONE)) + predefine("__STRICT_ANSI__", 1, "1"); + if (standard >= STANDARD_C11) { + predefine("__STDC_NO_ATOMICS__", 1, "1"); + predefine("__STDC_NO_COMPLEX__", 1, "1"); + predefine("__STDC_NO_THREADS__", 1, "1"); + } + + predefine("__CHAR_BIT__", 1, "%d", bits_in_char); + if (funsigned_char) + predefine("__CHAR_UNSIGNED__", 1, "1"); + + predefined_ctype("SHORT", &short_ctype, PTYPE_SIZEOF); + predefined_ctype("SHRT", &short_ctype, PTYPE_MAX|PTYPE_WIDTH); + predefined_ctype("SCHAR", &schar_ctype, PTYPE_MAX|PTYPE_WIDTH); + predefined_ctype("WCHAR", wchar_ctype, PTYPE_ALL_T|PTYPE_MIN|PTYPE_TYPE); + predefined_ctype("WINT", wint_ctype, PTYPE_ALL_T|PTYPE_MIN|PTYPE_TYPE); + predefined_ctype("CHAR16", &ushort_ctype, PTYPE_TYPE); + predefined_ctype("CHAR32", uint32_ctype, PTYPE_TYPE); + + predefined_ctype("INT", &int_ctype, PTYPE_ALL); + predefined_ctype("LONG", &long_ctype, PTYPE_ALL); + predefined_ctype("LONG_LONG", &llong_ctype, PTYPE_ALL); + + predefined_ctype("INT8", &schar_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("UINT8", &uchar_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("INT16", &short_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("UINT16", &ushort_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("INT32", int32_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("UINT32", uint32_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("INT64", int64_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("UINT64", uint64_ctype, PTYPE_MAX|PTYPE_TYPE); + + predefined_ctype("INTMAX", intmax_ctype, PTYPE_MAX|PTYPE_TYPE|PTYPE_WIDTH); + predefined_ctype("UINTMAX", uintmax_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("INTPTR", ssize_t_ctype, PTYPE_MAX|PTYPE_TYPE|PTYPE_WIDTH); + predefined_ctype("UINTPTR", size_t_ctype, PTYPE_MAX|PTYPE_TYPE); + predefined_ctype("PTRDIFF", ssize_t_ctype, PTYPE_ALL_T|PTYPE_TYPE); + predefined_ctype("SIZE", size_t_ctype, PTYPE_ALL_T|PTYPE_TYPE); + predefined_ctype("POINTER", &ptr_ctype, PTYPE_SIZEOF); + + predefined_sizeof("FLOAT", "", bits_in_float); + predefined_sizeof("DOUBLE", "", bits_in_double); + predefined_sizeof("LONG_DOUBLE", "", bits_in_longdouble); + + if (arch_target->has_int128) + predefined_sizeof("INT128", "", 128); + + predefine("__ORDER_LITTLE_ENDIAN__", 1, "1234"); + predefine("__ORDER_BIG_ENDIAN__", 1, "4321"); + predefine("__ORDER_PDP_ENDIAN__", 1, "3412"); + if (arch_big_endian) { + predefine("__BIG_ENDIAN__", 1, "1"); + predefine("__BYTE_ORDER__", 1, "__ORDER_BIG_ENDIAN__"); + } else { + predefine("__LITTLE_ENDIAN__", 1, "1"); + predefine("__BYTE_ORDER__", 1, "__ORDER_LITTLE_ENDIAN__"); + } + + if (optimize_level) + predefine("__OPTIMIZE__", 0, "1"); + if (optimize_size) + predefine("__OPTIMIZE_SIZE__", 0, "1"); + + predefine("__PRAGMA_REDEFINE_EXTNAME", 1, "1"); + + // Temporary hacks + predefine("__extension__", 0, NULL); + predefine("__pragma__", 0, NULL); + + switch (arch_m64) { + case ARCH_LP32: + break; + case ARCH_X32: + predefine("__ILP32__", 1, "1"); + predefine("_ILP32", 1, "1"); + break; + case ARCH_LP64: + predefine("__LP64__", 1, "1"); + predefine("_LP64", 1, "1"); + break; + case ARCH_LLP64: + predefine("__LLP64__", 1, "1"); + break; + } + + if (fpic) { + predefine("__pic__", 0, "%d", fpic); + predefine("__PIC__", 0, "%d", fpic); + } + if (fpie) { + predefine("__pie__", 0, "%d", fpie); + predefine("__PIE__", 0, "%d", fpie); + } + + if (arch_target->predefine) + arch_target->predefine(arch_target); + + if (arch_os >= OS_UNIX) { + predefine("__unix__", 1, "1"); + predefine("__unix", 1, "1"); + predefine_nostd("unix"); + } + + if (arch_os == OS_SUNOS) { + predefine("__sun__", 1, "1"); + predefine("__sun", 1, "1"); + predefine_nostd("sun"); + predefine("__svr4__", 1, "1"); + } +} -- cgit 1.2.3-korg From 8e929d4e369f687552db8d127b2d39947eb93983 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Wed, 1 Jul 2020 23:51:20 +0200 Subject: cleanup: move parsing helpers to parse.c lib.c contains 2-3 helpers for parsing. Move them to parse.c. Signed-off-by: Luc Van Oostenryck --- lib.c | 38 -------------------------------------- lib.h | 4 ---- parse.c | 38 ++++++++++++++++++++++++++++++++++++++ parse.h | 2 ++ 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/lib.c b/lib.c index fd1fe6cb..f512be2e 100644 --- a/lib.c +++ b/lib.c @@ -50,44 +50,6 @@ #include "bits.h" -struct token *skip_to(struct token *token, int op) -{ - while (!match_op(token, op) && !eof_token(token)) - token = token->next; - return token; -} - -static struct token bad_token = { .pos.type = TOKEN_BAD }; -struct token *expect(struct token *token, int op, const char *where) -{ - if (!match_op(token, op)) { - if (token != &bad_token) { - bad_token.next = token; - sparse_error(token->pos, "Expected %s %s", show_special(op), where); - sparse_error(token->pos, "got %s", show_token(token)); - } - if (op == ';') - return skip_to(token, op); - return &bad_token; - } - return token->next; -} - -/// -// issue an error message on new parsing errors -// @token: the current token -// @errmsg: the error message -// If the current token is from a previous error, an error message -// has already been issued, so nothing more is done. -// Otherwise, @errmsg is displayed followed by the current token. -void unexpected(struct token *token, const char *errmsg) -{ - if (token == &bad_token) - return; - sparse_error(token->pos, "%s", errmsg); - sparse_error(token->pos, "got %s", show_token(token)); -} - unsigned int hexval(unsigned int c) { int retval = 256; diff --git a/lib.h b/lib.h index 81253a3e..b906d503 100644 --- a/lib.h +++ b/lib.h @@ -82,10 +82,6 @@ DECLARE_PTR_LIST(string_list, char); typedef struct pseudo *pseudo_t; -struct token *skip_to(struct token *, int); -struct token *expect(struct token *, int, const char *); -void unexpected(struct token *, const char *errmsg); - #ifdef __GNUC__ #define FORMAT_ATTR(pos) __attribute__ ((__format__ (__printf__, pos, pos+1))) #define NORETURN_ATTR __attribute__ ((__noreturn__)) diff --git a/parse.c b/parse.c index 70d8b237..a9222e7c 100644 --- a/parse.c +++ b/parse.c @@ -655,6 +655,44 @@ void init_parser(int stream) } +static struct token *skip_to(struct token *token, int op) +{ + while (!match_op(token, op) && !eof_token(token)) + token = token->next; + return token; +} + +static struct token bad_token = { .pos.type = TOKEN_BAD }; +struct token *expect(struct token *token, int op, const char *where) +{ + if (!match_op(token, op)) { + if (token != &bad_token) { + bad_token.next = token; + sparse_error(token->pos, "Expected %s %s", show_special(op), where); + sparse_error(token->pos, "got %s", show_token(token)); + } + if (op == ';') + return skip_to(token, op); + return &bad_token; + } + return token->next; +} + +/// +// issue an error message on new parsing errors +// @token: the current token +// @errmsg: the error message +// If the current token is from a previous error, an error message +// has already been issued, so nothing more is done. +// Otherwise, @errmsg is displayed followed by the current token. +static void unexpected(struct token *token, const char *errmsg) +{ + if (token == &bad_token) + return; + sparse_error(token->pos, "%s", errmsg); + sparse_error(token->pos, "got %s", show_token(token)); +} + // Add a symbol to the list of function-local symbols static void fn_local_symbol(struct symbol *sym) { diff --git a/parse.h b/parse.h index 5ac9a23b..e7ea3642 100644 --- a/parse.h +++ b/parse.h @@ -140,4 +140,6 @@ extern int inline_function(struct expression *expr, struct symbol *sym); extern void uninline(struct symbol *sym); extern void init_parser(int); +struct token *expect(struct token *, int, const char *); + #endif /* PARSE_H */ -- cgit 1.2.3-korg From 61f53e257de47e29fe3d6eec6d233552e8116cb4 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Wed, 1 Jul 2020 23:52:18 +0200 Subject: cleanup: move hexval() to utils.c Now lib.c contains almost nothing else than library entrypoints. Move a small utility, hexval(), to utils.c to complete this cleanup. Signed-off-by: Luc Van Oostenryck --- lib.c | 17 ----------------- lib.h | 2 -- utils.c | 17 +++++++++++++++++ utils.h | 4 ++++ 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/lib.c b/lib.c index f512be2e..57c89a16 100644 --- a/lib.c +++ b/lib.c @@ -50,23 +50,6 @@ #include "bits.h" -unsigned int hexval(unsigned int c) -{ - int retval = 256; - switch (c) { - case '0'...'9': - retval = c - '0'; - break; - case 'a'...'f': - retval = c - 'a' + 10; - break; - case 'A'...'F': - retval = c - 'A' + 10; - break; - } - return retval; -} - static void do_warn(const char *type, struct position pos, const char * fmt, va_list args) { static char buffer[512]; diff --git a/lib.h b/lib.h index b906d503..682e54f5 100644 --- a/lib.h +++ b/lib.h @@ -45,8 +45,6 @@ #endif -extern unsigned int hexval(unsigned int c); - struct position { unsigned int type:6, stream:14, diff --git a/utils.c b/utils.c index 094df3f9..72fff00f 100644 --- a/utils.c +++ b/utils.c @@ -8,6 +8,23 @@ #include +unsigned int hexval(unsigned int c) +{ + int retval = 256; + switch (c) { + case '0'...'9': + retval = c - '0'; + break; + case 'a'...'f': + retval = c - 'a' + 10; + break; + case 'A'...'F': + retval = c - 'A' + 10; + break; + } + return retval; +} + void *xmemdup(const void *src, size_t len) { return memcpy(__alloc_bytes(len), src, len); diff --git a/utils.h b/utils.h index 7bd14f46..079fb02a 100644 --- a/utils.h +++ b/utils.h @@ -8,6 +8,10 @@ #include #include +/// +// return the value coresponding to an hexadecimal digit +unsigned int hexval(unsigned int c); + /// // duplicate a memory buffer in a newly allocated buffer. // @src: a pointer to the memory buffer to be duplicated -- cgit 1.2.3-korg