kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Look for include files in the directory of the including file. 

Looking in the diretory dtc is invoked from is not very useful behavior.

As part of the code reorganization to implement this, I removed the
uniquifying of name storage -- it seemed a rather dubious optimization
given likely usage, and some aspects of it would have been mildly awkward
to integrate with the new code.

Signed-off-by: Scott Wood <scottwood@freescale.com>
main
Scott Wood 17 years ago committed by Jon Loeliger
parent
f77fe6a20e
commit
910efac4b4
5 changed files with 134 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      dtc-lexer.l
  2. 2
      dtc-parser.y
  3. 14
      dtc.c
  4. 126
      srcpos.c
  5. 28
      srcpos.h

64
dtc-lexer.l
Unescape View File

@ -74,7 +74,7 @@ static int dts_version; /* = 0 */
} }


<*>\"([^\\"]|\\.)*\" { <*>\"([^\\"]|\\.)*\" {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("String: %s\n", yytext); DPRINT("String: %s\n", yytext);
yylval.data = data_copy_escape_string(yytext+1, yylval.data = data_copy_escape_string(yytext+1,
@ -84,7 +84,7 @@ static int dts_version; /* = 0 */
} }


<*>"/dts-v1/" { <*>"/dts-v1/" {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("Keyword: /dts-v1/\n"); DPRINT("Keyword: /dts-v1/\n");
dts_version = 1; dts_version = 1;
@ -93,7 +93,7 @@ static int dts_version; /* = 0 */
} }


<*>"/memreserve/" { <*>"/memreserve/" {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("Keyword: /memreserve/\n"); DPRINT("Keyword: /memreserve/\n");
BEGIN_DEFAULT(); BEGIN_DEFAULT();
@ -101,7 +101,7 @@ static int dts_version; /* = 0 */
} }


<*>{LABEL}: { <*>{LABEL}: {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("Label: %s\n", yytext); DPRINT("Label: %s\n", yytext);
yylval.labelref = strdup(yytext); yylval.labelref = strdup(yytext);
@ -110,7 +110,7 @@ static int dts_version; /* = 0 */
} }


<INITIAL>[bodh]# { <INITIAL>[bodh]# {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
if (*yytext == 'b') if (*yytext == 'b')
yylval.cbase = 2; yylval.cbase = 2;
@ -125,7 +125,7 @@ static int dts_version; /* = 0 */
} }


<INITIAL>[0-9a-fA-F]+ { <INITIAL>[0-9a-fA-F]+ {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
yylval.literal = strdup(yytext); yylval.literal = strdup(yytext);
DPRINT("Literal: '%s'\n", yylval.literal); DPRINT("Literal: '%s'\n", yylval.literal);
@ -133,7 +133,7 @@ static int dts_version; /* = 0 */
} }


<V1>[0-9]+|0[xX][0-9a-fA-F]+ { <V1>[0-9]+|0[xX][0-9a-fA-F]+ {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
yylval.literal = strdup(yytext); yylval.literal = strdup(yytext);
DPRINT("Literal: '%s'\n", yylval.literal); DPRINT("Literal: '%s'\n", yylval.literal);
@ -141,7 +141,7 @@ static int dts_version; /* = 0 */
} }


\&{LABEL} { /* label reference */ \&{LABEL} { /* label reference */
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("Ref: %s\n", yytext+1); DPRINT("Ref: %s\n", yytext+1);
yylval.labelref = strdup(yytext+1); yylval.labelref = strdup(yytext+1);
@ -149,7 +149,7 @@ static int dts_version; /* = 0 */
} }


"&{/"{PATHCHAR}+\} { /* new-style path reference */ "&{/"{PATHCHAR}+\} { /* new-style path reference */
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
yytext[yyleng-1] = '\0'; yytext[yyleng-1] = '\0';
DPRINT("Ref: %s\n", yytext+2); DPRINT("Ref: %s\n", yytext+2);
@ -158,7 +158,7 @@ static int dts_version; /* = 0 */
} }


<INITIAL>"&/"{PATHCHAR}+ { /* old-style path reference */ <INITIAL>"&/"{PATHCHAR}+ { /* old-style path reference */
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("Ref: %s\n", yytext+1); DPRINT("Ref: %s\n", yytext+1);
yylval.labelref = strdup(yytext+1); yylval.labelref = strdup(yytext+1);
@ -166,7 +166,7 @@ static int dts_version; /* = 0 */
} }


