of/flattree: Update dtc to current mainline.

Pull in recent changes from the main dtc repository. These changes
primarily allow multiple device trees to be declared which are merged
by dtc. This feature allows us to include a basic dts file and then
provide more information for the specific system through the merging
functionality.

Changes pulled from git://git.jdl.com/software/dtc.git
commit id: 37c0b6a0, "dtc: Add code to make diffing trees easier"

Signed-off-by: John Bonesio <bones@secretlab.ca>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 23 insertions, 152 deletions

diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index a627bbee91d4..e866ea5166ac 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -18,7 +18,7 @@
  *                                                                   USA
  */
 
-%option noyywrap noinput nounput yylineno
+%option noyywrap nounput noinput never-interactive
 
 %x INCLUDE
 %x BYTESTRING
@@ -38,6 +38,13 @@ LINECOMMENT	"//".*\n
 #include "srcpos.h"
 #include "dtc-parser.tab.h"
 
+YYLTYPE yylloc;
+
+/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+#define YY_USER_ACTION \
+        { \
+                srcpos_update(&yylloc, yytext, yyleng); \
+        }
 
 /*#define LEXDEBUG      1*/
 
@@ -47,15 +54,10 @@ LINECOMMENT	"//".*\n
 #define DPRINT(fmt, ...)        do { } while (0)
 #endif
 
-static int dts_version; /* = 0 */
+static int dts_version = 1;
 
-#define BEGIN_DEFAULT() if (dts_version == 0) { \
-                                DPRINT("<INITIAL>\n"); \
-                                BEGIN(INITIAL); \
-                        } else { \
-                                DPRINT("<V1>\n"); \
+#define BEGIN_DEFAULT()         DPRINT("<V1>\n"); \
                                 BEGIN(V1); \
-                        }
 
 static void push_input_file(const char *filename);
 static int pop_input_file(void);
@@ -75,18 +77,13 @@ static int pop_input_file(void);
                 }
 
 <*>{STRING}     {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("String: %s\n", yytext);
                         yylval.data = data_copy_escape_string(yytext+1,
                                         yyleng-2);
-                        yylloc.first_line = yylineno;
                         return DT_STRING;
                 }
 
 <*>"/dts-v1/"   {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("Keyword: /dts-v1/\n");
                         dts_version = 1;
                         BEGIN_DEFAULT();
@@ -94,106 +91,57 @@ static int pop_input_file(void);
                 }
 
 <*>"/memreserve/"       {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("Keyword: /memreserve/\n");
                         BEGIN_DEFAULT();
                         return DT_MEMRESERVE;
                 }
 
 <*>{LABEL}:     {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("Label: %s\n", yytext);
-                        yylval.labelref = strdup(yytext);
+                        yylval.labelref = xstrdup(yytext);
                         yylval.labelref[yyleng-1] = '\0';
                         return DT_LABEL;
                 }
 
-<INITIAL>[bodh]# {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
-                        if (*yytext == 'b')
-                                yylval.cbase = 2;
-                        else if (*yytext == 'o')
-                                yylval.cbase = 8;
-                        else if (*yytext == 'd')
-                                yylval.cbase = 10;
-                        else
-                                yylval.cbase = 16;
-                        DPRINT("Base: %d\n", yylval.cbase);
-                        return DT_BASE;
-                }
-
-<INITIAL>[0-9a-fA-F]+   {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
-                        yylval.literal = strdup(yytext);
-                        DPRINT("Literal: '%s'\n", yylval.literal);
-                        return DT_LEGACYLITERAL;
-                }
-
 <V1>[0-9]+|0[xX][0-9a-fA-F]+      {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
-                        yylval.literal = strdup(yytext);
+                        yylval.literal = xstrdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
                         return DT_LITERAL;
                 }
 
-\&{LABEL}       {       /* label reference */
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
+<*>\&{LABEL}    {       /* label reference */
                         DPRINT("Ref: %s\n", yytext+1);
-                        yylval.labelref = strdup(yytext+1);
+                        yylval.labelref = xstrdup(yytext+1);
                         return DT_REF;
                 }
 
-"&{/"{PATHCHAR}+\}      {       /* new-style path reference */
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
+<*>"&{/"{PATHCHAR}+\}   {       /* new-style path reference */
                         yytext[yyleng-1] = '\0';
                         DPRINT("Ref: %s\n", yytext+2);
-                        yylval.labelref = strdup(yytext+2);
-                        return DT_REF;
-                }
-
-<INITIAL>"&/"{PATHCHAR}+ {      /* old-style path reference */
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
-                        DPRINT("Ref: %s\n", yytext+1);
-                        yylval.labelref = strdup(yytext+1);
+                        yylval.labelref = xstrdup(yytext+2);
                         return DT_REF;
                 }
 
 <BYTESTRING>[0-9a-fA-F]{2} {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         yylval.byte = strtol(yytext, NULL, 16);
                         DPRINT("Byte: %02x\n", (int)yylval.byte);
                         return DT_BYTE;
                 }
 
 <BYTESTRING>"]" {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("/BYTESTRING\n");
                         BEGIN_DEFAULT();
                         return ']';
                 }
 
 <PROPNODENAME>{PROPNODECHAR}+ {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("PropNodeName: %s\n", yytext);
-                        yylval.propnodename = strdup(yytext);
+                        yylval.propnodename = xstrdup(yytext);
                         BEGIN_DEFAULT();
                         return DT_PROPNODENAME;
                 }
 
 "/incbin/"      {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("Binary Include\n");
                         return DT_INCBIN;
                 }
@@ -203,8 +151,6 @@ static int pop_input_file(void);
 <*>{LINECOMMENT}+ /* eat C++-style comments */
 
 <*>.            {
-                        yylloc.file = srcpos_file;
-                        yylloc.first_line = yylineno;
                         DPRINT("Char: %c (\\x%02x)\n", yytext[0],
                                 (unsigned)yytext[0]);
                         if (yytext[0] == '[') {
@@ -221,100 +167,25 @@ static int pop_input_file(void);
 
 %%
 
-
-/*
- * 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);
+        srcfile_push(filename);
 
-        incl_file = xmalloc(sizeof(struct incl_file));
+        yyin = current_srcfile->f;
 
-        /*
-         * 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));
+        yypush_buffer_state(yy_create_buffer(yyin, YY_BUF_SIZE));
 }
 
 
 static int pop_input_file(void)
 {
-        struct incl_file *incl_file;
-
-        if (incl_file_stack == 0)
+        if (srcfile_pop() == 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);
+        yypop_buffer_state();
+        yyin = current_srcfile->f;
 
         return 1;
 }