romcc:

[coreboot.git] / util / romcc / romcc.c

diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index e049abf76323a3948f0b2f12c3d039aa0ad56f19..5712f34040d2b98fc96c04bc49db95d54c5a90e8 100644 (file)
--- a/util/romcc/romcc.c
+++ b/util/romcc/romcc.c
@@ -219,11 +219,10 @@ static int exists(const char *dirname, const char *filename)
 static char *slurp_file(const char *dirname, const char *filename, off_t *r_size)
 {
        char cwd[MAX_CWD_SIZE];
-       int fd;
        char *buf;
        off_t size, progress;
        ssize_t result;
-       struct stat stats;
+       FILE* file;
        
        if (!filename) {
                *r_size = 0;
@@ -233,25 +232,22 @@ static char *slurp_file(const char *dirname, const char *filename, off_t *r_size
                die("cwd buffer to small");
        }
        xchdir(dirname);
-       fd = open(filename, O_RDONLY);
+       file = fopen(filename, "rb");
        xchdir(cwd);
-       if (fd < 0) {
+       if (file == NULL) {
                die("Cannot open '%s' : %s\n",
                        filename, strerror(errno));
        }
-       result = fstat(fd, &stats);
-       if (result < 0) {
-               die("Cannot stat: %s: %s\n",
-                       filename, strerror(errno));
-       }
-       size = stats.st_size;
+       fseek(file, 0, SEEK_END);
+       size = ftell(file);
+       fseek(file, 0, SEEK_SET);
        *r_size = size +1;
        buf = xmalloc(size +2, filename);
        buf[size] = '\n'; /* Make certain the file is newline terminated */
        buf[size+1] = '\0'; /* Null terminate the file for good measure */
        progress = 0;
        while(progress < size) {
-               result = read(fd, buf + progress, size - progress);
+               result = fread(buf + progress, 1, size - progress, file);
                if (result < 0) {
                        if ((errno == EINTR) || (errno == EAGAIN))
                                continue;
@@ -260,11 +256,7 @@ static char *slurp_file(const char *dirname, const char *filename, off_t *r_size
                }
                progress += result;
        }
-       result = close(fd);
-       if (result < 0) {
-               die("Close of %s failed: %s\n",
-                       filename, strerror(errno));
-       }
+       fclose(file);
        return buf;
 }
 
@@ -3624,6 +3616,7 @@ static void register_builtin_macros(struct compile_state *state)
        tm = localtime(&now);
 
        register_builtin_macro(state, "__ROMCC__", VERSION_MAJOR);
+       register_builtin_macro(state, "__PRE_RAM__", VERSION_MAJOR);
        register_builtin_macro(state, "__ROMCC_MINOR__", VERSION_MINOR);
        register_builtin_macro(state, "__FILE__", "\"This should be the filename\"");
        register_builtin_macro(state, "__LINE__", "54321");
@@ -3863,15 +3856,16 @@ static const char *next_char(struct file_state *file, const char *pos, int index
                }
                /* Is this an escaped newline? */
                if (file->join_lines &&
-                       (c == '\\') && (pos + size < end) && (pos[1] == '\n')) 
+                       (c == '\\') && (pos + size < end) && ((pos[1] == '\n') || ((pos[1] == '\r') && (pos[2] == '\n'))))
                {
+                       int cr_offset = ((pos[1] == '\r') && (pos[2] == '\n'))?1:0;
                        /* At the start of a line just eat it */
                        if (pos == file->pos) {
                                file->line++;
                                file->report_line++;
-                               file->line_start = pos + size + 1;
+                               file->line_start = pos + size + 1 + cr_offset;
                        }
-                       pos += size + 1;
+                       pos += size + 1 + cr_offset;
                }
                /* Do I need to ga any farther? */
                else if (index == 0) {
@@ -5088,7 +5082,7 @@ static void compile_file(struct compile_state *state, const char *filename, int
        if (getcwd(cwd, sizeof(cwd)) == 0) {
                die("cwd buffer to small");
        }
-       if (subdir[0] == '/') {
+       if ((subdir[0] == '/') || ((subdir[1] == ':') && ((subdir[2] == '/') || (subdir[2] == '\\')))) {
                file->dirname = xmalloc(subdir_len + 1, "dirname");
                memcpy(file->dirname, subdir, subdir_len);
                file->dirname[subdir_len] = '\0';
@@ -5460,6 +5454,13 @@ static void preprocess(struct compile_state *state, struct token *current_token)
                name = 0;
 
                pp_eat(state, TOK_MINCLUDE);
+               if (if_eat(state)) {
+                       /* Find the end of the line */
+                       while((tok = raw_peek(state)) != TOK_EOL) {
+                               raw_eat(state, tok);
+                       }
+                       break;
+               }
                tok = peek(state);
                if (tok == TOK_LIT_STRING) {
                        struct token *tk;
@@ -15148,7 +15149,9 @@ static void free_basic_block(struct compile_state *state, struct block *block)
                }
        }
        memset(block, -1, sizeof(*block));
+#ifndef WIN32
        xfree(block);
+#endif
 }
 
 static void free_basic_blocks(struct compile_state *state, 
@@ -21096,7 +21099,7 @@ static void scc_transform(struct compile_state *state)
                        fblock = lnode->fblock;
 
                        if (state->compiler->debug & DEBUG_SCC_TRANSFORM) {
-                               fprintf(state->errout, "sedge: %5d (%5d -> %5d)\n",
+                               fprintf(state->errout, "sedge: %5ld (%5d -> %5d)\n",
                                        sedge - scc.ssa_edges,
                                        sedge->src->def->id,
                                        sedge->dst->def->id);