<BYTESTRING>[0-9a-fA-F]{2} { <BYTESTRING>[0-9a-fA-F]{2} {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
yylval.byte = strtol(yytext, NULL, 16); yylval.byte = strtol(yytext, NULL, 16);
DPRINT("Byte: %02x\n", (int)yylval.byte); DPRINT("Byte: %02x\n", (int)yylval.byte);
@ -174,7 +174,7 @@ static int dts_version; /* = 0 */
} }


<BYTESTRING>"]" { <BYTESTRING>"]" {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("/BYTESTRING\n"); DPRINT("/BYTESTRING\n");
BEGIN_DEFAULT(); BEGIN_DEFAULT();
@ -182,7 +182,7 @@ static int dts_version; /* = 0 */
} }


<PROPNODENAME>{PROPNODECHAR}+ { <PROPNODENAME>{PROPNODECHAR}+ {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("PropNodeName: %s\n", yytext); DPRINT("PropNodeName: %s\n", yytext);
yylval.propnodename = strdup(yytext); yylval.propnodename = strdup(yytext);
@ -190,11 +190,10 @@ static int dts_version; /* = 0 */
return DT_PROPNODENAME; return DT_PROPNODENAME;
} }



<*>[[:space:]]+ /* eat whitespace */ <*>[[:space:]]+ /* eat whitespace */


