Index: head/contrib/dtc/dtc-lexer.l =================================================================== --- head/contrib/dtc/dtc-lexer.l (revision 204488) +++ head/contrib/dtc/dtc-lexer.l (revision 204489) @@ -1,264 +1,266 @@ /* * (C) Copyright David Gibson , IBM Corporation. 2005. * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA */ %option noyywrap nounput noinput yylineno %x INCLUDE %x BYTESTRING %x PROPNODENAME %s V1 PROPNODECHAR [a-zA-Z0-9,._+*#?@-] PATHCHAR ({PROPNODECHAR}|[/]) LABEL [a-zA-Z_][a-zA-Z0-9_]* STRING \"([^\\"]|\\.)*\" WS [[:space:]] COMMENT "/*"([^*]|\*+[^*/])*\*+"/" LINECOMMENT "//".*\n %{ #include "dtc.h" #include "srcpos.h" #include "dtc-parser.tab.h" +YYLTYPE yylloc; + #define YY_USER_ACTION \ { \ yylloc.file = srcpos_file; \ yylloc.first_line = yylineno; \ } /*#define LEXDEBUG 1*/ #ifdef LEXDEBUG #define DPRINT(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) #else #define DPRINT(fmt, ...) do { } while (0) #endif static int dts_version = 1; #define BEGIN_DEFAULT() DPRINT("\n"); \ BEGIN(V1); \ static void push_input_file(const char *filename); static int pop_input_file(void); %} %% <*>"/include/"{WS}*{STRING} { char *name = strchr(yytext, '\"') + 1; yytext[yyleng-1] = '\0'; push_input_file(name); } <*><> { if (!pop_input_file()) { yyterminate(); } } <*>{STRING} { DPRINT("String: %s\n", yytext); yylval.data = data_copy_escape_string(yytext+1, yyleng-2); return DT_STRING; } <*>"/dts-v1/" { DPRINT("Keyword: /dts-v1/\n"); dts_version = 1; BEGIN_DEFAULT(); return DT_V1; } <*>"/memreserve/" { DPRINT("Keyword: /memreserve/\n"); BEGIN_DEFAULT(); return DT_MEMRESERVE; } <*>{LABEL}: { DPRINT("Label: %s\n", yytext); yylval.labelref = xstrdup(yytext); yylval.labelref[yyleng-1] = '\0'; return DT_LABEL; } [0-9]+|0[xX][0-9a-fA-F]+ { yylval.literal = xstrdup(yytext); DPRINT("Literal: '%s'\n", yylval.literal); return DT_LITERAL; } \&{LABEL} { /* label reference */ DPRINT("Ref: %s\n", yytext+1); yylval.labelref = xstrdup(yytext+1); return DT_REF; } "&{/"{PATHCHAR}+\} { /* new-style path reference */ yytext[yyleng-1] = '\0'; DPRINT("Ref: %s\n", yytext+2); yylval.labelref = xstrdup(yytext+2); return DT_REF; } [0-9a-fA-F]{2} { yylval.byte = strtol(yytext, NULL, 16); DPRINT("Byte: %02x\n", (int)yylval.byte); return DT_BYTE; } "]" { DPRINT("/BYTESTRING\n"); BEGIN_DEFAULT(); return ']'; } {PROPNODECHAR}+ { DPRINT("PropNodeName: %s\n", yytext); yylval.propnodename = xstrdup(yytext); BEGIN_DEFAULT(); return DT_PROPNODENAME; } "/incbin/" { DPRINT("Binary Include\n"); return DT_INCBIN; } <*>{WS}+ /* eat whitespace */ <*>{COMMENT}+ /* eat C-style comments */ <*>{LINECOMMENT}+ /* eat C++-style comments */ <*>. { DPRINT("Char: %c (\\x%02x)\n", yytext[0], (unsigned)yytext[0]); if (yytext[0] == '[') { DPRINT("\n"); BEGIN(BYTESTRING); } if ((yytext[0] == '{') || (yytext[0] == ';')) { DPRINT("\n"); BEGIN(PROPNODENAME); } return yytext[0]; } %% /* * Stack of nested include file contexts. */ struct incl_file { struct dtc_file *file; YY_BUFFER_STATE yy_prev_buf; int yy_prev_lineno; struct incl_file *prev; }; static struct incl_file *incl_file_stack; /* * Detect infinite include recursion. */ #define MAX_INCLUDE_DEPTH (100) static int incl_depth = 0; static void push_input_file(const char *filename) { struct incl_file *incl_file; struct dtc_file *newfile; struct search_path search, *searchptr = NULL; assert(filename); if (incl_depth++ >= MAX_INCLUDE_DEPTH) die("Includes nested too deeply"); if (srcpos_file) { search.dir = srcpos_file->dir; search.next = NULL; search.prev = NULL; searchptr = &search; } newfile = dtc_open_file(filename, searchptr); incl_file = xmalloc(sizeof(struct incl_file)); /* * Save current context. */ incl_file->yy_prev_buf = YY_CURRENT_BUFFER; incl_file->yy_prev_lineno = yylineno; incl_file->file = srcpos_file; incl_file->prev = incl_file_stack; incl_file_stack = incl_file; /* * Establish new context. */ srcpos_file = newfile; yylineno = 1; yyin = newfile->file; yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE)); } static int pop_input_file(void) { struct incl_file *incl_file; if (incl_file_stack == 0) return 0; dtc_close_file(srcpos_file); /* * Pop. */ --incl_depth; incl_file = incl_file_stack; incl_file_stack = incl_file->prev; /* * Recover old context. */ yy_delete_buffer(YY_CURRENT_BUFFER); yy_switch_to_buffer(incl_file->yy_prev_buf); yylineno = incl_file->yy_prev_lineno; srcpos_file = incl_file->file; yyin = incl_file->file ? incl_file->file->file : NULL; /* * Free old state. */ free(incl_file); return 1; } Index: head/contrib/dtc/dtc-parser.y =================================================================== --- head/contrib/dtc/dtc-parser.y (revision 204488) +++ head/contrib/dtc/dtc-parser.y (revision 204489) @@ -1,320 +1,321 @@ /* * (C) Copyright David Gibson , IBM Corporation. 2005. * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA */ -%locations %{ #include #include "dtc.h" #include "srcpos.h" + +YYLTYPE yylloc; extern int yylex(void); extern void yyerror(char const *s); extern struct boot_info *the_boot_info; extern int treesource_error; static unsigned long long eval_literal(const char *s, int base, int bits); %} %union { char *propnodename; char *literal; char *labelref; unsigned int cbase; uint8_t byte; struct data data; uint64_t addr; cell_t cell; struct property *prop; struct property *proplist; struct node *node; struct node *nodelist; struct reserve_info *re; } %token DT_V1 %token DT_MEMRESERVE %token DT_PROPNODENAME %token DT_LITERAL %token DT_BASE %token DT_BYTE %token DT_STRING %token DT_LABEL %token DT_REF %token DT_INCBIN %type propdata %type propdataprefix %type memreserve %type memreserves %type addr %type celllist %type cellval %type bytestring %type propdef %type proplist %type devicetree %type nodedef %type subnode %type subnodes %type label %% sourcefile: DT_V1 ';' memreserves devicetree { the_boot_info = build_boot_info($3, $4, 0); } ; memreserves: /* empty */ { $$ = NULL; } | memreserve memreserves { $$ = chain_reserve_entry($1, $2); } ; memreserve: label DT_MEMRESERVE addr addr ';' { $$ = build_reserve_entry($3, $4, $1); } ; addr: DT_LITERAL { $$ = eval_literal($1, 0, 64); } ; devicetree: '/' nodedef { $$ = name_node($2, "", NULL); } ; nodedef: '{' proplist subnodes '}' ';' { $$ = build_node($2, $3); } ; proplist: /* empty */ { $$ = NULL; } | proplist propdef { $$ = chain_property($2, $1); } ; propdef: label DT_PROPNODENAME '=' propdata ';' { $$ = build_property($2, $4, $1); } | label DT_PROPNODENAME ';' { $$ = build_property($2, empty_data, $1); } ; propdata: propdataprefix DT_STRING { $$ = data_merge($1, $2); } | propdataprefix '<' celllist '>' { $$ = data_merge($1, $3); } | propdataprefix '[' bytestring ']' { $$ = data_merge($1, $3); } | propdataprefix DT_REF { $$ = data_add_marker($1, REF_PATH, $2); } | propdataprefix DT_INCBIN '(' DT_STRING ',' addr ',' addr ')' { struct search_path path = { srcpos_file->dir, NULL, NULL }; struct dtc_file *file = dtc_open_file($4.val, &path); struct data d = empty_data; if ($6 != 0) if (fseek(file->file, $6, SEEK_SET) != 0) srcpos_error(&yylloc, "Couldn't seek to offset %llu in \"%s\": %s", (unsigned long long)$6, $4.val, strerror(errno)); d = data_copy_file(file->file, $8); $$ = data_merge($1, d); dtc_close_file(file); } | propdataprefix DT_INCBIN '(' DT_STRING ')' { struct search_path path = { srcpos_file->dir, NULL, NULL }; struct dtc_file *file = dtc_open_file($4.val, &path); struct data d = empty_data; d = data_copy_file(file->file, -1); $$ = data_merge($1, d); dtc_close_file(file); } | propdata DT_LABEL { $$ = data_add_marker($1, LABEL, $2); } ; propdataprefix: /* empty */ { $$ = empty_data; } | propdata ',' { $$ = $1; } | propdataprefix DT_LABEL { $$ = data_add_marker($1, LABEL, $2); } ; celllist: /* empty */ { $$ = empty_data; } | celllist cellval { $$ = data_append_cell($1, $2); } | celllist DT_REF { $$ = data_append_cell(data_add_marker($1, REF_PHANDLE, $2), -1); } | celllist DT_LABEL { $$ = data_add_marker($1, LABEL, $2); } ; cellval: DT_LITERAL { $$ = eval_literal($1, 0, 32); } ; bytestring: /* empty */ { $$ = empty_data; } | bytestring DT_BYTE { $$ = data_append_byte($1, $2); } | bytestring DT_LABEL { $$ = data_add_marker($1, LABEL, $2); } ; subnodes: /* empty */ { $$ = NULL; } | subnode subnodes { $$ = chain_node($1, $2); } | subnode propdef { yyerror("syntax error: properties must precede subnodes"); YYERROR; } ; subnode: label DT_PROPNODENAME nodedef { $$ = name_node($3, $2, $1); } ; label: /* empty */ { $$ = NULL; } | DT_LABEL { $$ = $1; } ; %% void yyerror(char const *s) { srcpos_error(&yylloc, "%s", s); treesource_error = 1; } static unsigned long long eval_literal(const char *s, int base, int bits) { unsigned long long val; char *e; errno = 0; val = strtoull(s, &e, base); if (*e) yyerror("bad characters in literal"); else if ((errno == ERANGE) || ((bits < 64) && (val >= (1ULL << bits)))) yyerror("literal out of range"); else if (errno != 0) yyerror("bad literal"); return val; }