diff options
| author | grischka <grischka> | 2015-05-09 14:29:39 +0200 |
|---|---|---|
| committer | grischka <grischka> | 2015-05-09 14:29:39 +0200 |
| commit | 30df3189b177c65d65094bed3a066a2722fe2dc0 (patch) | |
| tree | 5cc01304899af2f09b051cdb5cf980ceb8f6b9c1 /tcc.c | |
| parent | 70a6c4601e471054edbe2fd984e37e2ca320db14 (diff) | |
| download | tinycc-30df3189b177c65d65094bed3a066a2722fe2dc0.tar.gz tinycc-30df3189b177c65d65094bed3a066a2722fe2dc0.tar.bz2 | |
tccpp: fix issues, add tests
* fix some macro expansion issues
* add some pp tests in tests/pp
* improved tcc -E output for better diff'ability
* remove -dD feature (quirky code, exotic feature,
didn't work well)
Based partially on ideas / researches from PipCet
Some issues remain with VA_ARGS macros (if used in a
rather tricky way).
Also, to keep it simple, the pp doesn't automtically
add any extra spaces to separate tokens which otherwise
would form wrong tokens if re-read from tcc -E output
(such as '+' '=') GCC does that, other compilers don't.
* cleanups
- #line 01 "file" / # 01 "file" processing
- #pragma comment(lib,"foo")
- tcc -E: forward some pragmas to output (pack, comment(lib))
- fix macro parameter list parsing mess from
a3fc54345949535524d01319e1ca6378b7c2c201
a715d7143d9d17da17e67fec6af1c01409a71a31
(some coffee might help, next time ;)
- introduce TOK_PPSTR - to have character constants as
written in the file (similar to TOK_PPNUM)
- allow '\' appear in macros
- new functions begin/end_macro to:
- fix switching macro levels during expansion
- allow unget_tok to unget more than one tok
- slight speedup by using bitflags in isidnum_table
Also:
- x86_64.c : fix decl after statements
- i386-gen,c : fix a vstack leak with VLA on windows
- configure/Makefile : build on windows (MSYS) was broken
- tcc_warning: fflush stderr to keep output order (win32)
Diffstat (limited to 'tcc.c')
| -rw-r--r-- | tcc.c | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -55,31 +55,28 @@ static void display_info(TCCState *s, int what) # endif #endif #ifdef TCC_TARGET_PE - ", mingw" + " Windows" #else - #ifdef __linux - ", Linux" - #else - ", Unknown" - #endif + " Linux" #endif ")\n", TCC_VERSION); break; case 1: printf("install: %s\n", s->tcc_lib_path); /* print_paths("programs", NULL, 0); */ - print_paths("crt", s->crt_paths, s->nb_crt_paths); - print_paths("libraries", s->library_paths, s->nb_library_paths); print_paths("include", s->sysinclude_paths, s->nb_sysinclude_paths); + print_paths("libraries", s->library_paths, s->nb_library_paths); +#ifndef TCC_TARGET_PE + print_paths("crt", s->crt_paths, s->nb_crt_paths); printf("elfinterp:\n %s\n", DEFAULT_ELFINTERP(s)); +#endif break; } } -static void help(TCCState *s) +static void help(void) { - display_info(s, 0); - printf("Tiny C Compiler - Copyright (C) 2001-2006 Fabrice Bellard\n" + printf("Tiny C Compiler "TCC_VERSION" - Copyright (C) 2001-2006 Fabrice Bellard\n" "Usage: tcc [options...] [-o outfile] [-c] infile(s)...\n" " tcc [options...] -run infile [arguments...]\n" "General options:\n" @@ -94,13 +91,11 @@ static void help(TCCState *s) " -dumpversion\n" " -bench show compilation statistics\n" "Preprocessor options:\n" - " -E preprocess only\n" " -Idir add include path 'dir'\n" " -Dsym[=val] define 'sym' with value 'val'\n" " -Usym undefine 'sym'\n" - " -P do not output a #line directive\n" - " -P1 use a #line directive in output instead of the gcc style\n" - " -dD put a define directive in the output (inside a comment)\n" + " -E preprocess only\n" + " -P[1] no/alternative output of #line directives with -E\n" "Linker options:\n" " -Ldir add library path 'dir'\n" " -llib link with dynamic or static library 'lib'\n" @@ -260,7 +255,7 @@ int main(int argc, char **argv) tcc_set_environment(s); if (optind == 0) { - help(s); + help(); return 1; } |