<*>"/*"([^*]|\*+[^*/])*\*+"/" { <*>"/*"([^*]|\*+[^*/])*\*+"/" {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("Comment: %s\n", yytext); DPRINT("Comment: %s\n", yytext);
/* eat comments */ /* eat comments */
@ -203,7 +202,7 @@ static int dts_version; /* = 0 */
<*>"//".*\n /* eat line comments */ <*>"//".*\n /* eat line comments */


<*>. { <*>. {
yylloc.filenum = srcpos_filenum; yylloc.file = srcpos_file;
yylloc.first_line = yylineno; yylloc.first_line = yylineno;
DPRINT("Char: %c (\\x%02x)\n", yytext[0], DPRINT("Char: %c (\\x%02x)\n", yytext[0],
(unsigned)yytext[0]); (unsigned)yytext[0]);
@ -227,8 +226,7 @@ static int dts_version; /* = 0 */
*/ */


struct incl_file { struct incl_file {
int filenum; struct dtc_file *file;
FILE *file;
YY_BUFFER_STATE yy_prev_buf; YY_BUFFER_STATE yy_prev_buf;
int yy_prev_lineno; int yy_prev_lineno;
struct incl_file *prev; struct incl_file *prev;
@ -247,8 +245,9 @@ static int incl_depth = 0;


int push_input_file(const char *filename) int push_input_file(const char *filename)
{ {
FILE *f;
struct incl_file *incl_file; struct incl_file *incl_file;
struct dtc_file *newfile;
struct search_path search, *searchptr = NULL;


if (!filename) { if (!filename) {
yyerror("No include file name given."); yyerror("No include file name given.");
@ -260,7 +259,19 @@ int push_input_file(const char *filename)
return 0; return 0;
} }


f = dtc_open_file(filename); if (srcpos_file) {
search.dir = srcpos_file->dir;
search.next = NULL;
search.prev = NULL;
searchptr = &search;
}

newfile = dtc_open_file(filename, searchptr);
if (!newfile) {
yyerrorf("Couldn't open \"%s\": %s",
filename, strerror(errno));
exit(1);
}


incl_file = malloc(sizeof(struct incl_file)); incl_file = malloc(sizeof(struct incl_file));
if (!incl_file) { if (!incl_file) {
@ -273,8 +284,7 @@ int push_input_file(const char *filename)
*/ */
incl_file->yy_prev_buf = YY_CURRENT_BUFFER; incl_file->yy_prev_buf = YY_CURRENT_BUFFER;
incl_file->yy_prev_lineno = yylineno; incl_file->yy_prev_lineno = yylineno;
incl_file->filenum = srcpos_filenum; incl_file->file = srcpos_file;
incl_file->file = yyin;
incl_file->prev = incl_file_stack; incl_file->prev = incl_file_stack;


incl_file_stack = incl_file; incl_file_stack = incl_file;
@ -282,9 +292,9 @@ int push_input_file(const char *filename)
/* /*
* Establish new context. * Establish new context.
*/ */
srcpos_filenum = lookup_file_name(filename, 0); srcpos_file = newfile;
yylineno = 1; yylineno = 1;
yyin = f; yyin = newfile->file;
yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));


return 1; return 1;
@ -298,7 +308,7 @@ int pop_input_file(void)
if (incl_file_stack == 0) if (incl_file_stack == 0)
return 0; return 0;


fclose(yyin); dtc_close_file(srcpos_file);


/* /*
* Pop. * Pop.
@ -313,8 +323,8 @@ int pop_input_file(void)
yy_delete_buffer(YY_CURRENT_BUFFER); yy_delete_buffer(YY_CURRENT_BUFFER);
yy_switch_to_buffer(incl_file->yy_prev_buf); yy_switch_to_buffer(incl_file->yy_prev_buf);
yylineno = incl_file->yy_prev_lineno; yylineno = incl_file->yy_prev_lineno;
srcpos_filenum = incl_file->filenum; srcpos_file = incl_file->file;
yyin = incl_file->file; yyin = incl_file->file ? incl_file->file->file : NULL;


/* /*
* Free old state. * Free old state.

2
dtc-parser.y
Unescape View File

@ -309,7 +309,7 @@ label:


void yyerrorf(char const *s, ...) void yyerrorf(char const *s, ...)
{ {
const char *fname = srcpos_filename_for_num(yylloc.filenum); const char *fname = srcpos_file ? srcpos_file->name : "<no-file>";
va_list va; va_list va;
va_start(va, s); va_start(va, s);



14
dtc.c
Unescape View File

@ -118,7 +118,7 @@ int main(int argc, char *argv[])
int force = 0, check = 0; int force = 0, check = 0;
const char *arg; const char *arg;
int opt; int opt;
FILE *inf = NULL; struct dtc_file *inf = NULL;
FILE *outf = NULL; FILE *outf = NULL;
int outversion = DEFAULT_FDT_VERSION; int outversion = DEFAULT_FDT_VERSION;
int boot_cpuid_phys = 0xfeedbeef; int boot_cpuid_phys = 0xfeedbeef;
@ -192,14 +192,18 @@ int main(int argc, char *argv[])
} else if (streq(inform, "fs")) { } else if (streq(inform, "fs")) {
bi = dt_from_fs(arg); bi = dt_from_fs(arg);
} else if(streq(inform, "dtb")) { } else if(streq(inform, "dtb")) {
inf = dtc_open_file(arg); inf = dtc_open_file(arg, NULL);
bi = dt_from_blob(inf); if (!inf)
die("Couldn't open \"%s\": %s\n", arg,
strerror(errno));

bi = dt_from_blob(inf->file);
} else { } else {
die("Unknown input format \"%s\"\n", inform); die("Unknown input format \"%s\"\n", inform);
} }


if (inf && (inf != stdin)) if (inf && inf->file != stdin)
fclose(inf); fclose(inf->file);


if (! bi || ! bi->dt) if (! bi || ! bi->dt)
die("Couldn't read input tree\n"); die("Couldn't read input tree\n");

126
srcpos.c
Unescape View File

@ -20,86 +20,94 @@
#include "dtc.h" #include "dtc.h"
#include "srcpos.h" #include "srcpos.h"



/*
* Record the complete unique set of opened file names.
* Primarily used to cache source position file names.
*/
#define MAX_N_FILE_NAMES (100)

const char *file_names[MAX_N_FILE_NAMES];
static int n_file_names = 0;

/* /*
* Like yylineno, this is the current open file pos. * Like yylineno, this is the current open file pos.
*/ */


int srcpos_filenum = -1; struct dtc_file *srcpos_file;




static int dtc_open_one(struct dtc_file *file,
FILE *dtc_open_file(const char *fname) const char *search,
const char *fname)
{ {
FILE *f; char *fullname;


if (lookup_file_name(fname, 1) < 0) if (search) {
die("Too many files opened\n"); fullname = malloc(strlen(search) + strlen(fname) + 2);

if (!fullname)
if (streq(fname, "-")) die("Out of memory\n");
f = stdin;
else strcpy(fullname, search);
f = fopen(fname, "r"); strcat(fullname, "/");
strcat(fullname, fname);
} else {
fullname = strdup(fname);
}


if (! f) file->file = fopen(fullname, "r");
die("Couldn't open \"%s\": %s\n", fname, strerror(errno)); if (!file->file) {
free(fullname);
return 0;
}


return f; file->name = fullname;
return 1;
} }





struct dtc_file *dtc_open_file(const char *fname,
/* const struct search_path *search)
* Locate and optionally add filename fname in the file_names[] array.
*
* If the filename is currently not in the array and the boolean
* add_it is non-zero, an attempt to add the filename will be made.
*
* Returns;
* Index [0..MAX_N_FILE_NAMES) where the filename is kept
* -1 if the name can not be recorded
*/

int lookup_file_name(const char *fname, int add_it)
{ {
int i; static const struct search_path default_search = { NULL, NULL, NULL };


for (i = 0; i < n_file_names; i++) { struct dtc_file *file;
if (strcmp(file_names[i], fname) == 0) const char *slash;
return i;
file = malloc(sizeof(struct dtc_file));
if (!file)
die("Out of memory\n");

slash = strrchr(fname, '/');
if (slash) {
char *dir = malloc(slash - fname + 1);
if (!dir)
die("Out of memory\n");

memcpy(dir, fname, slash - fname);
dir[slash - fname] = 0;
file->dir = dir;
} else {
file->dir = NULL;
} }


if (add_it) { if (streq(fname, "-")) {
if (n_file_names < MAX_N_FILE_NAMES) { file->name = "stdin";
file_names[n_file_names] = strdup(fname); file->file = stdin;
return n_file_names++; return file;
}
} }


return -1; if (!search)
} search = &default_search;


while (search) {
if (dtc_open_one(file, search->dir, fname))
return file;


const char *srcpos_filename_for_num(int filenum) if (errno != ENOENT)
{ goto out;
if (0 <= filenum && filenum < n_file_names) {
return file_names[filenum]; search = search->next;
} }


return 0; out:
free(file);
return NULL;
} }



void dtc_close_file(struct dtc_file *file)
const char *srcpos_get_filename(void)
{ {
return srcpos_filename_for_num(srcpos_filenum); if (fclose(file->file))
die("Error closing \"%s\": %s\n", file->name, strerror(errno));

free(file);
} }

28
srcpos.h
Unescape View File

@ -22,13 +22,21 @@
* array of all opened filenames. * array of all opened filenames.
*/ */


#include <stdio.h>

struct dtc_file {
const char *dir;
const char *name;
FILE *file;
};

#if ! defined(YYLTYPE) && ! defined(YYLTYPE_IS_DECLARED) #if ! defined(YYLTYPE) && ! defined(YYLTYPE_IS_DECLARED)
typedef struct YYLTYPE { typedef struct YYLTYPE {
int first_line; int first_line;
int first_column; int first_column;
int last_line; int last_line;
int last_column; int last_column;
int filenum; struct dtc_file *file;
} YYLTYPE; } YYLTYPE;


#define YYLTYPE_IS_DECLARED 1 #define YYLTYPE_IS_DECLARED 1
@ -48,7 +56,7 @@ typedef struct YYLTYPE {
(Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
(Current).last_line = YYRHSLOC (Rhs, N).last_line; \ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
(Current).last_column = YYRHSLOC (Rhs, N).last_column; \ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
(Current).filenum = YYRHSLOC (Rhs, N).filenum; \ (Current).file = YYRHSLOC (Rhs, N).file; \
} \ } \
else \ else \
{ \ { \
@ -56,7 +64,7 @@ typedef struct YYLTYPE {
YYRHSLOC (Rhs, 0).last_line; \ YYRHSLOC (Rhs, 0).last_line; \
(Current).first_column = (Current).last_column = \ (Current).first_column = (Current).last_column = \
YYRHSLOC (Rhs, 0).last_column; \ YYRHSLOC (Rhs, 0).last_column; \
(Current).filenum = YYRHSLOC (Rhs, 0).filenum; \ (Current).file = YYRHSLOC (Rhs, 0).file; \
} \ } \
while (YYID (0)) while (YYID (0))


@ -65,12 +73,16 @@ typedef struct YYLTYPE {
extern void yyerror(char const *); extern void yyerror(char const *);
extern void yyerrorf(char const *, ...) __attribute__((format(printf, 1, 2))); extern void yyerrorf(char const *, ...) __attribute__((format(printf, 1, 2)));


extern int srcpos_filenum; extern struct dtc_file *srcpos_file;


extern int push_input_file(const char *filename); extern int push_input_file(const char *filename);
extern int pop_input_file(void); extern int pop_input_file(void);


extern FILE *dtc_open_file(const char *fname); struct search_path {
extern int lookup_file_name(const char *fname, int add_it); const char *dir; /* NULL for current directory */
extern const char *srcpos_filename_for_num(int filenum); struct search_path *prev, *next;
const char *srcpos_get_filename(void); };

extern struct dtc_file *dtc_open_file(const char *fname,
const struct search_path *search);
extern void dtc_close_file(struct dtc_file *file);

Write Preview
Loading…
Cancel
Save