GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Clean up the CPP output a little bit 

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1771 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Eric Biederman 2004-11-09 08:59:23 +00:00
parent a649a411d7
commit 132368b4c5
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
util/romcc/romcc.c
View File

@ -3,8 +3,8 @@
#undef RELEASE_DATE #undef RELEASE_DATE
#undef VERSION #undef VERSION
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "66" #define VERSION_MINOR "67"
#define RELEASE_DATE "8 November 2004" #define RELEASE_DATE "9 November 2004"
#define VERSION VERSION_MAJOR "." VERSION_MINOR #define VERSION VERSION_MAJOR "." VERSION_MINOR
#include <stdarg.h> #include <stdarg.h>
@ -336,6 +336,7 @@ struct file_state {
int report_line; int report_line;
const char *report_name; const char *report_name;
const char *report_dir; const char *report_dir;
int macro : 1;
}; };
struct hash_entry; struct hash_entry;
struct token { struct token {
@ -4696,6 +4697,7 @@ static int compile_macro(struct compile_state *state,
file->report_line = 1; file->report_line = 1;
file->report_name = file->basename; file->report_name = file->basename;
file->report_dir = file->dirname; file->report_dir = file->dirname;
file->macro = 1;
file->prev = *filep; file->prev = *filep;
*filep = file; *filep = file;
return 1; return 1;
@ -4978,6 +4980,7 @@ static void compile_file(struct compile_state *state, const char *filename, int
file->report_line = 1; file->report_line = 1;
file->report_name = file->basename; file->report_name = file->basename;
file->report_dir = file->dirname; file->report_dir = file->dirname;
file->macro = 0;
file->prev = state->file; file->prev = state->file;
state->file = file; state->file = file;
@ -5052,6 +5055,7 @@ static void preprocess(struct compile_state *state, struct token *current_token)
file->report_line = override_line - 1; file->report_line = override_line - 1;
file->report_name = name; file->report_name = name;
file->report_dir = dir; file->report_dir = dir;
file->macro = 0;
} }
break; break;
} }
@ -5085,6 +5089,7 @@ static void preprocess(struct compile_state *state, struct token *current_token)
dir[dir_len] = '\0'; dir[dir_len] = '\0';
file->report_name = name; file->report_name = name;
file->report_dir = dir; file->report_dir = dir;
file->macro = 0;
} }
break; break;
} }
@ -24643,6 +24648,7 @@ static void print_preprocessed_tokens(struct compile_state *state)
filename = 0; filename = 0;
line = 0; line = 0;
for(;;) { for(;;) {
struct file_state *file;
struct token *tk; struct token *tk;
const char *token_str; const char *token_str;
tok = peek(state); tok = peek(state);
@ -24655,23 +24661,29 @@ static void print_preprocessed_tokens(struct compile_state *state)
tk->str_len ? tk->val.str : tk->str_len ? tk->val.str :
tokens[tk->tok]; tokens[tk->tok];
if ((state->file->line != line) ||
(state->file->basename != filename)) { file = state->file;
while(file->macro && file->prev) {
file = file->prev;
}
if (!file->macro &&
((file->line != line) || (file->basename != filename)))
{
int i, col; int i, col;
if ((state->file->basename == filename) && if ((file->basename == filename) &&
(line < state->file->line)) { (line < file->line)) {
while(line < state->file->line) { while(line < file->line) {
fprintf(fp, "\n"); fprintf(fp, "\n");
line++; line++;
} }
} }
else { else {
fprintf(fp, "\n#line %d \"%s\"\n", fprintf(fp, "\n#line %d \"%s\"\n",
state->file->line, state->file->basename); file->line, file->basename);
} }
line = state->file->line; line = file->line;
filename = state->file->basename; filename = file->basename;
col = get_col(state->file) - strlen(token_str); col = get_col(file) - strlen(token_str);
for(i = 0; i < col; i++) { for(i = 0; i < col; i++) {
fprintf(fp, " "); fprintf(fp, " ");
} }