X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fopts.h;h=dbefc6401d9288b277ca08e42f05a15376eb8887;hb=02be8f84f05bae942940b9eae1ae1f74d7a6610c;hp=fbfe6bf34479c9f548ed1b509809a901023f1434;hpb=24ca3b4e3f701e3f091363cdcdf4a32f13ddea7d;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/opts.h b/gcc/opts.h index fbfe6bf3447..dbefc6401d9 100644 --- a/gcc/opts.h +++ b/gcc/opts.h @@ -1,5 +1,5 @@ /* Command line option handling. - Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 + Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -21,6 +21,9 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_OPTS_H #define GCC_OPTS_H +#include "input.h" +#include "vec.h" + /* Specifies how a switch's VAR_VALUE relates to its FLAG_VAR. */ enum cl_var_type { /* The switch is enabled when FLAG_VAR is nonzero. */ @@ -37,25 +40,78 @@ enum cl_var_type { /* The switch takes a string argument and FLAG_VAR points to that argument. */ - CLVC_STRING + CLVC_STRING, + + /* The switch takes an enumerated argument (VAR_ENUM says what + enumeration) and FLAG_VAR points to that argument. */ + CLVC_ENUM, + + /* The switch should be stored in the VEC pointed to by FLAG_VAR for + later processing. */ + CLVC_DEFER }; struct cl_option { + /* Text of the option, including initial '-'. */ const char *opt_text; + /* Help text for --help, or NULL. */ const char *help; + /* Error message for missing argument, or NULL. */ const char *missing_argument_error; + /* Warning to give when this option is used, or NULL. */ const char *warn_message; + /* Argument of alias target when positive option given, or NULL. */ const char *alias_arg; + /* Argument of alias target when negative option given, or NULL. */ const char *neg_alias_arg; + /* Alias target, or N_OPTS if not an alias. */ unsigned short alias_target; + /* Previous option that is an initial substring of this one, or + N_OPTS if none. */ unsigned short back_chain; + /* Option length, not including initial '-'. */ unsigned char opt_len; + /* Next option in a sequence marked with Negative, or -1 if none. */ int neg_index; + /* CL_* flags for this option. */ unsigned int flags; + /* Disabled in this configuration. */ + BOOL_BITFIELD cl_disabled : 1; + /* Options marked with CL_SEPARATE take a number of separate + arguments (1 to 4) that is one more than the number in this + bit-field. */ + unsigned int cl_separate_nargs : 2; + /* Option is an alias when used with separate argument. */ + BOOL_BITFIELD cl_separate_alias : 1; + /* Alias to negative form of option. */ + BOOL_BITFIELD cl_negative_alias : 1; + /* Option takes no argument in the driver. */ + BOOL_BITFIELD cl_no_driver_arg : 1; + /* Reject this option in the driver. */ + BOOL_BITFIELD cl_reject_driver : 1; + /* Reject no- form. */ + BOOL_BITFIELD cl_reject_negative : 1; + /* Missing argument OK (joined). */ + BOOL_BITFIELD cl_missing_ok : 1; + /* Argument is an integer >=0. */ + BOOL_BITFIELD cl_uinteger : 1; + /* Argument is a HOST_WIDE_INT. */ + BOOL_BITFIELD cl_host_wide_int : 1; + /* Argument should be converted to lowercase. */ + BOOL_BITFIELD cl_tolower : 1; + /* Report argument with -fverbose-asm */ + BOOL_BITFIELD cl_report : 1; + /* Offset of field for this option in struct gcc_options, or + (unsigned short) -1 if none. */ unsigned short flag_var_offset; + /* Index in cl_enums of enum used for this option's arguments, for + CLVC_ENUM options. */ + unsigned short var_enum; + /* How this option's value is determined and sets a field. */ enum cl_var_type var_type; - int var_value; + /* Value or bit-mask with which to set a field. */ + HOST_WIDE_INT var_value; }; /* Records that the state of an option consists of SIZE bytes starting @@ -71,12 +127,12 @@ extern const unsigned int cl_options_count; extern const char *const lang_names[]; extern const unsigned int cl_lang_count; -#define CL_PARAMS (1 << 13) /* Fake entry. Used to display --param info with --help. */ -#define CL_WARNING (1 << 14) /* Enables an (optional) warning message. */ -#define CL_OPTIMIZATION (1 << 15) /* Enables an (optional) optimization. */ -#define CL_DRIVER (1 << 16) /* Driver option. */ -#define CL_TARGET (1 << 17) /* Target-specific option. */ -#define CL_COMMON (1 << 18) /* Language-independent. */ +#define CL_PARAMS (1U << 16) /* Fake entry. Used to display --param info with --help. */ +#define CL_WARNING (1U << 17) /* Enables an (optional) warning message. */ +#define CL_OPTIMIZATION (1U << 18) /* Enables an (optional) optimization. */ +#define CL_DRIVER (1U << 19) /* Driver option. */ +#define CL_TARGET (1U << 20) /* Target-specific option. */ +#define CL_COMMON (1U << 21) /* Language-independent. */ #define CL_MIN_OPTION_CLASS CL_PARAMS #define CL_MAX_OPTION_CLASS CL_COMMON @@ -86,18 +142,55 @@ extern const unsigned int cl_lang_count; This distinction is important because --help will not list options which only have these higher bits set. */ -#define CL_SEPARATE_ALIAS (1 << 19) /* Option is an alias when used with separate argument. */ -#define CL_NO_DRIVER_ARG (1 << 20) /* Option takes no argument in the driver. */ -#define CL_REJECT_DRIVER (1 << 21) /* Reject this option in the driver. */ -#define CL_SAVE (1 << 22) /* Target-specific option for attribute. */ -#define CL_DISABLED (1 << 23) /* Disabled in this configuration. */ -#define CL_REPORT (1 << 24) /* Report argument with -fverbose-asm */ -#define CL_JOINED (1 << 25) /* If takes joined argument. */ -#define CL_SEPARATE (1 << 26) /* If takes a separate argument. */ -#define CL_REJECT_NEGATIVE (1 << 27) /* Reject no- form. */ -#define CL_MISSING_OK (1 << 28) /* Missing argument OK (joined). */ -#define CL_UINTEGER (1 << 29) /* Argument is an integer >=0. */ -#define CL_UNDOCUMENTED (1 << 30) /* Do not output with --help. */ +#define CL_JOINED (1U << 22) /* If takes joined argument. */ +#define CL_SEPARATE (1U << 23) /* If takes a separate argument. */ +#define CL_UNDOCUMENTED (1U << 24) /* Do not output with --help. */ + +/* Flags for an enumerated option argument. */ +#define CL_ENUM_CANONICAL (1 << 0) /* Canonical for this value. */ +#define CL_ENUM_DRIVER_ONLY (1 << 1) /* Only accepted in the driver. */ + +/* Structure describing an enumerated option argument. */ + +struct cl_enum_arg +{ + /* The argument text, or NULL at the end of the array. */ + const char *arg; + + /* The corresponding integer value. */ + int value; + + /* Flags associated with this argument. */ + unsigned int flags; +}; + +/* Structure describing an enumerated set of option arguments. */ + +struct cl_enum +{ + /* Help text, or NULL if the values should not be listed in --help + output. */ + const char *help; + + /* Error message for unknown arguments, or NULL to use a generic + error. */ + const char *unknown_error; + + /* Array of possible values. */ + const struct cl_enum_arg *values; + + /* The size of the type used to store a value. */ + size_t var_size; + + /* Function to set a variable of this type. */ + void (*set) (void *var, int value); + + /* Function to get the value of a variable of this type. */ + int (*get) (const void *var); +}; + +extern const struct cl_enum cl_enums[]; +extern const unsigned int cl_enums_count; /* Possible ways in which a command-line option may be erroneous. These do not include not being known at all; an option index of @@ -107,7 +200,8 @@ extern const unsigned int cl_lang_count; #define CL_ERR_MISSING_ARG (1 << 1) /* Argument required but missing. */ #define CL_ERR_WRONG_LANG (1 << 2) /* Option for wrong language. */ #define CL_ERR_UINT_ARG (1 << 3) /* Bad unsigned integer argument. */ -#define CL_ERR_NEGATIVE (1 << 4) /* Negative form of option +#define CL_ERR_ENUM_ARG (1 << 4) /* Bad enumerated argument. */ +#define CL_ERR_NEGATIVE (1 << 5) /* Negative form of option not permitted (together with OPT_SPECIAL_unknown). */ @@ -151,6 +245,20 @@ struct cl_decoded_option int errors; }; +/* Structure describing an option deferred for handling after the main + option handlers. */ + +typedef struct +{ + /* Elements from struct cl_decoded_option used for deferred + options. */ + size_t opt_index; + const char *arg; + int value; +} cl_deferred_option; +DEF_VEC_O(cl_deferred_option); +DEF_VEC_ALLOC_O(cl_deferred_option,heap); + /* Structure describing a single option-handling callback. */ struct cl_option_handler_func @@ -159,8 +267,9 @@ struct cl_option_handler_func bool (*handler) (struct gcc_options *opts, struct gcc_options *opts_set, const struct cl_decoded_option *decoded, - unsigned int lang_mask, int kind, - const struct cl_option_handlers *handlers); + unsigned int lang_mask, int kind, location_t loc, + const struct cl_option_handlers *handlers, + diagnostic_context *dc); /* The mask that must have some bit in common with the flags for the option for this particular handler to be used. */ @@ -182,10 +291,6 @@ struct cl_option_handlers void (*wrong_lang_callback) (const struct cl_decoded_option *decoded, unsigned int lang_mask); - /* Callback to call after the successful handling of any option. */ - void (*post_handling_callback) (const struct cl_decoded_option *decoded, - unsigned int mask); - /* The number of individual handlers. */ size_t num_handlers; @@ -201,34 +306,42 @@ extern const char **in_fnames; extern unsigned num_in_fnames; -size_t find_opt (const char *input, int lang_mask); +size_t find_opt (const char *input, unsigned int lang_mask); extern int integral_argument (const char *arg); +extern bool enum_value_to_arg (const struct cl_enum_arg *enum_args, + const char **argp, int value, + unsigned int lang_mask); extern void decode_cmdline_options_to_array (unsigned int argc, const char **argv, unsigned int lang_mask, struct cl_decoded_option **decoded_options, unsigned int *decoded_options_count); -extern void decode_options (unsigned int argc, const char **argv, - struct cl_decoded_option **decoded_options, - unsigned int *decoded_options_count); +extern void init_options_once (void); +extern void init_options_struct (struct gcc_options *opts, + struct gcc_options *opts_set); +extern void decode_cmdline_options_to_array_default_mask (unsigned int argc, + const char **argv, + struct cl_decoded_option **decoded_options, + unsigned int *decoded_options_count); +extern void set_default_handlers (struct cl_option_handlers *handlers); +extern void decode_options (struct gcc_options *opts, + struct gcc_options *opts_set, + struct cl_decoded_option *decoded_options, + unsigned int decoded_options_count, + location_t loc, + diagnostic_context *dc); extern int option_enabled (int opt_idx, void *opts); extern bool get_option_state (struct gcc_options *, int, struct cl_option_state *); extern void set_option (struct gcc_options *opts, struct gcc_options *opts_set, int opt_index, int value, const char *arg, int kind, - diagnostic_context *dc); + location_t loc, diagnostic_context *dc); extern void *option_flag_var (int opt_index, struct gcc_options *opts); -bool handle_option (struct gcc_options *opts, - struct gcc_options *opts_set, - const struct cl_decoded_option *decoded, - unsigned int lang_mask, int kind, - const struct cl_option_handlers *handlers, - bool generated_p, diagnostic_context *dc); bool handle_generated_option (struct gcc_options *opts, struct gcc_options *opts_set, size_t opt_index, const char *arg, int value, - unsigned int lang_mask, int kind, + unsigned int lang_mask, int kind, location_t loc, const struct cl_option_handlers *handlers, diagnostic_context *dc); void generate_option (size_t opt_index, const char *arg, int value, @@ -239,13 +352,47 @@ void generate_option_input_file (const char *file, extern void read_cmdline_option (struct gcc_options *opts, struct gcc_options *opts_set, struct cl_decoded_option *decoded, + location_t loc, unsigned int lang_mask, const struct cl_option_handlers *handlers, diagnostic_context *dc); -extern void register_warning_as_error_callback (void (*callback) (int)); -extern void enable_warning_as_error (const char *arg, int value, - unsigned int lang_mask, - const struct cl_option_handlers *handlers, - diagnostic_context *dc); +extern void control_warning_option (unsigned int opt_index, int kind, + bool imply, location_t loc, + unsigned int lang_mask, + const struct cl_option_handlers *handlers, + struct gcc_options *opts, + struct gcc_options *opts_set, + diagnostic_context *dc); extern void print_ignored_options (void); +extern void handle_common_deferred_options (void); +extern bool common_handle_option (struct gcc_options *opts, + struct gcc_options *opts_set, + const struct cl_decoded_option *decoded, + unsigned int lang_mask, int kind, + location_t loc, + const struct cl_option_handlers *handlers, + diagnostic_context *dc); +extern bool target_handle_option (struct gcc_options *opts, + struct gcc_options *opts_set, + const struct cl_decoded_option *decoded, + unsigned int lang_mask, int kind, + location_t loc, + const struct cl_option_handlers *handlers, + diagnostic_context *dc); +extern void finish_options (struct gcc_options *opts, + struct gcc_options *opts_set, + location_t loc); +extern void default_options_optimization (struct gcc_options *opts, + struct gcc_options *opts_set, + struct cl_decoded_option *decoded_options, + unsigned int decoded_options_count, + location_t loc, + unsigned int lang_mask, + const struct cl_option_handlers *handlers, + diagnostic_context *dc); +extern void set_struct_debug_option (struct gcc_options *opts, + location_t loc, + const char *value); +extern bool opt_enum_arg_to_value (size_t opt_index, const char *arg, + int *value, unsigned int lang_mask); #endif