History

Some in-between fixes (See Changelog for details).

grischka committed 18 years ago

Commit 2de1b2d1 parent 2bcb9642 files · +98 −66Browse files

Unified · Split

2 files
  1. tcc.c +68 −66
  2. win32/build-tcc.bat +30 −0
tcc.c+68−66
@@ -321,6 +321,7 @@ static int tok_flags; · 320 unmodified lines
321#define TOK_FLAG_BOL 0x0001 /* beginning of line before */321#define TOK_FLAG_BOL 0x0001 /* beginning of line before */
322#define TOK_FLAG_BOF 0x0002 /* beginning of file before */322#define TOK_FLAG_BOF 0x0002 /* beginning of file before */
323#define TOK_FLAG_ENDIF 0x0004 /* a endif was found matching starting #ifdef */323#define TOK_FLAG_ENDIF 0x0004 /* a endif was found matching starting #ifdef */
324#define TOK_FLAG_EOF 0x0008 /* end of file */
324 325
325static int *macro_ptr, *macro_ptr_allocated;326static int *macro_ptr, *macro_ptr_allocated;
326static int *unget_saved_macro_ptr;327static int *unget_saved_macro_ptr;
@@ -1032,6 +1033,32 @@ static int strstart(const char *str, const char *val, const char **ptr) · 705 unmodified lines
1032 return 1;1033 return 1;
1033}1034}
1034 1035
1036#ifdef WIN32
1037char *normalize_slashes(char *path)
1038{
1039 char *p;
1040 for (p = path; *p; ++p)
1041 if (*p == '\\')
1042 *p = '/';
1043 return path;
1044}
1045
1046char *w32_tcc_lib_path(void)
1047{
1048 /* on win32, we suppose the lib and includes are at the location
1049 of 'tcc.exe' */
1050 char path[1024], *p;
1051 GetModuleFileNameA(NULL, path, sizeof path);
1052 p = tcc_basename(normalize_slashes(strlwr(path)));
1053 if (p - 5 > path && 0 == strncmp(p - 5, "/bin/", 5))
1054 p -= 5;
1055 else if (p > path)
1056 p--;
1057 *p = 0;
1058 return strdup(path);
1059}
1060#endif
1061
1035/* memory management */1062/* memory management */
1036#ifdef MEM_DEBUG1063#ifdef MEM_DEBUG
1037int mem_cur_size;1064int mem_cur_size;
@@ -1844,7 +1871,6 @@ BufferedFile *tcc_open(TCCState *s1, const char *filename) · 806 unmodified lines
1844{1871{
1845 int fd;1872 int fd;
1846 BufferedFile *bf;1873 BufferedFile *bf;
1847 int i, len;
1848 1874
1849 fd = open(filename, O_RDONLY | O_BINARY);1875 fd = open(filename, O_RDONLY | O_BINARY);
1850 if (fd < 0)1876 if (fd < 0)
@@ -1859,10 +1885,7 @@ BufferedFile *tcc_open(TCCState *s1, const char *filename) · 8 unmodified lines
1859 bf->buf_end = bf->buffer;1885 bf->buf_end = bf->buffer;
1860 bf->buffer[0] = CH_EOB; /* put eob symbol */1886 bf->buffer[0] = CH_EOB; /* put eob symbol */
1861 pstrcpy(bf->filename, sizeof(bf->filename), filename);1887 pstrcpy(bf->filename, sizeof(bf->filename), filename);
1862 len = strlen(bf->filename);1888 normalize_slashes(bf->filename);
1863 for (i = 0; i < len; i++)
1864 if (bf->filename[i] == '\\')
1865 bf->filename[i] = '/';
1866 bf->line_num = 1;1889 bf->line_num = 1;
1867 bf->ifndef_macro = 0;1890 bf->ifndef_macro = 0;
1868 bf->ifdef_stack_ptr = s1->ifdef_stack_ptr;1891 bf->ifdef_stack_ptr = s1->ifdef_stack_ptr;
@@ -3540,13 +3563,17 @@ static inline void next_nomacro1(void) · 1671 unmodified lines
3540 parse_eof:3563 parse_eof:
3541 {3564 {
3542 TCCState *s1 = tcc_state;3565 TCCState *s1 = tcc_state;
3543 if (parse_flags & PARSE_FLAG_LINEFEED) {3566 if ((parse_flags & PARSE_FLAG_LINEFEED)
3567 && !(tok_flags & TOK_FLAG_EOF)) {
3568 tok_flags |= TOK_FLAG_EOF;
3544 tok = TOK_LINEFEED;3569 tok = TOK_LINEFEED;
3570 goto keep_tok_flags;
3545 } else if (s1->include_stack_ptr == s1->include_stack ||3571 } else if (s1->include_stack_ptr == s1->include_stack ||
3546 !(parse_flags & PARSE_FLAG_PREPROCESS)) {3572 !(parse_flags & PARSE_FLAG_PREPROCESS)) {
3547 /* no include left : end of file. */3573 /* no include left : end of file. */
3548 tok = TOK_EOF;3574 tok = TOK_EOF;
3549 } else {3575 } else {
3576 tok_flags &= ~TOK_FLAG_EOF;
3550 /* pop include file */3577 /* pop include file */
3551 3578
3552 /* test if previous '#endif' was after a #ifdef at3579 /* test if previous '#endif' was after a #ifdef at
@@ -3574,15 +3601,13 @@ static inline void next_nomacro1(void) · 21 unmodified lines
3574 break;3601 break;
3575 3602
3576 case '\n':3603 case '\n':
3577 if (parse_flags & PARSE_FLAG_LINEFEED) {3604 file->line_num++;
3578 tok = TOK_LINEFEED;3605 tok_flags |= TOK_FLAG_BOL;
3579 } else {3606 p++;
3580 file->line_num++;3607 if (0 == (parse_flags & PARSE_FLAG_LINEFEED))
3581 tok_flags |= TOK_FLAG_BOL;
3582 p++;
3583 goto redo_no_start;3608 goto redo_no_start;
3584 }3609 tok = TOK_LINEFEED;
3585 break;3610 goto keep_tok_flags;
3586 3611
3587 case '#':3612 case '#':
3588 /* XXX: simplify */3613 /* XXX: simplify */
@@ -3912,8 +3937,9 @@ static inline void next_nomacro1(void) · 323 unmodified lines
3912 error("unrecognized character \\x%02x", c);3937 error("unrecognized character \\x%02x", c);
3913 break;3938 break;
3914 }3939 }
3915 file->buf_ptr = p;
3916 tok_flags = 0;3940 tok_flags = 0;
3941keep_tok_flags:
3942 file->buf_ptr = p;
3917#if defined(PARSE_DEBUG)3943#if defined(PARSE_DEBUG)
3918 printf("token = %s\n", get_tok_str(tok, &tokc));3944 printf("token = %s\n", get_tok_str(tok, &tokc));
3919#endif3945#endif
@@ -4140,7 +4166,8 @@ static int macro_subst_tok(TokenString *tok_str, · 220 unmodified lines
4140 parlevel++;4166 parlevel++;
4141 else if (tok == ')')4167 else if (tok == ')')
4142 parlevel--;4168 parlevel--;
4143 tok_str_add2(&str, tok, &tokc);4169 if (tok != TOK_LINEFEED)
4170 tok_str_add2(&str, tok, &tokc);
4144 next_nomacro();4171 next_nomacro();
4145 }4172 }
4146 tok_str_add(&str, 0);4173 tok_str_add(&str, 0);
@@ -8188,9 +8215,6 @@ static void block(int *bsym, int *csym, int *case_sym, int *def_sym, · 4041 unmodified lines
8188 int v1, v2;8215 int v1, v2;
8189 if (!case_sym)8216 if (!case_sym)
8190 expect("switch");8217 expect("switch");
8191 /* since a case is like a label, we must skip it with a jmp */
8192 b = gjmp(0);
8193 next_case:
8194 next();8218 next();
8195 v1 = expr_const();8219 v1 = expr_const();
8196 v2 = v1;8220 v2 = v1;
@@ -8200,26 +8224,24 @@ static void block(int *bsym, int *csym, int *case_sym, int *def_sym, · 3 unmodified lines
8200 if (v2 < v1)8224 if (v2 < v1)
8201 warning("empty case range");8225 warning("empty case range");
8202 }8226 }
8227 /* since a case is like a label, we must skip it with a jmp */
8228 b = gjmp(0);
8203 gsym(*case_sym);8229 gsym(*case_sym);
8204 vseti(case_reg, 0);8230 vseti(case_reg, 0);
8205 vpushi(v1);8231 vpushi(v1);
8206 if (v1 == v2) {8232 if (v1 == v2) {
8207 gen_op(TOK_EQ);8233 gen_op(TOK_EQ);
8208 *case_sym = 0;8234 *case_sym = gtst(1, 0);
8209 } else {8235 } else {
8210 gen_op(TOK_GE);8236 gen_op(TOK_GE);
8211 *case_sym = gtst(1, 0);8237 *case_sym = gtst(1, 0);
8212 vseti(case_reg, 0);8238 vseti(case_reg, 0);
8213 vpushi(v2);8239 vpushi(v2);
8214 gen_op(TOK_LE);8240 gen_op(TOK_LE);
8241 *case_sym = gtst(1, *case_sym);
8215 }8242 }
8216 skip(':');
8217 if (tok == TOK_CASE) {
8218 b = gtst(0, b);
8219 goto next_case;
8220 }
8221 *case_sym = gtst(1, *case_sym);
8222 gsym(b);8243 gsym(b);
8244 skip(':');
8223 is_expr = 0;8245 is_expr = 0;
8224 goto block_after_label;8246 goto block_after_label;
8225 } else 8247 } else
@@ -9015,6 +9037,8 @@ static void func_decl_list(Sym *func_sym) · 789 unmodified lines
9015 'cur_text_section' */9037 'cur_text_section' */
9016static void gen_function(Sym *sym)9038static void gen_function(Sym *sym)
9017{9039{
9040 int saved_nocode_wanted = nocode_wanted;
9041 nocode_wanted = 0;
9018 ind = cur_text_section->data_offset;9042 ind = cur_text_section->data_offset;
9019 /* NOTE: we patch the symbol size later */9043 /* NOTE: we patch the symbol size later */
9020 put_extern_sym(sym, cur_text_section, ind, 0);9044 put_extern_sym(sym, cur_text_section, ind, 0);
@@ -9043,6 +9067,7 @@ static void gen_function(Sym *sym) · 22 unmodified lines
9043 funcname = ""; /* for safety */9067 funcname = ""; /* for safety */
9044 func_vt.t = VT_VOID; /* for safety */9068 func_vt.t = VT_VOID; /* for safety */
9045 ind = 0; /* for safety */9069 ind = 0; /* for safety */
9070 nocode_wanted = saved_nocode_wanted;
9046}9071}
9047 9072
9048static void gen_inline_functions(void)9073static void gen_inline_functions(void)
@@ -9350,6 +9375,7 @@ static int tcc_compile(TCCState *s1) · 301 unmodified lines
9350#endif9375#endif
9351 9376
9352 define_start = define_stack;9377 define_start = define_stack;
9378 nocode_wanted = 1;
9353 9379
9354 if (setjmp(s1->error_jmp_buf) == 0) {9380 if (setjmp(s1->error_jmp_buf) == 0) {
9355 s1->nb_errors = 0;9381 s1->nb_errors = 0;
@@ -9400,26 +9426,19 @@ static int tcc_preprocess(TCCState *s1) · 44 unmodified lines
9400 last_is_space = 1;9426 last_is_space = 1;
9401 next();9427 next();
9402 for(;;) {9428 for(;;) {
9403 if (tok == TOK_EOF)9429 if (tok == TOK_EOF) {
9404 break;9430 break;
9405 if (!last_is_space) {9431 } else if (tok == TOK_LINEFEED) {
9406 fputc(' ', s1->outfile);
9407 }
9408 fputs(get_tok_str(tok, &tokc), s1->outfile);
9409 if (tok == TOK_LINEFEED) {
9410 last_is_space = 1;9432 last_is_space = 1;
9411 /* XXX: suppress that hack */9433 } else {
9412 parse_flags &= ~PARSE_FLAG_LINEFEED;9434 if (!last_is_space)
9413 next();9435 fputc(' ', s1->outfile);
9414 parse_flags |= PARSE_FLAG_LINEFEED;
9415 } else {
9416 last_is_space = 0;9436 last_is_space = 0;
9417 next();
9418 }9437 }
9438 fputs(get_tok_str(tok, &tokc), s1->outfile);
9439 next();
9419 }9440 }
9420
9421 free_defines(define_start); 9441 free_defines(define_start);
9422
9423 return 0;9442 return 0;
9424}9443}
9425 9444
@@ -10380,17 +10399,15 @@ int tcc_set_flag(TCCState *s, const char *flag_name, int value) · 954 unmodified lines
10380/* extract the basename of a file */10399/* extract the basename of a file */
10381static char *tcc_basename(const char *name)10400static char *tcc_basename(const char *name)
10382{10401{
10383 const char *p;10402 char *p = strchr(name, 0);
10384 p = strrchr(name, '/');10403 while (p > name
10404 && p[-1] != '/'
10385#ifdef WIN3210405#ifdef WIN32
10386 if (!p)10406 && p[-1] != '\\'
10387 p = strrchr(name, '\\');10407#endif
10388#endif 10408 )
10389 if (!p)10409 --p;
10390 p = name;10410 return p;
10391 else
10392 p++;
10393 return (char*)p;
10394}10411}
10395 10412
10396#if !defined(LIBTCC)10413#if !defined(LIBTCC)
@@ -10774,22 +10791,7 @@ int main(int argc, char **argv) · 377 unmodified lines
10774 int64_t start_time = 0;10791 int64_t start_time = 0;
10775 10792
10776#ifdef WIN3210793#ifdef WIN32
10777 /* on win32, we suppose the lib and includes are at the location10794 tcc_lib_path = w32_tcc_lib_path();
10778 of 'tcc.exe' */
10779 {
10780 static char path[1024];
10781 char *p, *d;
10782
10783 GetModuleFileNameA(NULL, path, sizeof path);
10784 p = d = strlwr(path);
10785 while (*d)
10786 {
10787 if (*d == '\\') *d = '/', p = d;
10788 ++d;
10789 }
10790 *p = '\0';
10791 tcc_lib_path = path;
10792 }
10793#endif10795#endif
10794 10796
10795 s = tcc_new();10797 s = tcc_new();
win32/build-tcc.bat+30−0
@@ -0,0 +1,30 @@
1@rem ----------------------------------------------------
2@rem batch file to build tcc using gcc and ar from mingw
3@rem ----------------------------------------------------
4:
5@if exist ..\config.h goto configready
6:
7@echo>..\config.h #define TCC_VERSION "0.9.24pre"
8@echo>>..\config.h #define TCC_TARGET_PE 1
9@echo>>..\config.h #define CONFIG_TCCDIR NULL
10:
11:configready
12:
13gcc -Os -fno-strict-aliasing ../tcc.c -o tcc.exe -s
14gcc -Os -fno-strict-aliasing ../tcc.c -D LIBTCC -c -o libtcc.o
15gcc -Os -fno-strict-aliasing ../tiny_impdef.c -o tiny_impdef.exe -s
16mkdir libtcc
17ar rcs libtcc/libtcc.a libtcc.o
18del libtcc.o
19copy ..\libtcc.h libtcc
20:
21.\tcc -c lib/crt1.c
22.\tcc -c lib/wincrt1.c
23.\tcc -c lib/dllcrt1.c
24.\tcc -c lib/dllmain.c
25.\tcc -c lib/chkstk.S
26.\tcc -c ../libtcc1.c
27.\tcc -c ../alloca86.S
28.\tcc -c ../alloca86-bt.S
29ar rcs lib/libtcc1.a crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o libtcc1.o alloca86.o alloca86-bt.o
30del *.o

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t