n_opts = 0
n_langs = 0
n_target_save = 0
- quote = "\042"
+ n_extra_vars = 0
+ n_extra_target_vars = 0
+ n_extra_c_includes = 0
+ n_extra_h_includes = 0
+ n_enums = 0
+ quote = "\042"
comma = ","
FS=SUBSEP
# Default the name of header created from opth-gen.awk to options.h
target_save_decl[n_target_save] = $2
n_target_save++
}
+ else if ($1 == "Variable") {
+ extra_vars[n_extra_vars] = $2
+ n_extra_vars++
+ }
+ else if ($1 == "TargetVariable") {
+ # Combination of TargetSave and Variable
+ extra_vars[n_extra_vars] = $2
+ n_extra_vars++
+
+ var = $2
+ sub(" *=.*", "", var)
+ orig_var = var
+ name = var
+ type = var
+ sub("^.*[ *]", "", name)
+ sub(" *" name "$", "", type)
+ target_save_decl[n_target_save] = type " x_" name
+ n_target_save++
+
+ extra_target_vars[n_extra_target_vars] = name
+ n_extra_target_vars++;
+ }
+ else if ($1 == "HeaderInclude") {
+ extra_h_includes[n_extra_h_includes++] = $2;
+ }
+ else if ($1 == "SourceInclude") {
+ extra_c_includes[n_extra_c_includes++] = $2;
+ }
+ else if ($1 == "Enum") {
+ props = $2
+ name = opt_args("Name", props)
+ type = opt_args("Type", props)
+ unknown_error = opt_args("UnknownError", props)
+ enum_names[n_enums] = name
+ enum_type[name] = type
+ enum_index[name] = n_enums
+ enum_unknown_error[name] = unknown_error
+ enum_help[name] = $3
+ n_enums++
+ }
+ else if ($1 == "EnumValue") {
+ props = $2
+ enum_name = opt_args("Enum", props)
+ string = opt_args("String", props)
+ value = opt_args("Value", props)
+ val_flags = "0"
+ val_flags = val_flags \
+ test_flag("Canonical", props, "| CL_ENUM_CANONICAL") \
+ test_flag("DriverOnly", props, "| CL_ENUM_DRIVER_ONLY")
+ enum_data[enum_name] = enum_data[enum_name] \
+ " { " quote string quote ", " value ", " val_flags \
+ " },\n"
+ }
else {
name = opt_args("Mask", $1)
if (name == "") {
print "#include " quote "opts.h" quote
print "#include " quote "intl.h" quote
print ""
-print "#ifdef GCC_DRIVER"
-print "int target_flags;"
-print "#else"
+print "#ifndef GCC_DRIVER"
print "#include " quote "flags.h" quote
print "#include " quote "target.h" quote
print "#endif /* GCC_DRIVER */"
print ""
+if (n_extra_c_includes > 0) {
+ for (i = 0; i < n_extra_c_includes; i++) {
+ print "#include " quote extra_c_includes[i] quote
+ }
+ print ""
+}
+
+for (i = 0; i < n_enums; i++) {
+ name = enum_names[i]
+ type = enum_type[name]
+ print "static const struct cl_enum_arg cl_enum_" name \
+ "_data[] = "
+ print "{"
+ print enum_data[name] " { NULL, 0, 0 }"
+ print "};"
+ print ""
+ print "static void"
+ print "cl_enum_" name "_set (void *var, int value)"
+ print "{"
+ print " *((" type " *) var) = (" type ") value;"
+ print "}"
+ print ""
+ print "static int"
+ print "cl_enum_" name "_get (const void *var)"
+ print "{"
+ print " return (int) *((const " type " *) var);"
+ print "}"
+ print ""
+}
+
+print "const struct cl_enum cl_enums[] ="
+print "{"
+for (i = 0; i < n_enums; i++) {
+ name = enum_names[i]
+ ehelp = enum_help[name]
+ if (ehelp == "")
+ ehelp = "NULL"
+ else
+ ehelp = quote ehelp quote
+ unknown_error = enum_unknown_error[name]
+ if (unknown_error == "")
+ unknown_error = "NULL"
+ else
+ unknown_error = quote unknown_error quote
+ print " {"
+ print " " ehelp ","
+ print " " unknown_error ","
+ print " cl_enum_" name "_data,"
+ print " sizeof (" enum_type[name] "),"
+ print " cl_enum_" name "_set,"
+ print " cl_enum_" name "_get"
+ print " },"
+}
+print "};"
+print "const unsigned int cl_enums_count = " n_enums ";"
+print ""
+
have_save = 0;
+if (n_extra_target_vars)
+ have_save = 1
+
+print "const struct gcc_options global_options_init =\n{"
+for (i = 0; i < n_extra_vars; i++) {
+ var = extra_vars[i]
+ init = extra_vars[i]
+ if (var ~ "=" ) {
+ sub(".*= *", "", init)
+ sub(" *=.*", "", var)
+ sub("^.*[ *]", "", var)
+ sub("\\[.*\\]$", "", var)
+ } else {
+ init = "0"
+ }
+ var_seen[var] = 1
+ print " " init ", /* " var " */"
+}
for (i = 0; i < n_opts; i++) {
if (flag_set_p("Save", flags[i]))
have_save = 1;
if (name == "")
continue;
- if (flag_set_p("VarExists", flags[i])) {
- # Need it for the gcc driver.
- if (name in var_seen)
- continue;
- init = ""
- gcc_driver = 1
- }
- else {
- init = opt_args("Init", flags[i])
- if (init != "")
- init = " = " init;
- else if (name in var_seen)
- continue;
- gcc_driver = 0
+ init = opt_args("Init", flags[i])
+ if (init != "") {
+ if (name in var_init && var_init[name] != init)
+ print "#error multiple initializers for " name
+ var_init[name] = init
}
+}
+for (i = 0; i < n_opts; i++) {
+ name = var_name(flags[i]);
+ if (name == "")
+ continue;
- if (gcc_driver == 1)
- print "#ifdef GCC_DRIVER"
- print "/* Set by -" opts[i] "."
- print " " help[i] " */"
- print var_type(flags[i]) name init ";"
- if (gcc_driver == 1)
- print "#endif /* GCC_DRIVER */"
- print ""
+ if (name in var_seen)
+ continue;
+
+ if (name in var_init)
+ init = var_init[name]
+ else
+ init = "0"
+
+ print " " init ", /* " name " */"
var_seen[name] = 1;
}
-
-print ""
-print "/* Local state variables. */"
for (i = 0; i < n_opts; i++) {
name = static_var(opts[i], flags[i]);
- if (name != "")
- print "static " var_type(flags[i]) name ";"
+ if (name != "") {
+ print " 0, /* " name " (private state) */"
+ print "#undef x_" name
+ }
}
+print "};"
+print ""
+print "struct gcc_options global_options;"
+print "struct gcc_options global_options_set;"
print ""
print "const char * const lang_names[] =\n{"
for (i = 0; i < n_langs; i++) {
macros[i] = "CL_" langs[i]
- gsub( "[^A-Za-z0-9_]", "X", macros[i] )
+ gsub( "[^" alnum "_]", "X", macros[i] )
s = substr(" ", length (macros[i]))
print " " quote langs[i] quote ","
}
else
hlp = quote help[i] quote;
+ missing_arg_error = opt_args("MissingArgError", flags[i])
+ if (missing_arg_error == "")
+ missing_arg_error = "0"
+ else
+ missing_arg_error = quote missing_arg_error quote
+
+
+ warn_message = opt_args("Warn", flags[i])
+ if (warn_message == "")
+ warn_message = "0"
+ else
+ warn_message = quote warn_message quote
+
+ alias_arg = opt_args("Alias", flags[i])
+ if (alias_arg == "") {
+ if (flag_set_p("Ignore", flags[i]))
+ alias_data = "NULL, NULL, OPT_SPECIAL_ignore"
+ else
+ alias_data = "NULL, NULL, N_OPTS"
+ } else {
+ alias_opt = nth_arg(0, alias_arg)
+ alias_posarg = nth_arg(1, alias_arg)
+ alias_negarg = nth_arg(2, alias_arg)
+
+ if (var_ref(opts[i], flags[i]) != "-1")
+ print "#error Alias setting variable"
+
+ if (alias_posarg != "" && alias_negarg == "") {
+ if (!flag_set_p("RejectNegative", flags[i]) \
+ && opts[i] ~ "^[Wfm]")
+ print "#error Alias with single argument " \
+ "allowing negative form"
+ }
+
+ alias_opt = opt_enum(alias_opt)
+ if (alias_posarg == "")
+ alias_posarg = "NULL"
+ else
+ alias_posarg = quote alias_posarg quote
+ if (alias_negarg == "")
+ alias_negarg = "NULL"
+ else
+ alias_negarg = quote alias_negarg quote
+ alias_data = alias_posarg ", " alias_negarg ", " alias_opt
+ }
+
neg = opt_args("Negative", flags[i]);
if (neg != "")
idx = indices[neg]
}
# Split the printf after %u to work around an ia64-hp-hpux11.23
# awk bug.
- printf(" { %c-%s%c,\n %s,\n %s, %u,",
- quote, opts[i], quote, hlp, back_chain[i], len)
+ printf(" { %c-%s%c,\n %s,\n %s,\n %s,\n %s, %s, %u,",
+ quote, opts[i], quote, hlp, missing_arg_error, warn_message,
+ alias_data, back_chain[i], len)
printf(" %d,\n", idx)
condition = opt_args("Condition", flags[i])
cl_flags = switch_flags(flags[i])
print "";
print "/* Save optimization variables into a structure. */"
print "void";
-print "cl_optimization_save (struct cl_optimization *ptr)";
+print "cl_optimization_save (struct cl_optimization *ptr, struct gcc_options *opts)";
print "{";
n_opt_char = 2;
n_opt_short = 0;
n_opt_int = 0;
+n_opt_enum = 1;
n_opt_other = 0;
var_opt_char[0] = "optimize";
var_opt_char[1] = "optimize_size";
var_opt_range["optimize"] = "0, 255";
var_opt_range["optimize_size"] = "0, 255";
+var_opt_enum[0] = "flag_fp_contract_mode";
# Sort by size to mimic how the structure is laid out to be friendlier to the
# cache.
else if (otype ~ "^((un)?signed +)?short *$")
var_opt_short[n_opt_short++] = name;
+ else if (otype ~ ("^enum +[_" alnum "]+ *"))
+ var_opt_enum[n_opt_enum++] = name;
+
else if (otype ~ "^((un)?signed +)?char *$") {
var_opt_char[n_opt_char++] = name;
if (otype ~ "^unsigned +char *$")
for (i = 0; i < n_opt_char; i++) {
name = var_opt_char[i];
if (var_opt_range[name] != "")
- print " gcc_assert (IN_RANGE (" name ", " var_opt_range[name] "));";
+ print " gcc_assert (IN_RANGE (opts->x_" name ", " var_opt_range[name] "));";
}
print "";
for (i = 0; i < n_opt_other; i++) {
- print " ptr->" var_opt_other[i] " = " var_opt_other[i] ";";
+ print " ptr->x_" var_opt_other[i] " = opts->x_" var_opt_other[i] ";";
}
for (i = 0; i < n_opt_int; i++) {
- print " ptr->" var_opt_int[i] " = " var_opt_int[i] ";";
+ print " ptr->x_" var_opt_int[i] " = opts->x_" var_opt_int[i] ";";
+}
+
+for (i = 0; i < n_opt_enum; i++) {
+ print " ptr->x_" var_opt_enum[i] " = opts->x_" var_opt_enum[i] ";";
}
for (i = 0; i < n_opt_short; i++) {
- print " ptr->" var_opt_short[i] " = " var_opt_short[i] ";";
+ print " ptr->x_" var_opt_short[i] " = opts->x_" var_opt_short[i] ";";
}
for (i = 0; i < n_opt_char; i++) {
- print " ptr->" var_opt_char[i] " = " var_opt_char[i] ";";
+ print " ptr->x_" var_opt_char[i] " = opts->x_" var_opt_char[i] ";";
}
print "}";
print "";
print "/* Restore optimization options from a structure. */";
print "void";
-print "cl_optimization_restore (struct cl_optimization *ptr)";
+print "cl_optimization_restore (struct gcc_options *opts, struct cl_optimization *ptr)";
print "{";
for (i = 0; i < n_opt_other; i++) {
- print " " var_opt_other[i] " = ptr->" var_opt_other[i] ";";
+ print " opts->x_" var_opt_other[i] " = ptr->x_" var_opt_other[i] ";";
}
for (i = 0; i < n_opt_int; i++) {
- print " " var_opt_int[i] " = ptr->" var_opt_int[i] ";";
+ print " opts->x_" var_opt_int[i] " = ptr->x_" var_opt_int[i] ";";
+}
+
+for (i = 0; i < n_opt_enum; i++) {
+ print " opts->x_" var_opt_enum[i] " = ptr->x_" var_opt_enum[i] ";";
}
for (i = 0; i < n_opt_short; i++) {
- print " " var_opt_short[i] " = ptr->" var_opt_short[i] ";";
+ print " opts->x_" var_opt_short[i] " = ptr->x_" var_opt_short[i] ";";
}
for (i = 0; i < n_opt_char; i++) {
- print " " var_opt_char[i] " = ptr->" var_opt_char[i] ";";
+ print " opts->x_" var_opt_char[i] " = ptr->x_" var_opt_char[i] ";";
}
print " targetm.override_options_after_change ();";
print " fputs (\"\\n\", file);";
for (i = 0; i < n_opt_other; i++) {
- print " if (ptr->" var_opt_other[i] ")";
- print " fprintf (file, \"%*s%s (0x%lx)\\n\",";
+ print " if (ptr->x_" var_opt_other[i] ")";
+ print " fprintf (file, \"%*s%s (%#lx)\\n\",";
print " indent_to, \"\",";
print " \"" var_opt_other[i] "\",";
- print " (unsigned long)ptr->" var_opt_other[i] ");";
+ print " (unsigned long)ptr->x_" var_opt_other[i] ");";
print "";
}
for (i = 0; i < n_opt_int; i++) {
- print " if (ptr->" var_opt_int[i] ")";
- print " fprintf (file, \"%*s%s (0x%x)\\n\",";
+ print " if (ptr->x_" var_opt_int[i] ")";
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
print " indent_to, \"\",";
print " \"" var_opt_int[i] "\",";
- print " ptr->" var_opt_int[i] ");";
+ print " ptr->x_" var_opt_int[i] ");";
+ print "";
+}
+
+for (i = 0; i < n_opt_enum; i++) {
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
+ print " indent_to, \"\",";
+ print " \"" var_opt_enum[i] "\",";
+ print " (int) ptr->x_" var_opt_enum[i] ");";
print "";
}
for (i = 0; i < n_opt_short; i++) {
- print " if (ptr->" var_opt_short[i] ")";
- print " fprintf (file, \"%*s%s (0x%x)\\n\",";
+ print " if (ptr->x_" var_opt_short[i] ")";
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
print " indent_to, \"\",";
print " \"" var_opt_short[i] "\",";
- print " ptr->" var_opt_short[i] ");";
+ print " ptr->x_" var_opt_short[i] ");";
print "";
}
for (i = 0; i < n_opt_char; i++) {
- print " if (ptr->" var_opt_char[i] ")";
- print " fprintf (file, \"%*s%s (0x%x)\\n\",";
+ print " if (ptr->x_" var_opt_char[i] ")";
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
print " indent_to, \"\",";
print " \"" var_opt_char[i] "\",";
- print " ptr->" var_opt_char[i] ");";
+ print " ptr->x_" var_opt_char[i] ");";
print "";
}
print "";
print "/* Save selected option variables into a structure. */"
print "void";
-print "cl_target_option_save (struct cl_target_option *ptr)";
+print "cl_target_option_save (struct cl_target_option *ptr, struct gcc_options *opts)";
print "{";
n_target_char = 0;
n_target_short = 0;
n_target_int = 0;
+n_target_enum = 0;
n_target_other = 0;
if (have_save) {
else if (otype ~ "^((un)?signed +)?short *$")
var_target_short[n_target_short++] = name;
+ else if (otype ~ ("^enum +[_" alnum "]+ *$"))
+ var_target_enum[n_target_enum++] = name;
+
else if (otype ~ "^((un)?signed +)?char *$") {
var_target_char[n_target_char++] = name;
if (otype ~ "^unsigned +char *$")
name = var_target_char[i];
if (var_target_range[name] != "") {
have_assert = 1;
- print " gcc_assert (IN_RANGE (" name ", " var_target_range[name] "));";
+ print " gcc_assert (IN_RANGE (opts->x_" name ", " var_target_range[name] "));";
}
}
print " targetm.target_option.save (ptr);";
print "";
+for (i = 0; i < n_extra_target_vars; i++) {
+ print " ptr->x_" extra_target_vars[i] " = opts->x_" extra_target_vars[i] ";";
+}
+
for (i = 0; i < n_target_other; i++) {
- print " ptr->" var_target_other[i] " = " var_target_other[i] ";";
+ print " ptr->x_" var_target_other[i] " = opts->x_" var_target_other[i] ";";
+}
+
+for (i = 0; i < n_target_enum; i++) {
+ print " ptr->x_" var_target_enum[i] " = opts->x_" var_target_enum[i] ";";
}
for (i = 0; i < n_target_int; i++) {
- print " ptr->" var_target_int[i] " = " var_target_int[i] ";";
+ print " ptr->x_" var_target_int[i] " = opts->x_" var_target_int[i] ";";
}
for (i = 0; i < n_target_short; i++) {
- print " ptr->" var_target_short[i] " = " var_target_short[i] ";";
+ print " ptr->x_" var_target_short[i] " = opts->x_" var_target_short[i] ";";
}
for (i = 0; i < n_target_char; i++) {
- print " ptr->" var_target_char[i] " = " var_target_char[i] ";";
+ print " ptr->x_" var_target_char[i] " = opts->x_" var_target_char[i] ";";
}
print "}";
print "";
print "/* Restore selected current options from a structure. */";
print "void";
-print "cl_target_option_restore (struct cl_target_option *ptr)";
+print "cl_target_option_restore (struct gcc_options *opts, struct cl_target_option *ptr)";
print "{";
+for (i = 0; i < n_extra_target_vars; i++) {
+ print " opts->x_" extra_target_vars[i] " = ptr->x_" extra_target_vars[i] ";";
+}
+
for (i = 0; i < n_target_other; i++) {
- print " " var_target_other[i] " = ptr->" var_target_other[i] ";";
+ print " opts->x_" var_target_other[i] " = ptr->x_" var_target_other[i] ";";
+}
+
+for (i = 0; i < n_target_enum; i++) {
+ print " opts->x_" var_target_enum[i] " = ptr->x_" var_target_enum[i] ";";
}
for (i = 0; i < n_target_int; i++) {
- print " " var_target_int[i] " = ptr->" var_target_int[i] ";";
+ print " opts->x_" var_target_int[i] " = ptr->x_" var_target_int[i] ";";
}
for (i = 0; i < n_target_short; i++) {
- print " " var_target_short[i] " = ptr->" var_target_short[i] ";";
+ print " opts->x_" var_target_short[i] " = ptr->x_" var_target_short[i] ";";
}
for (i = 0; i < n_target_char; i++) {
- print " " var_target_char[i] " = ptr->" var_target_char[i] ";";
+ print " opts->x_" var_target_char[i] " = ptr->x_" var_target_char[i] ";";
}
# This must occur after the normal variables in case the code depends on those
print " fputs (\"\\n\", file);";
for (i = 0; i < n_target_other; i++) {
- print " if (ptr->" var_target_other[i] ")";
- print " fprintf (file, \"%*s%s (0x%lx)\\n\",";
+ print " if (ptr->x_" var_target_other[i] ")";
+ print " fprintf (file, \"%*s%s (%#lx)\\n\",";
print " indent, \"\",";
print " \"" var_target_other[i] "\",";
- print " (unsigned long)ptr->" var_target_other[i] ");";
+ print " (unsigned long)ptr->x_" var_target_other[i] ");";
+ print "";
+}
+
+for (i = 0; i < n_target_enum; i++) {
+ print " if (ptr->x_" var_target_enum[i] ")";
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
+ print " indent, \"\",";
+ print " \"" var_target_enum[i] "\",";
+ print " ptr->x_" var_target_enum[i] ");";
print "";
}
for (i = 0; i < n_target_int; i++) {
- print " if (ptr->" var_target_int[i] ")";
- print " fprintf (file, \"%*s%s (0x%x)\\n\",";
+ print " if (ptr->x_" var_target_int[i] ")";
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
print " indent, \"\",";
print " \"" var_target_int[i] "\",";
- print " ptr->" var_target_int[i] ");";
+ print " ptr->x_" var_target_int[i] ");";
print "";
}
for (i = 0; i < n_target_short; i++) {
- print " if (ptr->" var_target_short[i] ")";
- print " fprintf (file, \"%*s%s (0x%x)\\n\",";
+ print " if (ptr->x_" var_target_short[i] ")";
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
print " indent, \"\",";
print " \"" var_target_short[i] "\",";
- print " ptr->" var_target_short[i] ");";
+ print " ptr->x_" var_target_short[i] ");";
print "";
}
for (i = 0; i < n_target_char; i++) {
- print " if (ptr->" var_target_char[i] ")";
- print " fprintf (file, \"%*s%s (0x%x)\\n\",";
+ print " if (ptr->x_" var_target_char[i] ")";
+ print " fprintf (file, \"%*s%s (%#x)\\n\",";
print " indent, \"\",";
print " \"" var_target_char[i] "\",";
- print " ptr->" var_target_char[i] ");";
+ print " ptr->x_" var_target_char[i] ");";
print "";
}
OSDN Git Service
