X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=b38325bdfc512ef34f3ae43982cc867b4e8a9d53;hb=cf80e941ca33006ab52321c2c74c6c30a7a4d10a;hp=b910ea4f6570e0c7d80e4426606542f7e276ac51;hpb=ea534dd6232eade33f3aecc3c35cc3724b841f20;p=cparser

diff --git a/main.c b/main.c
index b910ea4..b38325b 100644
--- a/main.c
+++ b/main.c
@@ -206,7 +206,41 @@ static void lextest(FILE *in, const char *fname)
 	} while(lexer_token.type != T_EOF);
 }
 
-static FILE *preprocess(FILE *in, const char *fname, bool to_stdout)
+static void add_flag(struct obstack *obst, const char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+
+	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;
+		}
+	}
+
+	va_end(ap);
+}
+
+static FILE *preprocess(FILE *in, const char *fname)
 {
 	char buf[4096];
 	obstack_1grow(&cppflags_obst, '\0');
@@ -222,17 +256,13 @@ static FILE *preprocess(FILE *in, const char *fname, bool to_stdout)
 	if(verbose) {
 		puts(buf);
 	}
-	if(to_stdout) {
-		int res = system(buf);
-		exit(res);
-	} else {
-		FILE *f = popen(buf, "r");
-		if(f == NULL) {
-			fprintf(stderr, "invoking preprocessor failed\n");
-			exit(1);
-		}
-		return f;
+
+	FILE *f = popen(buf, "r");
+	if(f == NULL) {
+		fprintf(stderr, "invoking preprocessor failed\n");
+		exit(1);
 	}
+	return f;
 }
 
 static void do_link(const char *out, const char *in)
@@ -375,7 +405,7 @@ typedef enum compile_mode_t {
 	PrintAst,
 	PrintFluffy,
 	PrintCaml,
-	Link
+	Link,
 } compile_mode_t;
 
 static void usage(const char *argv0)
@@ -414,6 +444,18 @@ static void set_option(const char *arg)
 	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");
+		}
+	}
+}
+
 int main(int argc, char **argv)
 {
 	initialize_firm();
@@ -514,27 +556,43 @@ 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(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) {
+				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') {
 				const char *opt;
 				GET_ARG_AFTER(opt, "-f");
@@ -545,10 +603,15 @@ int main(int argc, char **argv)
 					set_be_option("omitfp");
 				} else if(strcmp(opt, "no-omit-frame-pointer") == 0) {
 					set_be_option("omitfp=no");
+				} else if(strcmp(opt, "strength-reduce") == 0) {
+					firm_option("strength-red");
 				} else if(strcmp(opt, "fast-math") == 0
 						|| strcmp(opt, "unroll-loops") == 0
 						|| strcmp(opt, "expensive-optimizations") == 0
-						|| strcmp(opt, "no-common") == 0) {
+						|| strcmp(opt, "no-common") == 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", opt);
 				} else {
 					int res = firm_option(opt);
@@ -656,7 +719,7 @@ int main(int argc, char **argv)
 				}
 			} else if(strcmp(option, "pg") == 0) {
 				set_be_option("gprof");
-				obstack_printf(&ldflags_obst, " -pg");
+				add_flag(&ldflags_obst, "-pg");
 			} else if(strcmp(option, "pedantic") == 0) {
 				fprintf(stderr, "warning: ignoring gcc option '%s'\n", arg);
 			} else if(strncmp(option, "std=", 4) == 0) {
@@ -802,10 +865,8 @@ int main(int argc, char **argv)
 		case PrintFluffy:
 		case PrintCaml:
 		case LexTest:
-			if(outname == NULL)
-				outname = "-";
-			break;
 		case PreprocessOnly:
+			outname = "-";
 			break;
 		case ParseOnly:
 			break;
@@ -896,10 +957,15 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
-	FILE *preprocessed_in = preprocess(in, input, mode == PreprocessOnly);
+	FILE *preprocessed_in = preprocess(in, input);
+	if (mode == PreprocessOnly) {
+		copy_file(out, preprocessed_in);
+		return pclose(preprocessed_in);
+	}
+
 	translation_unit_t *const unit = do_parsing(preprocessed_in, input);
 	int res = pclose(preprocessed_in);
-	if(res != 0) {
+	if (res != 0) {
 		return res;
 	}