X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=c6439794bb3d69acd42e72fc6ac2794e6680ac4e;hb=d4a27091c638acf4f67f8a4f1faf3aac911c7fce;hp=a529a0364ea6b3dc2f5466628f639d3c47d1bdec;hpb=f017f4f5080052f95185056b3af472ab737bc64a;p=cparser

diff --git a/main.c b/main.c
index a529a03..c643979 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <config.h>
 
 #define _GNU_SOURCE
@@ -56,11 +75,12 @@
 #include "driver/firm_cmdline.h"
 #include "adt/error.h"
 #include "write_fluffy.h"
+#include "write_caml.h"
 #include "revision.h"
 #include "warning.h"
 
 #ifndef PREPROCESSOR
-#define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int"
+#define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=__SIZE_TYPE__ -m32 -U__STRICT_ANSI__"
 #endif
 
 #ifndef LINKER
@@ -83,15 +103,36 @@ bool char_is_signed = true;
 /** true for strict language checking. */
 bool strict_mode = false;
 
+/** use builtins for some libc functions */
+bool use_builtins = false;
+
 /* to switch on printing of implicit casts */
 extern bool print_implicit_casts;
 
-/* to switch on printing of  srenthesis to indicate operator precedence */
+/* to switch on printing of parenthesis to indicate operator precedence */
 extern bool print_parenthesis;
 
 static int            verbose;
 static struct obstack cppflags_obst, ldflags_obst;
 
+typedef struct file_list_entry_t file_list_entry_t;
+
+typedef enum filetype_t {
+	FILETYPE_AUTODETECT,
+	FILETYPE_C,
+	FILETYPE_PREPROCESSED_C,
+	FILETYPE_ASSEMBLER,
+	FILETYPE_PREPROCESSED_ASSEMBLER,
+	FILETYPE_OBJECT,
+	FILETYPE_UNKNOWN
+} filetype_t;
+
+struct file_list_entry_t {
+	const char        *name; /**< filename or NULL for stdin */
+	filetype_t         type;
+	file_list_entry_t *next;
+};
+
 #if defined(_DEBUG) || defined(FIRM_DEBUG)
 /**
  * Debug printf implementation.
@@ -147,10 +188,21 @@ static void get_output_name(char *buf, size_t buflen, const char *inputname,
 	memcpy(buf+last_dot, newext, extlen);
 }
 
-static translation_unit_t *do_parsing(FILE *const in, const char *const input)
+#include "builtins.h"
+
+static translation_unit_t *do_parsing(FILE *const in, const char *const input_name)
 {
-	lexer_open_stream(in, input);
-	translation_unit_t *unit = parse();
+	start_parsing();
+
+	if (use_builtins) {
+		lexer_open_buffer(builtins, sizeof(builtins)-1, "<builtin>");
+		parse();
+	}
+
+	lexer_open_stream(in, input_name);
+	parse();
+
+	translation_unit_t *unit = finish_parsing();
 	return unit;
 }
 
@@ -165,45 +217,57 @@ static void lextest(FILE *in, const char *fname)
 	} while(lexer_token.type != T_EOF);
 }
 
-static FILE* preprocess(FILE* in, const char *fname)
+static void add_flag(struct obstack *obst, const char *format, ...)
 {
-	char buf[4096];
-	obstack_1grow(&cppflags_obst, '\0');
-	const char *flags = obstack_finish(&cppflags_obst);
+	va_list ap;
+	va_start(ap, format);
 
-	if(in != stdin) {
-		snprintf(buf, sizeof(buf), PREPROCESSOR " %s %s", flags, fname);
-	} else {
-		/* read from stdin */
-		snprintf(buf, sizeof(buf), PREPROCESSOR " %s -", flags);
+	char buf[4096];
+	vsnprintf(buf, sizeof(buf), format, ap);
+
+	/* escape stuff... */
+	obstack_1grow(obst, ' ');
+	for (char *c = buf; *c != '\0'; ++c) {
+		switch(*c) {
+		case '"':
+		case '\'':
+		case '`':
+		case ' ':
+		case '\t':
+		case '\n':
+		case '\r':
+		case '\\':
+		case '$':
+		case '(':
+		case ')':
+			obstack_1grow(obst, '\\');
+			/* fallthrough */
+		default:
+			obstack_1grow(obst, *c);
+			break;
+		}
 	}
 
-	if(verbose) {
-		puts(buf);
-	}
-	FILE* f = popen(buf, "r");
-	if (f == NULL) {
-		fprintf(stderr, "invoking preprocessor failed\n");
-		exit(1);
-	}
-	return f;
+	va_end(ap);
 }
 
