meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace PARSE_FLAG_ASM_COMMENTS with PARSE_FLAG_ASM_FILE 

after "assign PARSE_FLAG_ASM_COMMENTS only for asm files"
    functions of this flags are identical
master
seyko 2015-04-27 16:36:58 +03:00
parent 2e51f0ee63
commit bbcb54a1f4
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libtcc.c
View File

@ -1166,7 +1166,7 @@ ST_FUNC int tcc_add_file_internal(TCCState *s1, const char *filename, int flags,
/* if .S file, define __ASSEMBLER__ like gcc does */ /* if .S file, define __ASSEMBLER__ like gcc does */
if ((filetype == TCC_FILETYPE_ASM) || (filetype == TCC_FILETYPE_ASM_PP)) { if ((filetype == TCC_FILETYPE_ASM) || (filetype == TCC_FILETYPE_ASM_PP)) {
tcc_define_symbol(s1, "__ASSEMBLER__", NULL); tcc_define_symbol(s1, "__ASSEMBLER__", NULL);
parse_flags = PARSE_FLAG_ASM_FILE | PARSE_FLAG_ASM_COMMENTS; parse_flags = PARSE_FLAG_ASM_FILE;
} }
#endif #endif

3
tcc.h
View File

@ -1150,9 +1150,8 @@ ST_DATA TokenSym **table_ident;
#define PARSE_FLAG_LINEFEED 0x0004 /* line feed is returned as a #define PARSE_FLAG_LINEFEED 0x0004 /* line feed is returned as a
token. line feed is also token. line feed is also
returned at eof */ returned at eof */
#define PARSE_FLAG_ASM_COMMENTS 0x0008 /* '#' can be used for line comment */ #define PARSE_FLAG_ASM_FILE 0x0008 /* we processing an asm file: '#' can be used for line comment, etc. */
#define PARSE_FLAG_SPACES 0x0010 /* next() returns space tokens (for -E) */ #define PARSE_FLAG_SPACES 0x0010 /* next() returns space tokens (for -E) */
#define PARSE_FLAG_ASM_FILE 0x0020 /* we processing an asm file */
ST_FUNC TokenSym *tok_alloc(const char *str, int len); ST_FUNC TokenSym *tok_alloc(const char *str, int len);
ST_FUNC char *get_tok_str(int v, CValue *cv); ST_FUNC char *get_tok_str(int v, CValue *cv);

2
tccasm.c
View File

@ -747,7 +747,7 @@ static int tcc_assemble_internal(TCCState *s1, int do_preprocess)
ch = file->buf_ptr[0]; ch = file->buf_ptr[0];
tok_flags = TOK_FLAG_BOL | TOK_FLAG_BOF; tok_flags = TOK_FLAG_BOL | TOK_FLAG_BOF;
parse_flags = PARSE_FLAG_ASM_COMMENTS | PARSE_FLAG_ASM_FILE; parse_flags = PARSE_FLAG_ASM_FILE;
if (do_preprocess) if (do_preprocess)
parse_flags |= PARSE_FLAG_PREPROCESS; parse_flags |= PARSE_FLAG_PREPROCESS;
next(); next();

14
tccpp.c
View File

@ -779,7 +779,7 @@ redo_start:
in_warn_or_error = 1; in_warn_or_error = 1;
else if (tok == TOK_LINEFEED) else if (tok == TOK_LINEFEED)
goto redo_start; goto redo_start;
else if (parse_flags & PARSE_FLAG_ASM_COMMENTS) else if (parse_flags & PARSE_FLAG_ASM_FILE)
p = parse_line_comment(p); p = parse_line_comment(p);
} }
else if (parse_flags & PARSE_FLAG_ASM_FILE) else if (parse_flags & PARSE_FLAG_ASM_FILE)
@ -1503,7 +1503,7 @@ ST_FUNC void preprocess(int is_bof)
saved_parse_flags = parse_flags; saved_parse_flags = parse_flags;
parse_flags = PARSE_FLAG_PREPROCESS | PARSE_FLAG_TOK_NUM | parse_flags = PARSE_FLAG_PREPROCESS | PARSE_FLAG_TOK_NUM |
PARSE_FLAG_LINEFEED; PARSE_FLAG_LINEFEED;
parse_flags |= (saved_parse_flags & (PARSE_FLAG_ASM_FILE | PARSE_FLAG_ASM_COMMENTS)); parse_flags |= (saved_parse_flags & PARSE_FLAG_ASM_FILE);
next_nomacro(); next_nomacro();
redo: redo:
switch(tok) { switch(tok) {
@ -1745,7 +1745,7 @@ include_done:
next(); next();
if (tok != TOK_LINEFEED) { if (tok != TOK_LINEFEED) {
if (tok != TOK_STR) { if (tok != TOK_STR) {
if ((parse_flags & PARSE_FLAG_ASM_COMMENTS) == 0) { if ((parse_flags & PARSE_FLAG_ASM_FILE) == 0) {
file->line_num = i; file->line_num = i;
tcc_error("#line format is wrong"); tcc_error("#line format is wrong");
} }
@ -1786,7 +1786,7 @@ include_done:
/* '!' is ignored to allow C scripts. numbers are ignored /* '!' is ignored to allow C scripts. numbers are ignored
to emulate cpp behaviour */ to emulate cpp behaviour */
} else { } else {
if (!(parse_flags & PARSE_FLAG_ASM_COMMENTS)) if (!(parse_flags & PARSE_FLAG_ASM_FILE))
tcc_warning("Ignoring unknown preprocessing directive #%s", get_tok_str(tok, &tokc)); tcc_warning("Ignoring unknown preprocessing directive #%s", get_tok_str(tok, &tokc));
else { else {
/* this is a gas line comment in an 'S' file. */ /* this is a gas line comment in an 'S' file. */
@ -2346,7 +2346,7 @@ maybe_newline:
p++; p++;
tok = TOK_TWOSHARPS; tok = TOK_TWOSHARPS;
} else { } else {
if (parse_flags & PARSE_FLAG_ASM_COMMENTS) { if (parse_flags & PARSE_FLAG_ASM_FILE) {
p = parse_line_comment(p - 1); p = parse_line_comment(p - 1);
goto redo_no_start; goto redo_no_start;
} else { } else {
@ -2477,7 +2477,7 @@ maybe_newline:
} else if (c == '.') { } else if (c == '.') {
PEEKC(c, p); PEEKC(c, p);
if (c != '.') { if (c != '.') {
if ((parse_flags & PARSE_FLAG_ASM_COMMENTS) == 0) if ((parse_flags & PARSE_FLAG_ASM_FILE) == 0)
expect("'.'"); expect("'.'");
tok = '.'; tok = '.';
break; break;
@ -3304,7 +3304,7 @@ ST_FUNC int tcc_preprocess(TCCState *s1)
preprocess_init(s1); preprocess_init(s1);
ch = file->buf_ptr[0]; ch = file->buf_ptr[0];
tok_flags = TOK_FLAG_BOL | TOK_FLAG_BOF; tok_flags = TOK_FLAG_BOL | TOK_FLAG_BOF;
parse_flags &= (PARSE_FLAG_ASM_FILE | PARSE_FLAG_ASM_COMMENTS); parse_flags &= PARSE_FLAG_ASM_FILE;
parse_flags |= PARSE_FLAG_PREPROCESS | PARSE_FLAG_LINEFEED | PARSE_FLAG_SPACES; parse_flags |= PARSE_FLAG_PREPROCESS | PARSE_FLAG_LINEFEED | PARSE_FLAG_SPACES;
token_seen = 0; token_seen = 0;
file->line_ref = 0; file->line_ref = 0;