X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=9d989ad5ce7f8456470ed8aaf394a063fc2a98b8;hb=127a634aa53da8c37ee50f365184cccad67df0d8;hp=9ed9ea8f8e8a2d45db3490dc360163baa6b92ebc;hpb=d67ff7fe25b02c42a3ad7fac384668d0f4e6f1f7;p=cparser diff --git a/main.c b/main.c index 9ed9ea8..9d989ad 100644 --- a/main.c +++ b/main.c @@ -98,26 +98,26 @@ #define ASSEMBLER "gcc -c -xassembler" #endif -unsigned int c_mode = _C89 | _ANSI | _C99 | _GNUC; -unsigned int machine_size = 32; -bool byte_order_big_endian = false; -bool char_is_signed = true; -bool strict_mode = false; -atomic_type_kind_t wchar_atomic_kind = ATOMIC_TYPE_INT; -unsigned long_double_size = 0; -bool enable_main_collect2_hack = false; -bool freestanding = false; +unsigned int c_mode = _C89 | _ANSI | _C99 | _GNUC; +bool byte_order_big_endian = false; +bool strict_mode = false; +bool enable_main_collect2_hack = false; +bool freestanding = false; +unsigned architecture_modulo_shift = 0; + +static bool char_is_signed = true; +static atomic_type_kind_t wchar_atomic_kind = ATOMIC_TYPE_INT; static machine_triple_t *target_machine; static const char *target_triple; static int verbose; -static bool use_builtins; static struct obstack cppflags_obst; static struct obstack ldflags_obst; static struct obstack asflags_obst; static char dep_target[1024]; static const char *outname; static bool define_intmax_types; +static const char *input_encoding; typedef enum lang_standard_t { STANDARD_DEFAULT, /* gnu99 (for C, GCC does gnu89) or gnu++98 (for C++) */ @@ -179,33 +179,30 @@ static void get_output_name(char *buf, size_t buflen, const char *inputname, panic("filename too long"); } -#include "gen_builtins.h" - static translation_unit_t *do_parsing(FILE *const in, const char *const input_name) { start_parsing(); - if (use_builtins) { - lexer_open_buffer(builtins, sizeof(builtins)-1, ""); - parse(); - } - - lexer_open_stream(in, input_name); + input_t *input = input_from_stream(in, input_encoding); + lexer_switch_input(input, input_name); parse(); - translation_unit_t *unit = finish_parsing(); + input_free(input); + return unit; } static void lextest(FILE *in, const char *fname) { - lexer_open_stream(in, fname); + input_t *input = input_from_stream(in, input_encoding); + lexer_switch_input(input, fname); do { lexer_next_preprocessing_token(); print_token(stdout, &lexer_token); putchar('\n'); - } while (lexer_token.type != T_EOF); + } while (lexer_token.kind != T_EOF); + input_free(input); } static void add_flag(struct obstack *obst, const char *format, ...) @@ -342,7 +339,7 @@ static FILE *preprocess(const char *fname, filetype_t filetype) fprintf(stderr, "invoking preprocessor failed\n"); exit(EXIT_FAILURE); } - /* we don't really need that anymore */ + /* we do not really need that anymore */ obstack_free(&cppflags_obst, commandline); return f; @@ -473,13 +470,13 @@ static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix) int fd = mkstemp(buffer); if (fd == -1) { - fprintf(stderr, "couldn't create temporary file: %s\n", + fprintf(stderr, "could not create temporary file: %s\n", strerror(errno)); exit(EXIT_FAILURE); } FILE *out = fdopen(fd, "w"); if (out == NULL) { - fprintf(stderr, "couldn't create temporary file FILE*\n"); + fprintf(stderr, "could not create temporary file FILE*\n"); exit(EXIT_FAILURE); } @@ -579,7 +576,7 @@ static void print_help_basic(const char *argv0) put_choice("assembler", "Assembler (no preprocessing)"); put_choice("assembler-with-cpp", "Assembler with preprocessing"); put_choice("none", "Autodetection"); - put_help("-pipe", "ignored (gcc compatibility)"); + put_help("-pipe", "Ignored (gcc compatibility)"); } static void print_help_preprocessor(void) @@ -591,7 +588,7 @@ static void print_help_preprocessor(void) put_help("-I PATH", ""); put_help("-D SYMBOL[=value]", ""); put_help("-U SYMBOL", ""); - put_help("-Wp,OPTION", "pass option directly to preprocessor"); + put_help("-Wp,OPTION", "Pass option directly to preprocessor"); put_help("-M", ""); put_help("-MD", ""); put_help("-MMD", ""); @@ -605,10 +602,11 @@ static void print_help_preprocessor(void) static void print_help_parser(void) { put_help("-finput-charset=CHARSET", "Select encoding of input files"); - put_help("-fmessage-length=LEN", "ignored (gcc compatibility)"); - put_help("-fshort-wchar", "wchar_t is unsigned short instead of int"); - put_help("-fshow-column", "show the column number in diagnostic messages"); - put_help("-funsigned-char", "char is an unsigned type"); + put_help("-fmessage-length=LEN", "Ignored (gcc compatibility)"); + put_help("-fshort-wchar", "Type \"wchar_t\" is unsigned short instead of int"); + put_help("-fshow-column", "Show the column number in diagnostic messages"); + put_help("-fsigned-char", "Type \"char\" is a signed type"); + put_help("-funsigned-char", "Type \"char\" is an unsigned type"); put_help("--ms", "Enable msvc extensions"); put_help("--no-ms", "Disable msvc extensions"); put_help("--gcc", "Enable gcc extensions"); @@ -616,34 +614,42 @@ static void print_help_parser(void) put_help("-std=STANDARD", "Specify language standard:"); put_choice("c99", "ISO C99 standard"); put_choice("c89", "ISO C89 standard"); - put_choice("c9x", "deprecated"); + put_choice("c9x", "Deprecated"); put_choice("c++", "ISO C++ 98"); put_choice("c++98", "ISO C++ 98"); put_choice("gnu99", "ISO C99 + GNU extensions (default)"); put_choice("gnu89", "ISO C89 + GNU extensions"); - put_choice("gnu9x", "deprecated"); + put_choice("gnu9x", "Deprecated"); put_choice("iso9899:1990", "ISO C89"); put_choice("iso9899:199409", "ISO C90"); put_choice("iso9899:1999", "ISO C99"); - put_choice("iso9899:199x", "deprecated"); - put_help("-pedantic", "ignored (gcc compatibility)"); - put_help("-ansi", "ignored (gcc compatibility)"); + put_choice("iso9899:199x", "Deprecated"); + put_help("-pedantic", "Ignored (gcc compatibility)"); + put_help("-ansi", "Ignored (gcc compatibility)"); put_help("--strict", "Enable strict conformance checking"); } static void print_help_warnings(void) { - put_help("-w", "disable all warnings"); - put_help("-Wno-trigraphs", "warn if input contains trigraphs"); - put_help("-Wundef", "Warn if an undefined macro is used in an #if"); + put_help("-f[no-]diagnostics-show-option", "Show the switch, which controls a warning, after each warning"); + put_help("-w", "Disable all warnings"); + put_help("-Wno-trigraphs", "Warn if input contains trigraphs"); + put_help("-Wundef", "Warn if an undefined macro is used in an #if"); + put_help("-Wmissing-include-dirs", "Warn about missing user-specified include directories"); + put_help("-Wendif-labels", "Warn about stray text after #elif and #endif"); + put_help("-Winit-self", "Ignored (gcc compatibility)"); + put_help("-Wformat-y2k", "Ignored (gcc compatibility)"); + put_help("-Wformat-security", "Ignored (gcc compatibility)"); + put_help("-Wold-style-declaration", "Ignored (gcc compatibility)"); + put_help("-Wtype-limits", "Ignored (gcc compatibility)"); print_warning_opt_help(); } static void print_help_optimization(void) { - put_help("-O LEVEL", "select optimization level (0-4)"); + put_help("-O LEVEL", "Select optimization level (0-4)"); firm_option_help(put_help); - put_help("-fexpensive-optimizations","ignored (gcc compatibility)"); + put_help("-fexpensive-optimizations","Ignored (gcc compatibility)"); } static void print_help_codegeneration(void) @@ -651,39 +657,38 @@ static void print_help_codegeneration(void) put_help("-g", "Generate debug information"); put_help("-pg", "Instrument code for gnu gprof"); put_help("-fomit-frame-pointer", "Produce code without frame pointer where possible"); - put_help("-ffreestanding", "compile in freestanding mode (see ISO C standard)"); - put_help("-fhosted", "compile in hosted (not freestanding) mode"); + put_help("-ffreestanding", "Compile in freestanding mode (see ISO C standard)"); + put_help("-fhosted", "Compile in hosted (not freestanding) mode"); put_help("-fprofile-generate", "Generate instrumented code to collect profile information"); put_help("-fprofile-use", "Use profile information generated by instrumented binaries"); - put_help("-ffp-precise", "precise floating point model"); - put_help("-ffp-fast", "imprecise floating point model"); - put_help("-ffp-strict", "strict floating point model"); - put_help("-ffp-precise", "precise floating point model"); + put_help("-ffp-precise", "Precise floating point model"); + put_help("-ffp-fast", "Imprecise floating point model"); + put_help("-ffp-strict", "Strict floating point model"); put_help("-pthread", "Use pthread threading library"); put_help("-mtarget=TARGET", "Specify target architecture as CPU-manufacturer-OS triple"); - put_help("-mtriple=TARGET", "alias for -mtarget (clang compatibility)"); + put_help("-mtriple=TARGET", "Alias for -mtarget (clang compatibility)"); put_help("-march=ARCH", ""); put_help("-mtune=ARCH", ""); put_help("-mcpu=CPU", ""); put_help("-mfpmath=", ""); put_help("-mpreferred-stack-boundary=", ""); put_help("-mrtd", ""); - put_help("-mregparm=", "not supported yet"); - put_help("-msoft-float", "not supported yet"); - put_help("-m32", "generate 32bit code"); - put_help("-m64", "generate 64bit code"); - put_help("-fverbose-asm", "ignored (gcc compatibility)"); - put_help("-fjump-tables", "ignored (gcc compatibility)"); - put_help("-fcommon", "ignored (gcc compatibility)"); - put_help("-foptimize-sibling-calls", "ignored (gcc compatibility)"); - put_help("-falign-loops", "ignored (gcc compatibility)"); - put_help("-falign-jumps", "ignored (gcc compatibility)"); - put_help("-falign-functions", "ignored (gcc compatibility)"); - put_help("-fPIC", "ignored (gcc compatibility)"); - put_help("-ffast-math", "same as fp-fast (gcc compatibility)"); + put_help("-mregparm=", "Not supported yet"); + put_help("-msoft-float", "Not supported yet"); + put_help("-m32", "Generate 32bit code"); + put_help("-m64", "Generate 64bit code"); + put_help("-fverbose-asm", "Ignored (gcc compatibility)"); + put_help("-fjump-tables", "Ignored (gcc compatibility)"); + put_help("-fcommon", "Ignored (gcc compatibility)"); + put_help("-foptimize-sibling-calls", "Ignored (gcc compatibility)"); + put_help("-falign-loops", "Ignored (gcc compatibility)"); + put_help("-falign-jumps", "Ignored (gcc compatibility)"); + put_help("-falign-functions", "Ignored (gcc compatibility)"); + put_help("-fPIC", "Ignored (gcc compatibility)"); + put_help("-ffast-math", "Same as -ffp-fast (gcc compatibility)"); puts(""); puts("\tMost of these options can be used with a no- prefix to disable them"); - puts("\te.g. -fno-signed-char"); + puts("\te.g. -fno-omit-frame-pointer"); } static void print_help_linker(void) @@ -692,7 +697,7 @@ static void print_help_linker(void) put_help("-L PATH", ""); put_help("-shared", "Produce a shared library"); put_help("-static", "Produce statically linked binary"); - put_help("-Wl,OPTION", "pass option directly to linker"); + put_help("-Wl,OPTION", "Pass option directly to linker"); } static void print_help_debug(void) @@ -717,7 +722,7 @@ static void print_help_language_tools(void) static void print_help_firm(void) { - put_help("-bOPTION", "directly pass option to libFirm backend"); + put_help("-bOPTION", "Directly pass option to libFirm backend"); int res = be_parse_arg("help"); (void) res; assert(res); @@ -767,7 +772,7 @@ static void copy_file(FILE *dest, FILE *input) while (!feof(input) && !ferror(dest)) { size_t read = fread(buf, 1, sizeof(buf), input); if (fwrite(buf, 1, read, dest) != read) { - perror("couldn't write output"); + perror("could not write output"); } } } @@ -780,7 +785,7 @@ static FILE *open_file(const char *filename) FILE *in = fopen(filename, "r"); if (in == NULL) { - fprintf(stderr, "Couldn't open '%s': %s\n", filename, + fprintf(stderr, "Could not open '%s': %s\n", filename, strerror(errno)); exit(EXIT_FAILURE); } @@ -804,6 +809,22 @@ static filetype_t get_filetype_from_string(const char *string) return FILETYPE_UNKNOWN; } +static bool is_windows_os(const char *os) +{ + return strstr(os, "mingw") != NULL || streq(os, "win32"); +} + +static bool is_unixish_os(const char *os) +{ + return strstr(os, "linux") != NULL || strstr(os, "bsd") != NULL + || streq(os, "solaris"); +} + +static bool is_darwin_os(const char *os) +{ + return streq(os, "darwin"); +} + static bool init_os_support(void) { const char *os = target_machine->operating_system; @@ -811,14 +832,12 @@ static bool init_os_support(void) enable_main_collect2_hack = false; define_intmax_types = false; - if (strstr(os, "linux") != NULL || strstr(os, "bsd") != NULL - || streq(os, "solaris")) { + if (is_unixish_os(os)) { set_create_ld_ident(create_name_linux_elf); - } else if (streq(os, "darwin")) { - long_double_size = 16; + } else if (is_darwin_os(os)) { set_create_ld_ident(create_name_macho); define_intmax_types = true; - } else if (strstr(os, "mingw") != NULL || streq(os, "win32")) { + } else if (is_windows_os(os)) { wchar_atomic_kind = ATOMIC_TYPE_USHORT; enable_main_collect2_hack = true; set_create_ld_ident(create_name_win32); @@ -840,22 +859,186 @@ static bool parse_target_triple(const char *arg) return true; } -static void setup_target_machine(void) +static unsigned decide_modulo_shift(unsigned type_size) +{ + if (architecture_modulo_shift == 0) + return 0; + if (type_size < architecture_modulo_shift) + return architecture_modulo_shift; + return type_size; +} + +static bool is_ia32_cpu(const char *architecture) +{ + return streq(architecture, "i386") + || streq(architecture, "i486") + || streq(architecture, "i586") + || streq(architecture, "i686") + || streq(architecture, "i786"); +} + +static const char *setup_isa_from_tripel(const machine_triple_t *machine) +{ + const char *cpu = machine->cpu_type; + + if (is_ia32_cpu(cpu)) { + return "ia32"; + } else if (streq(cpu, "x86_64")) { + return "amd64"; + } else if (streq(cpu, "sparc")) { + return "sparc"; + } else if (streq(cpu, "arm")) { + return "arm"; + } else { + fprintf(stderr, "Unknown cpu '%s' in target-triple\n", cpu); + return NULL; + } +} + +static const char *setup_target_machine(void) { if (!setup_firm_for_machine(target_machine)) exit(1); - const backend_params *be_params = be_get_backend_param(); - if (be_params->long_double_size % 8 != 0) { - fprintf(stderr, "firm-target long double size is not a multiple of 8, can't handle this\n"); + const char *isa = setup_isa_from_tripel(target_machine); + + if (isa == NULL) exit(1); + + init_os_support(); + + return isa; +} + +/** + * initialize cparser type properties based on a firm type + */ +static void set_typeprops_type(atomic_type_properties_t* props, ir_type *type) +{ + props->size = get_type_size_bytes(type); + props->alignment = get_type_alignment_bytes(type); + props->struct_alignment = props->alignment; +} + +/** + * Copy atomic type properties except the integer conversion rank + */ +static void copy_typeprops(atomic_type_properties_t *dest, + const atomic_type_properties_t *src) +{ + dest->size = src->size; + dest->alignment = src->alignment; + dest->struct_alignment = src->struct_alignment; + dest->flags = src->flags; +} + +static void init_types_and_adjust(void) +{ + const backend_params *be_params = be_get_backend_param(); + unsigned machine_size = be_params->machine_size; + init_types(machine_size); + + atomic_type_properties_t *props = atomic_type_properties; + + /* adjust types as requested by target architecture */ + ir_type *type_long_double = be_params->type_long_double; + if (type_long_double != NULL) + set_typeprops_type(&props[ATOMIC_TYPE_LONG_DOUBLE], type_long_double); + + ir_type *type_long_long = be_params->type_long_long; + if (type_long_long != NULL) + set_typeprops_type(&props[ATOMIC_TYPE_LONGLONG], type_long_long); + + ir_type *type_unsigned_long_long = be_params->type_unsigned_long_long; + if (type_long_long != NULL) + set_typeprops_type(&props[ATOMIC_TYPE_ULONGLONG], type_unsigned_long_long); + + /* operating system ABI specifics */ + const char *os = target_machine->operating_system; + if (is_darwin_os(os)) { + if (machine_size == 32) { + props[ATOMIC_TYPE_DOUBLE].struct_alignment = 4; + props[ATOMIC_TYPE_LONG_DOUBLE].size = 16; + props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 16; + } + } else if (is_windows_os(os)) { + if (machine_size == 64) { + /* to ease porting of old c-code microsoft decided to use 32bits + * even for long */ + props[ATOMIC_TYPE_LONG] = props[ATOMIC_TYPE_INT]; + props[ATOMIC_TYPE_ULONG] = props[ATOMIC_TYPE_UINT]; + } + + /* on windows long double is not supported */ + props[ATOMIC_TYPE_LONG_DOUBLE] = props[ATOMIC_TYPE_DOUBLE]; + } else if (is_unixish_os(os)) { + if (is_ia32_cpu(target_machine->cpu_type)) { + /* System V has a broken alignment for double so we have to add + * a hack here */ + props[ATOMIC_TYPE_DOUBLE].struct_alignment = 4; + props[ATOMIC_TYPE_LONGLONG].struct_alignment = 4; + props[ATOMIC_TYPE_ULONGLONG].struct_alignment = 4; + } } - byte_order_big_endian = be_params->byte_order_big_endian; - machine_size = be_params->machine_size; - long_double_size = be_params->long_double_size / 8; + /* stuff decided after processing operating system specifics and + * commandline flags */ + if (char_is_signed) { + props[ATOMIC_TYPE_CHAR].flags |= ATOMIC_TYPE_FLAG_SIGNED; + } else { + props[ATOMIC_TYPE_CHAR].flags &= ~ATOMIC_TYPE_FLAG_SIGNED; + } + /* copy over wchar_t properties (including rank) */ + props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind]; - init_os_support(); + /* initialize defaults for unsupported types */ + if (type_long_long == NULL) { + copy_typeprops(&props[ATOMIC_TYPE_LONGLONG], &props[ATOMIC_TYPE_LONG]); + } + if (type_unsigned_long_long == NULL) { + copy_typeprops(&props[ATOMIC_TYPE_ULONGLONG], + &props[ATOMIC_TYPE_ULONG]); + } + if (type_long_double == NULL) { + copy_typeprops(&props[ATOMIC_TYPE_LONG_DOUBLE], + &props[ATOMIC_TYPE_DOUBLE]); + } + + /* initialize firm pointer modes */ + char name[64]; + ir_mode_sort sort = irms_reference; + unsigned bit_size = machine_size; + bool is_signed = 0; + ir_mode_arithmetic arithmetic = irma_twos_complement; + unsigned modulo_shift = decide_modulo_shift(bit_size); + + snprintf(name, sizeof(name), "p%u", machine_size); + ir_mode *ptr_mode = new_ir_mode(name, sort, bit_size, is_signed, arithmetic, + modulo_shift); + + if (machine_size == 16) { + set_reference_mode_signed_eq(ptr_mode, mode_Hs); + set_reference_mode_unsigned_eq(ptr_mode, mode_Hu); + } else if (machine_size == 32) { + set_reference_mode_signed_eq(ptr_mode, mode_Is); + set_reference_mode_unsigned_eq(ptr_mode, mode_Iu); + } else if (machine_size == 64) { + set_reference_mode_signed_eq(ptr_mode, mode_Ls); + set_reference_mode_unsigned_eq(ptr_mode, mode_Lu); + } else { + panic("strange machine_size when determining pointer modes"); + } + + /* Hmm, pointers should be machine size */ + set_modeP_data(ptr_mode); + set_modeP_code(ptr_mode); + + byte_order_big_endian = be_params->byte_order_big_endian; + if (be_params->modulo_shift_efficient) { + architecture_modulo_shift = machine_size; + } else { + architecture_modulo_shift = 0; + } } int main(int argc, char **argv) @@ -1039,7 +1222,7 @@ int main(int argc, char **argv) if (strstart(orig_opt, "input-charset=")) { char const* const encoding = strchr(orig_opt, '=') + 1; - select_input_encoding(encoding); + input_encoding = encoding; } else if (strstart(orig_opt, "align-loops=") || strstart(orig_opt, "align-jumps=") || strstart(orig_opt, "align-functions=")) { @@ -1057,6 +1240,16 @@ int main(int argc, char **argv) } } else if (strstart(orig_opt, "message-length=")) { /* ignore: would only affect error message format */ + } else if (streq(orig_opt, "fast-math") || + streq(orig_opt, "fp-fast")) { + firm_fp_model = fp_model_fast; + } else if (streq(orig_opt, "fp-precise")) { + firm_fp_model = fp_model_precise; + } else if (streq(orig_opt, "fp-strict")) { + firm_fp_model = fp_model_strict; + } else if (streq(orig_opt, "help")) { + fprintf(stderr, "warning: -fhelp is deprecated\n"); + help |= HELP_OPTIMIZATION; } else { /* -f options which have an -fno- variant */ char const *opt = orig_opt; @@ -1066,8 +1259,8 @@ int main(int argc, char **argv) opt += 3; } - if (streq(opt, "builtins")) { - use_builtins = truth_value; + if (streq(opt, "diagnostics-show-option")) { + diagnostics_show_option = truth_value; } else if (streq(opt, "dollars-in-identifiers")) { allow_dollar_in_symbol = truth_value; } else if (streq(opt, "omit-frame-pointer")) { @@ -1096,16 +1289,10 @@ int main(int argc, char **argv) profile_use = truth_value; } else if (!truth_value && streq(opt, "asynchronous-unwind-tables")) { - /* nothing todo, a gcc feature which we don't support + /* nothing todo, a gcc feature which we do not support * anyway was deactivated */ } else if (streq(opt, "verbose-asm")) { /* ignore: we always print verbose assembler */ - } else if (streq(opt, "fast-math") || streq(opt, "fp-fast")) { - firm_fp_model = fp_model_fast; - } else if (streq(opt, "fp-precise")) { - firm_fp_model = fp_model_precise; - } else if (streq(opt, "fp-strict")) { - firm_fp_model = fp_model_strict; } else if (streq(opt, "jump-tables") || streq(opt, "expensive-optimizations") || streq(opt, "common") || @@ -1113,11 +1300,10 @@ int main(int argc, char **argv) streq(opt, "align-loops") || streq(opt, "align-jumps") || streq(opt, "align-functions") || - streq(opt, "PIC")) { + streq(opt, "PIC") || + streq(opt, "stack-protector") || + streq(opt, "stack-protector-all")) { fprintf(stderr, "ignoring gcc option '-f%s'\n", orig_opt); - } else if (streq(opt, "help")) { - fprintf(stderr, "warning: -fhelp is deprecated\n"); - help |= HELP_OPTIMIZATION; } else { int res = firm_option(orig_opt); if (res == 0) { @@ -1157,8 +1343,17 @@ int main(int argc, char **argv) GET_ARG_AFTER(opt, "-Wl,"); add_flag(&ldflags_obst, "-Wl,%s", opt); } else if (streq(option + 1, "no-trigraphs") - || streq(option + 1, "undef")) { + || streq(option + 1, "undef") + || streq(option + 1, "missing-include-dirs") + || streq(option + 1, "endif-labels")) { add_flag(&cppflags_obst, "%s", arg); + } else if (streq(option+1, "init-self")) { + /* ignored (asme as gcc does) */ + } else if (streq(option+1, "format-y2k") + || streq(option+1, "format-security") + || streq(option+1, "old-style-declaration") + || streq(option+1, "type-limits")) { + /* ignore (gcc compatibility) */ } else { set_warning_opt(&option[1]); } @@ -1173,7 +1368,8 @@ int main(int argc, char **argv) if (!parse_target_triple(opt)) { argument_errors = true; } else { - setup_target_machine(); + const char *isa = setup_target_machine(); + strncpy(cpu_arch, isa, sizeof(cpu_arch)); target_triple = opt; } } else if (strstart(opt, "triple=")) { @@ -1181,7 +1377,8 @@ int main(int argc, char **argv) if (!parse_target_triple(opt)) { argument_errors = true; } else { - setup_target_machine(); + const char *isa = setup_target_machine(); + strncpy(cpu_arch, isa, sizeof(cpu_arch)); target_triple = opt; } } else if (strstart(opt, "arch=")) { @@ -1214,7 +1411,7 @@ int main(int argc, char **argv) else if (streq(opt, "sse")) opt = "sse2"; else { - fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n"); + fprintf(stderr, "error: option -mfpmath supports only 387 or sse\n"); argument_errors = true; } if (!argument_errors) { @@ -1235,8 +1432,11 @@ int main(int argc, char **argv) fprintf(stderr, "error: regparm convention not supported yet\n"); argument_errors = true; } else if (streq(opt, "soft-float")) { - fprintf(stderr, "error: software floatingpoint not supported yet\n"); - argument_errors = true; + add_flag(&ldflags_obst, "-msoft-float"); + snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=softfloat", cpu_arch); + int res = be_parse_arg(arch_opt); + if (res == 0) + argument_errors = true; } else { long int value = strtol(opt, NULL, 10); if (value == 0) { @@ -1246,10 +1446,11 @@ int main(int argc, char **argv) fprintf(stderr, "error: option -m supports only 16, 32 or 64\n"); argument_errors = true; } else { + unsigned machine_size = (unsigned)value; + /* TODO: choose/change backend based on this */ add_flag(&cppflags_obst, "-m%u", machine_size); add_flag(&asflags_obst, "-m%u", machine_size); add_flag(&ldflags_obst, "-m%u", machine_size); - /* TODO: choose/change backend based on this */ } } } else if (streq(option, "pg")) { @@ -1454,9 +1655,15 @@ int main(int argc, char **argv) gen_firm_init(); init_symbol_table(); - init_types(); + init_types_and_adjust(); init_typehash(); init_basic_types(); + if (wchar_atomic_kind == ATOMIC_TYPE_INT) + init_wchar_types(type_int); + else if (wchar_atomic_kind == ATOMIC_TYPE_SHORT) + init_wchar_types(type_short); + else + panic("unexpected wchar type"); init_lexer(); init_ast(); init_parser(); @@ -1525,7 +1732,7 @@ int main(int argc, char **argv) } else { out = fopen(outname, "w"); if (out == NULL) { - fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname, + fprintf(stderr, "Could not open '%s' for writing: %s\n", outname, strerror(errno)); return EXIT_FAILURE; }