-static void do_link(const char *out, const char *in)
+static FILE *preprocess(const char *fname)
 {
 	char buf[4096];
-	obstack_1grow(&ldflags_obst, '\0');
-	const char *flags = obstack_finish(&ldflags_obst);
+	obstack_1grow(&cppflags_obst, '\0');
+	const char *flags = obstack_finish(&cppflags_obst);
 
-	snprintf(buf, sizeof(buf), LINKER " %s -o %s %s", flags, out, in);
+	snprintf(buf, sizeof(buf), PREPROCESSOR " %s %s", flags, fname);
 	if(verbose) {
 		puts(buf);
 	}
-	int err = system(buf);
-	if(err != 0) {
-		fprintf(stderr, "linker reported an error\n");
+
+	FILE *f = popen(buf, "r");
+	if(f == NULL) {
+		fprintf(stderr, "invoking preprocessor failed\n");
 		exit(1);
 	}
+	return f;
 }
 
 static void assemble(const char *out, const char *in)
@@ -273,19 +337,14 @@ static int mkstemp(char *templ)
 #endif
 
 /**
- * an own version of tmpnam, which: writes in a buffer, appends a user specified
- * suffix, emits no warnings during linking (like glibc/gnu ld do for tmpnam)...
+ * an own version of tmpnam, which: writes in a buffer, emits no warnings
+ * during linking (like glibc/gnu ld do for tmpnam)...
  */
-static FILE *make_temp_file(char *buffer, size_t buflen,
-                            const char *prefix, const char *suffix)
+static FILE *make_temp_file(char *buffer, size_t buflen, const char *prefix)
 {
 	const char *tempdir = get_tempdir();
 
-	/* oh well... mkstemp doesn't accept a suffix after XXXXXX... */
-	(void) suffix;
-	suffix = "";
-
-	snprintf(buffer, buflen, "%s/%sXXXXXX%s", tempdir, prefix, suffix);
+	snprintf(buffer, buflen, "%s/%sXXXXXX", tempdir, prefix);
 
 	int fd = mkstemp(buffer);
 	if(fd == -1) {
@@ -319,6 +378,7 @@ void lower_compound_params(void)
 
 typedef enum compile_mode_t {
 	BenchmarkParser,
+	PreprocessOnly,
 	ParseOnly,
 	Compile,
 	CompileDump,
@@ -326,7 +386,8 @@ typedef enum compile_mode_t {
 	CompileAssembleLink,
 	LexTest,
 	PrintAst,
-	PrintFluffy
+	PrintFluffy,
+	PrintCaml
 } compile_mode_t;
 
 static void usage(const char *argv0)
@@ -334,18 +395,96 @@ static void usage(const char *argv0)
 	fprintf(stderr, "Usage %s input [-o output] [-c]\n", argv0);
 }
 
+static void print_cparser_version(void) {
+	firm_version_t ver;
+	firm_get_version(&ver);
+
+	printf("cparser (%s) using libFirm (%u.%u",
+		cparser_REVISION, ver.major, ver.minor);
+	if(ver.revision[0] != 0) {
+		putchar(' ');
+		fputs(ver.revision, stdout);
+	}
+	if(ver.build[0] != 0) {
+		putchar(' ');
+		fputs(ver.build, stdout);
+	}
+	puts(")\n");
+}
+
+static void set_be_option(const char *arg)
+{
+	int res = firm_be_option(arg);
+	(void) res;
+	assert(res);
+}
+
+static void set_option(const char *arg)
+{
+	int res = firm_option(arg);
+	(void) res;
+	assert(res);
+}
+
+static void copy_file(FILE *dest, FILE *input)
+{
+	char buf[16384];
+
+	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");
+		}
+	}
+}
+
+static FILE *open_file(const char *filename)
+{
+	if (strcmp(filename, "-") == 0) {
+		return stdin;
+	}
+
+	FILE *in = fopen(filename, "r");
+	if(in == NULL) {
+		fprintf(stderr, "Couldn't open '%s': %s\n", filename,
+				strerror(errno));
+		exit(1);
+	}
+
+	return in;
+}
+
+static filetype_t get_filetype_from_string(const char *string)
+{
+	if (strcmp(string, "c") == 0 || strcmp(string, "c-header") == 0)
+		return FILETYPE_C;
+	if (strcmp(string, "assembler") == 0)
+		return FILETYPE_PREPROCESSED_ASSEMBLER;
+	if (strcmp(string, "assembler-with-cpp") == 0)
+		return FILETYPE_ASSEMBLER;
+	if (strcmp(string, "none") == 0)
+		return FILETYPE_AUTODETECT;
+
+	return FILETYPE_UNKNOWN;
+}
+
 int main(int argc, char **argv)
 {
 	initialize_firm();
 
-	const char     *input        = NULL;
-	const char     *outname      = NULL;
-	const char     *dumpfunction = NULL;
-	compile_mode_t  mode         = CompileAssembleLink;
-	int             opt_level    = 1;
+	const char        *outname      = NULL;
+	const char        *dumpfunction = NULL;
+	compile_mode_t     mode         = CompileAssembleLink;
+	int                opt_level    = 1;
+	int                result       = EXIT_SUCCESS;
+	char               cpu_arch[16] = "ia32";
+	file_list_entry_t *files        = NULL;
+	file_list_entry_t *last_file    = NULL;
+	struct obstack     file_obst;
 
 	obstack_init(&cppflags_obst);
 	obstack_init(&ldflags_obst);
+	obstack_init(&file_obst);
 
 #define GET_ARG_AFTER(def, args)                                             \
 	def = &arg[sizeof(args)-1];                                              \
@@ -381,41 +520,46 @@ int main(int argc, char **argv)
 	/* apply optimisation level */
 	switch(opt_level) {
 	case 0:
-		firm_option("no-opt");
+		set_option("no-opt");
 		break;
 	case 1:
-		firm_option("no-inline");
+		set_option("no-inline");
 		break;
 	default:
 	case 4:
-		firm_option("strict-aliasing");
+		set_option("strict-aliasing");
 		/* fallthrough */
 	case 3:
-		firm_option("cond-eval");
-		firm_option("if-conv");
+		set_option("cond-eval");
+		set_option("if-conv");
+		use_builtins = true;
 		/* fallthrough */
 	case 2:
-		firm_option("inline");
-		firm_option("no-strength-red");
-		firm_option("deconv");
-		firm_be_option("omitfp");
+		set_option("inline");
+		set_option("deconv");
+		set_be_option("omitfp");
 		break;
 	}
 
 	/* parse rest of options */
-	bool help_displayed  = false;
-	bool argument_errors = false;
+	filetype_t  forced_filetype = FILETYPE_AUTODETECT;
+	bool        help_displayed  = false;
+	bool        argument_errors = false;
 	for(int i = 1; i < argc; ++i) {
 		const char *arg = argv[i];
-		if(arg[0] == '-') {
+		if(arg[0] == '-' && arg[1] != 0) {
 			/* an option */
 			const char *option = &arg[1];
 			if(option[0] == 'o') {
 				GET_ARG_AFTER(outname, "-o");
 			} else if(option[0] == 'g') {
-				firm_be_option("stabs=yes");
+				set_be_option("debuginfo=stabs");
+				set_be_option("omitfp=no");
+				set_be_option("ia32-nooptcc=yes");
 			} else if(SINGLE_OPTION('c')) {
 				mode = CompileAssemble;
+			} else if(SINGLE_OPTION('E')) {
+				mode = PreprocessOnly;
 			} else if(SINGLE_OPTION('S')) {
 				mode = Compile;
 			} else if(option[0] == 'O') {
@@ -423,38 +567,84 @@ int main(int argc, char **argv)
 			} else if(option[0] == 'I') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-I");
-				obstack_printf(&cppflags_obst, " -I%s", opt);
+				add_flag(&cppflags_obst, "-I%s", opt);
 			} else if(option[0] == 'D') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-D");
-				obstack_printf(&cppflags_obst, " -D%s", opt);
+				add_flag(&cppflags_obst, "-D%s", opt);
 			} else if(option[0] == 'U') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-U");
-				obstack_printf(&cppflags_obst, " -U%s", opt);
+				add_flag(&cppflags_obst, "-U%s", opt);
 			} else if(option[0] == 'l') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-l");
-				obstack_printf(&ldflags_obst, " -l%s", opt);
+				add_flag(&ldflags_obst, "-l%s", opt);
 			} else if(option[0] == 'L') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-L");
-				obstack_printf(&ldflags_obst, " -L%s", opt);
+				add_flag(&ldflags_obst, "-L%s", opt);
 			} else if(SINGLE_OPTION('v')) {
 				verbose = 1;
 			} else if(SINGLE_OPTION('w')) {
 				inhibit_all_warnings = true;
-			} else if(option[0] == 'f') {
+			} else if(option[0] == 'x') {
+				const char *opt;
+				GET_ARG_AFTER(opt, "-x");
+				forced_filetype = get_filetype_from_string(opt);
+				if (forced_filetype == FILETYPE_UNKNOWN) {
+					fprintf(stderr, "Unknown language '%s'\n", opt);
+					argument_errors = true;
+				}
+			} else if(strcmp(option, "M") == 0) {
+				mode = PreprocessOnly;
+				add_flag(&cppflags_obst, "-M");
+			} else if (strcmp(option, "MMD") == 0 ||
+			           strcmp(option, "MD")  == 0 ||
+			           strcmp(option, "MM")  == 0 ||
+			           strcmp(option, "MP")  == 0) {
+				add_flag(&cppflags_obst, "-%s", option);
+			} else if(strcmp(option, "MT") == 0
+					|| strcmp(option, "MQ") == 0
+					|| strcmp(option, "MF") == 0) {
+				const char *opt;
+				GET_ARG_AFTER(opt, "-MT");
+				add_flag(&cppflags_obst, "-%s", option);
+				add_flag(&cppflags_obst, "%s", opt);
+			} else if(strcmp(option, "pipe") == 0) {
+				/* here for gcc compatibility */
+			} else if (option[0] == 'f') {
+				bool truth_value = true;
 				const char *opt;
 				GET_ARG_AFTER(opt, "-f");
+				if (opt[0] == 'n' && opt[1] == 'o' && opt[2] == '-') {
+					truth_value = false;
+					opt += 3;
+				}
 
-				if(strcmp(opt, "syntax-only") == 0) {
+				if (strcmp(opt, "dollars-in-identifiers") == 0) {
+					allow_dollar_in_symbol = truth_value;
+				} else if (strcmp(opt, "short-wchar") == 0) {
+					opt_short_wchar_t = truth_value;
+				} else if (strcmp(opt, "syntax-only") == 0) {
 					mode = ParseOnly;
 				} else if(strcmp(opt, "omit-frame-pointer") == 0) {
-					firm_be_option("omitfp");
-				} else if(strcmp(opt, "no-omit-frame-pointer") == 0) {
-					firm_be_option("omitfp=no");
+					set_be_option(truth_value ? "omitfp" : "omitfp=no");
+				} else if(strcmp(opt, "strength-reduce") == 0) {
+					firm_option("strength-red");
+				} else if (strcmp(opt, "fast-math") == 0
+						|| strcmp(opt, "jump-tables") == 0
+						|| strcmp(opt, "unroll-loops") == 0
+						|| strcmp(opt, "expensive-optimizations") == 0
+						|| strcmp(opt, "no-common") == 0
+						|| strcmp(opt, "PIC") == 0
+						|| strncmp(opt, "align-loops=", sizeof("align-loops=")-1) == 0
+						|| strncmp(opt, "align-jumps=", sizeof("align-jumps=")-1) == 0
+						|| strncmp(opt, "align-functions=", sizeof("align-functions=")-1) == 0) {
+							fprintf(stderr, "ignoring gcc option '-f %s'\n", truth_value ? opt : opt - 3);
 				} else {
+					if (! truth_value)
+						opt -= 3;
 					int res = firm_option(opt);
 					if (res == 0) {
 						fprintf(stderr, "error: unknown Firm option '-f %s'\n",
@@ -465,7 +655,7 @@ int main(int argc, char **argv)
 						help_displayed = true;
 					}
 				}
-			} else if(option[0] == 'b') {
+			} else if (option[0] == 'b') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-b");
 				int res = firm_be_option(opt);
@@ -475,35 +665,109 @@ int main(int argc, char **argv)
 					argument_errors = true;
 				} else if (res == -1) {
 					help_displayed = true;
+				} else {
+					if (strncmp(opt, "isa=", 4) == 0)
+						strncpy(cpu_arch, opt, sizeof(cpu_arch));
 				}
-			} else if(option[0] == 'W') {
-				set_warning_opt(&option[1]);
+			} else if (option[0] == 'W') {
+				if (strncmp(option + 1, "l,", 2) == 0)	// a gcc-style linker option
+				{
+					const char *opt;
+					GET_ARG_AFTER(opt, "-Wl,");
+					add_flag(&ldflags_obst, "-Wl,%s", opt);
+				}
+				else set_warning_opt(&option[1]);
 			} else if(option[0] == 'm') {
+				/* -m options */
 				const char *opt;
+				char arch_opt[64];
+
 				GET_ARG_AFTER(opt, "-m");
-				char *endptr;
-				long int value = strtol(opt, &endptr, 10);
-				if (*endptr != '\0') {
-					fprintf(stderr, "error: wrong option '-m %s'\n",  opt);
-					argument_errors = true;
-				}
-				if (value != 16 && value != 32 && value != 64) {
-					fprintf(stderr, "error: option -m supports only 16, 32 or 64\n");
-					argument_errors = true;
-				} else {
-					machine_size = (unsigned int)value;
-				}
-			} else if (option[0] == '\0') {
-				if(input != NULL) {
-					fprintf(stderr, "error: multiple input files specified\n");
-					argument_errors = true;
+				if (strncmp(opt, "arch=", 5) == 0) {
+					GET_ARG_AFTER(opt, "-march=");
+					snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt);
+					int res = firm_be_option(arch_opt);
+					if (res == 0)
+						argument_errors = true;
+					else {
+						snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt);
+						int res = firm_be_option(arch_opt);
+						if (res == 0)
+							argument_errors = true;
+					}
+				} else if(strncmp(opt, "tune=", 5) == 0) {
+					GET_ARG_AFTER(opt, "-mtune=");
+					snprintf(arch_opt, sizeof(arch_opt), "%s-opt=%s", cpu_arch, opt);
+					int res = firm_be_option(arch_opt);
+					if (res == 0)
+						argument_errors = true;
+				} else if(strncmp(opt, "cpu=", 4) == 0) {
+					GET_ARG_AFTER(opt, "-mcpu=");
+					snprintf(arch_opt, sizeof(arch_opt), "%s-arch=%s", cpu_arch, opt);
+					int res = firm_be_option(arch_opt);
+					if (res == 0)
+						argument_errors = true;
+				} else if(strncmp(opt, "fpmath=", 7) == 0) {
+					GET_ARG_AFTER(opt, "-mfpmath=");
+					if(strcmp(opt, "387") == 0)
+						opt = "x87";
+					else if(strcmp(opt, "sse") == 0)
+						opt = "sse2";
+					else {
+						fprintf(stderr, "error: option -mfpumath supports only 387 or sse\n");
+						argument_errors = true;
+					}
+					if(!argument_errors) {
+						snprintf(arch_opt, sizeof(arch_opt), "%s-fpunit=%s", cpu_arch, opt);
+						int res = firm_be_option(arch_opt);
+						if (res == 0)
+							argument_errors = true;
+					}
+				} else if(strncmp(opt, "preferred-stack-boundary=", 25) == 0) {
+					GET_ARG_AFTER(opt, "-mpreferred-stack-boundary=");
+					snprintf(arch_opt, sizeof(arch_opt), "%s-stackalign=%s", cpu_arch, opt);
+					int res = firm_be_option(arch_opt);
+					if (res == 0)
+						argument_errors = true;
+				} else if(strcmp(opt, "omit-leaf-frame-pointer") == 0) {
+					set_be_option("omitleaffp=1");
+				} else if(strcmp(opt, "no-omit-leaf-frame-pointer") == 0) {
+					set_be_option("omitleaffp=0");
 				} else {
-					input = arg;
+					char *endptr;
+					long int value = strtol(opt, &endptr, 10);
+					if (*endptr != '\0') {
+						fprintf(stderr, "error: wrong option '-m %s'\n",  opt);
+						argument_errors = true;
+					}
+					if (value != 16 && value != 32 && value != 64) {
+						fprintf(stderr, "error: option -m supports only 16, 32 or 64\n");
+						argument_errors = true;
+					} else {
+						machine_size = (unsigned int)value;
+					}
 				}
-			} else if(strcmp(option, "pedantic") == 0) {
+			} else if(strcmp(option, "pg") == 0) {
+				set_be_option("gprof");
+				add_flag(&ldflags_obst, "-pg");
+			} else if(strcmp(option, "pedantic") == 0
+					|| strcmp(option, "ansi") == 0) {
 				fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
+			} else if(strcmp(option, "shared") == 0) {
+				add_flag(&ldflags_obst, "-shared");
 			} else if(strncmp(option, "std=", 4) == 0) {
-				fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
+				if(strcmp(&option[4], "c99") == 0) {
+					c_mode = _C89|_C99;
+				} else if(strcmp(&option[4], "c89") == 0) {
+					c_mode = _C89;
+				} else if(strcmp(&option[4], "gnu99") == 0) {
+					c_mode = _C89|_C99|_GNUC;
+				} else if(strcmp(&option[4], "microsoft") == 0) {
+					c_mode = _C89|_C99|_MS;
+				} else
+					fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
+			} else if(strcmp(option, "version") == 0) {
+				print_cparser_version();
 			} else if (option[0] == '-') {
 				/* double dash option */
 				++option;
@@ -533,19 +797,10 @@ int main(int argc, char **argv)
 					print_parenthesis = true;
 				} else if(strcmp(option, "print-fluffy") == 0) {
 					mode = PrintFluffy;
+				} else if(strcmp(option, "print-caml") == 0) {
+					mode = PrintCaml;
 				} else if(strcmp(option, "version") == 0) {
-					firm_version_t ver;
-					firm_get_version(&ver);
-					printf("cparser (%d.%d %s) using libFirm (%u.%u", 0, 1, cparser_REVISION, ver.major, ver.minor);
-					if(ver.revision[0] != 0) {
-						putchar(' ');
-						fputs(ver.revision, stdout);
-					}
-					if(ver.build[0] != 0) {
-						putchar(' ');
-						fputs(ver.build, stdout);
-					}
-					puts(")\n");
+					print_cparser_version();
 					exit(EXIT_SUCCESS);
 				} else if(strcmp(option, "dump-function") == 0) {
 					++i;
@@ -566,26 +821,67 @@ int main(int argc, char **argv)
 				argument_errors = true;
 			}
 		} else {
-			if(input != NULL) {
-				fprintf(stderr, "error: multiple input files specified\n");
-				argument_errors = true;
+			filetype_t  type     = forced_filetype;
+			const char *filename = arg;
+			if (type == FILETYPE_AUTODETECT) {
+				size_t      len      = strlen(arg);
+				if (len < 2 && arg[0] == '-') {
+					/* - implicitly means C source file */
+					type     = FILETYPE_C;
+					filename = NULL;
+				} else if (len > 2 && arg[len-2] == '.') {
+					switch(arg[len-1]) {
+					case 'c': type = FILETYPE_C; break;
+					case 'h': type = FILETYPE_C; break;
+					case 's': type = FILETYPE_PREPROCESSED_ASSEMBLER; break;
+					case 'S': type = FILETYPE_ASSEMBLER; break;
+
+					case 'a':
+					case 'o': type = FILETYPE_OBJECT; break;
+					}
+				} else if (len > 3 && arg[len-3] == '.') {
+					if(strcmp(arg + len - 2, "so") == 0) {
+						type = FILETYPE_OBJECT;
+					}
+				}
+
+				if (type == FILETYPE_AUTODETECT) {
+					fprintf(stderr, "'%s': file format not recognized\n", arg);
+					continue;
+				}
+			}
+
+			file_list_entry_t *entry
+				= obstack_alloc(&file_obst, sizeof(entry[0]));
+			memset(entry, 0, sizeof(entry[0]));
+			entry->name = arg;
+			entry->type = type;
+
+			if (last_file != NULL) {
+				last_file->next = entry;
 			} else {
-				input = arg;
+				files = entry;
 			}
+			last_file = entry;
 		}
 	}
 
-	/* we do the lowering in ast2firm */
-	firm_opt.lower_bitfields = FALSE;
+	if (files == NULL) {
+		fprintf(stderr, "error: no input files specified\n");
+		argument_errors = true;
+	}
 
-	if(help_displayed) {
+	if (help_displayed) {
 		return !argument_errors;
 	}
-	if(argument_errors) {
+	if (argument_errors) {
 		usage(argv[0]);
 		return 1;
 	}
 
+	/* we do the lowering in ast2firm */
+	firm_opt.lower_bitfields = FALSE;
+
 	gen_firm_init();
 	init_symbol_table();
 	init_tokens();
@@ -597,25 +893,27 @@ int main(int argc, char **argv)
 	init_parser();
 	init_ast2firm();
 
-	FILE *out = NULL;
-	char  outnamebuf[4096];
-	if(outname == NULL) {
+	char outnamebuf[4096];
+	if (outname == NULL) {
+		const char *filename = files->name;
+
 		switch(mode) {
 		case BenchmarkParser:
 		case PrintAst:
 		case PrintFluffy:
+		case PrintCaml:
 		case LexTest:
-			if(outname == NULL)
-				outname = "-";
+		case PreprocessOnly:
+			outname = "-";
 			break;
 		case ParseOnly:
 			break;
 		case Compile:
-			get_output_name(outnamebuf, sizeof(outnamebuf), input, ".s");
+			get_output_name(outnamebuf, sizeof(outnamebuf), filename, ".s");
 			outname = outnamebuf;
 			break;
 		case CompileAssemble:
-			get_output_name(outnamebuf, sizeof(outnamebuf), input, ".o");
+			get_output_name(outnamebuf, sizeof(outnamebuf), filename, ".o");
 			outname = outnamebuf;
 			break;
 		case CompileDump:
@@ -624,145 +922,240 @@ int main(int argc, char **argv)
 			outname = outnamebuf;
 			break;
 		case CompileAssembleLink:
+#ifdef _WIN32
+			outname = "a.exe";
+#else
 			outname = "a.out";
+#endif
 			break;
 		}
 	}
 
-	if(outname != NULL) {
-		if(strcmp(outname, "-") == 0) {
-			out = stdout;
-		} else {
-			out = fopen(outname, "w");
-			if(out == NULL) {
-				fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname,
-				        strerror(errno));
-				return 1;
-			}
-		}
-	}
+	assert(outname != NULL);
 
-	FILE *in;
-	if(input == NULL) {
-		fprintf(stderr, "%s: no input files\n", argv[0]);
-		return 1;
-	} else if(strcmp(input, "-") == 0) {
-		in    = stdin;
-		input = "<stdin>";
+	FILE *out;
+	if(strcmp(outname, "-") == 0) {
+		out = stdout;
 	} else {
-		in = fopen(input, "r");
-		if(in == NULL) {
-			fprintf(stderr, "Couldn't open '%s': %s\n", input, strerror(errno));
+		out = fopen(outname, "w");
+		if(out == NULL) {
+			fprintf(stderr, "Couldn't open '%s' for writing: %s\n", outname,
+					strerror(errno));
 			return 1;
 		}
 	}
 
-	if(mode == LexTest) {
-		lextest(in, input);
-		fclose(in);
-		return 0;
-	}
+	file_list_entry_t *file;
+	for (file = files; file != NULL; file = file->next) {
+		char        asm_tempfile[1024];
+		const char *filename = file->name;
+		filetype_t  filetype = file->type;
 
-	FILE *preprocessed_in = preprocess(in, input);
-	translation_unit_t *const unit = do_parsing(preprocessed_in, input);
-	int result = pclose(preprocessed_in);
-	if(result != 0) {
-		return result;
-	}
-	if(unit == NULL) {
-		/* parsing failed because of errors */
-		fprintf(stderr, "%u error(s), %u warning(s)\n", error_count, warning_count);
-		return EXIT_FAILURE;
-	}
-	if (warning_count > 0) {
-		fprintf(stderr, "%u warning(s)\n", warning_count);
-	}
+		if (file->type == FILETYPE_OBJECT)
+			continue;
 
-	if(mode == BenchmarkParser) {
-		return 0;
-	}
+		FILE *in = NULL;
+		if (mode == LexTest) {
+			if (in == NULL)
+				in = open_file(filename);
+			lextest(in, filename);
+			fclose(in);
+			exit(EXIT_SUCCESS);
+		}
 
-	if(mode == PrintAst) {
-		type_set_output(out);
-		ast_set_output(out);
-		print_ast(unit);
-		return 0;
-	}
-	if(mode == PrintFluffy) {
-		type_set_output(out);
-		ast_set_output(out);
-		write_fluffy_decls(out, unit);
-	}
+		FILE *preprocessed_in = NULL;
+		if (filetype == FILETYPE_C || filetype == FILETYPE_ASSEMBLER) {
+			/* no support for input on FILE* yet */
+			if (in != NULL)
+				panic("internal compiler error: in for preprocessor != NULL");
+
+			preprocessed_in = preprocess(filename);
+			if (mode == PreprocessOnly) {
+				copy_file(out, preprocessed_in);
+				int result = pclose(preprocessed_in);
+				fclose(out);
+				return result;
+			}
 
-	translation_unit_to_firm(unit);
+			if (filetype == FILETYPE_C) {
+				filetype = FILETYPE_PREPROCESSED_C;
+			} else if (filetype == FILETYPE_ASSEMBLER) {
+				filetype = FILETYPE_PREPROCESSED_ASSEMBLER;
+			} else {
+				panic("internal compiler error: unknown filetype at preproc");
+			}
 
-	if(mode == ParseOnly) {
-		return 0;
-	}
+			in = preprocessed_in;
+		}
 
-	FILE *asm_out;
-	char  asm_tempfile[1024];
-	if(mode == CompileDump) {
-		asm_out = NULL;
-		firm_be_opt.selection = BE_NONE;
-	} else if(mode == Compile) {
-		asm_out = out;
-	} else {
-		asm_out
-			= make_temp_file(asm_tempfile, sizeof(asm_tempfile), "cc", ".s");
-	}
-	gen_firm_finish(asm_out, input, /*c_mode=*/1, /*firm_const_exists=*/0);
-
-	if(mode == CompileDump) {
-		/* find irg */
-		ident    *id     = new_id_from_str(dumpfunction);
-		ir_graph *irg    = NULL;
-		int       n_irgs = get_irp_n_irgs();
-		for(int i = 0; i < n_irgs; ++i) {
-			ir_graph *tirg   = get_irp_irg(i);
-			ident    *irg_id = get_entity_ident(get_irg_entity(tirg));
-			if(irg_id == id) {
-				irg = tirg;
-				break;
-			}
+		FILE *asm_out;
+		if(mode == Compile) {
+			asm_out = out;
+		} else {
+			asm_out = make_temp_file(asm_tempfile, sizeof(asm_tempfile),
+			                         "ccs");
 		}
 
-		if(irg == NULL) {
-			fprintf(stderr, "No graph for function '%s' found\n", dumpfunction);
-			return 1;
+		if (in == NULL)
+			in = open_file(filename);
+
+		/* preprocess and compile */
+		if (filetype == FILETYPE_PREPROCESSED_C) {
+			translation_unit_t *const unit = do_parsing(in, filename);
+			if (in == preprocessed_in) {
+				int pp_result = pclose(preprocessed_in);
+				if (pp_result != EXIT_SUCCESS) {
+					exit(EXIT_FAILURE);
+				}
+			}
+
+			/* prints the AST even if errors occurred */
+			if (mode == PrintAst) {
+				type_set_output(out);
+				ast_set_output(out);
+				print_ast(unit);
+			}
+
+			if(error_count > 0) {
+				/* parsing failed because of errors */
+				fprintf(stderr, "%u error(s), %u warning(s)\n", error_count,
+				        warning_count);
+				result = EXIT_FAILURE;
+				continue;
+			} else if(warning_count > 0) {
+				fprintf(stderr, "%u warning(s)\n", warning_count);
+			}
+
+			if(mode == BenchmarkParser) {
+				return result;
+			} else if(mode == PrintFluffy) {
+				write_fluffy_decls(out, unit);
+				continue;
+			} else if (mode == PrintCaml) {
+				write_caml_decls(out, unit);
+				continue;
+			}
+
+			translation_unit_to_firm(unit);
+
+			if (mode == ParseOnly) {
+				continue;
+			}
+
+			if (mode == CompileDump) {
+				/* find irg */
+				ident    *id     = new_id_from_str(dumpfunction);
+				ir_graph *irg    = NULL;
+				int       n_irgs = get_irp_n_irgs();
+				for(int i = 0; i < n_irgs; ++i) {
+					ir_graph *tirg   = get_irp_irg(i);
+					ident    *irg_id = get_entity_ident(get_irg_entity(tirg));
+					if(irg_id == id) {
+						irg = tirg;
+						break;
+					}
+				}
+
+				if(irg == NULL) {
+					fprintf(stderr, "No graph for function '%s' found\n",
+					        dumpfunction);
+					exit(1);
+				}
+
+				dump_ir_block_graph_file(irg, out);
+				fclose(out);
+				exit(0);
+			}
+
+			gen_firm_finish(asm_out, filename, /*c_mode=*/1,
+			                /*firm_const_exists=*/0);
+			if (asm_out != out) {
+				fclose(asm_out);
+			}
+
+		} else if (filetype == FILETYPE_PREPROCESSED_ASSEMBLER) {
+			copy_file(asm_out, in);
+			if (in == preprocessed_in) {
+				int pp_result = pclose(preprocessed_in);
+				if (pp_result != EXIT_SUCCESS) {
+					return pp_result;
+				}
+			}
+			if(asm_out != out) {
+				fclose(asm_out);
+			}
 		}
 
-		dump_ir_block_graph_file(irg, out);
-		fclose(out);
-		return 0;
-	}
+		if (mode == Compile)
+			continue;
 
-	fclose(asm_out);
+		/* if we're here then we have preprocessed assembly */
+		filename = asm_tempfile;
+		filetype = FILETYPE_PREPROCESSED_ASSEMBLER;
+
+		/* assemble */
+		if (filetype == FILETYPE_PREPROCESSED_ASSEMBLER) {
+			char        temp[1024];
+			const char *filename_o;
+			if(mode == CompileAssemble) {
+				fclose(out);
+				filename_o = outname;
+			} else {
+				FILE *tempf = make_temp_file(temp, sizeof(temp), "cco");
+				fclose(tempf);
+				filename_o = temp;
+			}
 
-	/* assemble assembler and create object file */
-	char obj_tfile[1024];
-	if(mode == CompileAssemble || mode == CompileAssembleLink) {
-		const char *obj_outfile;
-		if(mode == CompileAssemble) {
-			fclose(out);
-			obj_outfile = outname;
-		} else {
-			FILE *tempf
-				= make_temp_file(obj_tfile, sizeof(obj_tfile), "cc", ".o");
-			fclose(tempf);
-			obj_outfile = obj_tfile;
+			assemble(filename_o, filename);
+
+			size_t len = strlen(filename_o) + 1;
+			filename = obstack_copy(&file_obst, filename_o, len);
+			filetype = FILETYPE_OBJECT;
 		}
 
-		assemble(obj_outfile, asm_tempfile);
+		/* ok we're done here, process next file */
+		file->name = filename;
+		file->type = filetype;
 	}
 
-	/* link object file */
+	if (result != EXIT_SUCCESS)
+		return result;
+
+	/* link program file */
 	if(mode == CompileAssembleLink) {
-		do_link(outname, obj_tfile);
+		obstack_1grow(&ldflags_obst, '\0');
+		const char *flags = obstack_finish(&ldflags_obst);
+
+		/* construct commandline */
+		obstack_printf(&file_obst, "%s", LINKER);
+		for (file_list_entry_t *entry = files; entry != NULL;
+				entry = entry->next) {
+			if (entry->type != FILETYPE_OBJECT)
+				continue;
+
+			add_flag(&file_obst, "%s", entry->name);
+		}
+
+		add_flag(&file_obst, "-o");
+		add_flag(&file_obst, outname);
+		obstack_printf(&file_obst, "%s", flags);
+		obstack_1grow(&file_obst, '\0');
+
+		char *commandline = obstack_finish(&file_obst);
+
+		if(verbose) {
+			puts(commandline);
+		}
+		int err = system(commandline);
+		if(err != EXIT_SUCCESS) {
+			fprintf(stderr, "linker reported an error\n");
+			exit(1);
+		}
 	}
 
 	obstack_free(&cppflags_obst, NULL);
 	obstack_free(&ldflags_obst, NULL);
+	obstack_free(&file_obst, NULL);
 
 	exit_ast2firm();
 	exit_parser();