diff options
| -rw-r--r-- | dtc-lexer.l | 40 | ||||
| -rw-r--r-- | dtc-parser.y | 38 | ||||
| -rwxr-xr-x | tests/run_tests.sh | 4 | ||||
| -rw-r--r-- | tests/test_tree1.dts | 14 | ||||
| -rw-r--r-- | tests/test_tree1_dts0.dts | 27 |
5 files changed, 107 insertions, 16 deletions
diff --git a/dtc-lexer.l b/dtc-lexer.l index 677abe4..eec6527 100644 --- a/dtc-lexer.l +++ b/dtc-lexer.l @@ -23,6 +23,7 @@ %x INCLUDE %x BYTESTRING %x PROPNODENAME +%s V1 PROPCHAR [a-zA-Z0-9,._+*#?-] UNITCHAR [0-9a-f,] @@ -44,12 +45,18 @@ REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@]) #define DPRINT(fmt, ...) do { } while (0) #endif +static int dts_version; /* = 0 */ - +#define BEGIN_DEFAULT() if (dts_version == 0) { \ + DPRINT("<INITIAL>\n"); \ + BEGIN(INITIAL); \ + } else { \ + DPRINT("<V1>\n"); \ + BEGIN(V1); \ + } %} %% - <*>"/include/" BEGIN(INCLUDE); <INCLUDE>\"[^"\n]*\" { @@ -58,7 +65,7 @@ REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@]) /* Some unrecoverable error.*/ exit(1); } - BEGIN(INITIAL); + BEGIN_DEFAULT(); } @@ -78,11 +85,20 @@ REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@]) return DT_STRING; } +<*>"/dts-v1/" { + yylloc.filenum = srcpos_filenum; + yylloc.first_line = yylineno; + DPRINT("Keyword: /dts-v1/\n"); + dts_version = 1; + BEGIN_DEFAULT(); + return DT_V1; + } + <*>"/memreserve/" { yylloc.filenum = srcpos_filenum; yylloc.first_line = yylineno; DPRINT("Keyword: /memreserve/\n"); - BEGIN(INITIAL); + BEGIN_DEFAULT(); return DT_MEMRESERVE; } @@ -95,7 +111,7 @@ REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@]) return DT_LABEL; } -[bodh]# { +<INITIAL>[bodh]# { yylloc.filenum = srcpos_filenum; yylloc.first_line = yylineno; if (*yytext == 'b') @@ -110,7 +126,15 @@ REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@]) return DT_BASE; } -[0-9a-fA-F]+ { +<INITIAL>[0-9a-fA-F]+ { + yylloc.filenum = srcpos_filenum; + 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.filenum = srcpos_filenum; yylloc.first_line = yylineno; yylval.literal = strdup(yytext); @@ -138,7 +162,7 @@ REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@]) yylloc.filenum = srcpos_filenum; yylloc.first_line = yylineno; DPRINT("/BYTESTRING\n"); - BEGIN(INITIAL); + BEGIN_DEFAULT(); return ']'; } @@ -147,7 +171,7 @@ REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@]) yylloc.first_line = yylineno; DPRINT("PropNodeName: %s\n", yytext); yylval.propnodename = strdup(yytext); - BEGIN(INITIAL); + BEGIN_DEFAULT(); return DT_PROPNODENAME; } diff --git a/dtc-parser.y b/dtc-parser.y index 5ac3db7..d998bfe 100644 --- a/dtc-parser.y +++ b/dtc-parser.y @@ -48,9 +48,11 @@ extern struct boot_info *the_boot_info; struct reserve_info *re; } +%token DT_V1 %token DT_MEMRESERVE %token <propnodename> DT_PROPNODENAME %token <literal> DT_LITERAL +%token <literal> DT_LEGACYLITERAL %token <cbase> DT_BASE %token <byte> DT_BYTE %token <data> DT_STRING @@ -61,6 +63,8 @@ extern struct boot_info *the_boot_info; %type <data> propdataprefix %type <re> memreserve %type <re> memreserves +%type <re> v0_memreserve +%type <re> v0_memreserves %type <addr> addr %type <data> celllist %type <cbase> cellbase @@ -78,7 +82,11 @@ extern struct boot_info *the_boot_info; %% sourcefile: - memreserves devicetree + DT_V1 ';' memreserves devicetree + { + the_boot_info = build_boot_info($3, $4); + } + | v0_memreserves devicetree { the_boot_info = build_boot_info($1, $2); } @@ -100,6 +108,24 @@ memreserve: { $$ = build_reserve_entry($3, $4, $1); } + ; + +v0_memreserves: + /* empty */ + { + $$ = NULL; + } + | v0_memreserve v0_memreserves + { + $$ = chain_reserve_entry($1, $2); + }; + ; + +v0_memreserve: + memreserve + { + $$ = $1; + } | label DT_MEMRESERVE addr '-' addr ';' { $$ = build_reserve_entry($3, $5 - $3 + 1, $1); @@ -109,6 +135,10 @@ memreserve: addr: DT_LITERAL { + $$ = eval_literal($1, 0, 64); + } + | DT_LEGACYLITERAL + { $$ = eval_literal($1, 16, 64); } ; @@ -211,7 +241,11 @@ cellbase: ; cellval: - cellbase DT_LITERAL + DT_LITERAL + { + $$ = eval_literal($1, 0, 32); + } + | cellbase DT_LEGACYLITERAL { $$ = eval_literal($2, $1, 32); } diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 5cf849b..713e296 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -123,6 +123,10 @@ dtc_tests () { tree1_tests_rw dtc_tree1.test.dtb run_test dtbs_equal_ordered dtc_tree1.test.dtb test_tree1.dtb + run_test dtc.sh -I dts -O dtb -o dtc_tree1_dts0.test.dtb test_tree1_dts0.dts + tree1_tests dtc_tree1_dts0.test.dtb + tree1_tests_rw dtc_tree1_dts0.test.dtb + run_test dtc.sh -I dts -O dtb -o dtc_escapes.test.dtb escapes.dts run_test string_escapes dtc_escapes.test.dtb diff --git a/tests/test_tree1.dts b/tests/test_tree1.dts index ac920df..d5942fb 100644 --- a/tests/test_tree1.dts +++ b/tests/test_tree1.dts @@ -1,9 +1,11 @@ -/memreserve/ deadbeef00000000-deadbeef000fffff; -/memreserve/ 75bcd15 1000; +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; / { compatible = "test_tree1"; - prop-int = <deadbeef>; + prop-int = <0xdeadbeef>; prop-str = "hello world"; subnode@1 { @@ -12,16 +14,16 @@ subsubnode { compatible = "subsubnode1", "subsubnode"; - prop-int = <h# deadbeef>; + prop-int = <0xdeadbeef>; }; }; subnode@2 { - prop-int = <d# 123456789>; + prop-int = <123456789>; subsubnode@0 { compatible = "subsubnode2", "subsubnode"; - prop-int = <o# 0726746425>; + prop-int = <0726746425>; }; }; }; diff --git a/tests/test_tree1_dts0.dts b/tests/test_tree1_dts0.dts new file mode 100644 index 0000000..ac920df --- /dev/null +++ b/tests/test_tree1_dts0.dts @@ -0,0 +1,27 @@ +/memreserve/ deadbeef00000000-deadbeef000fffff; +/memreserve/ 75bcd15 1000; + +/ { + compatible = "test_tree1"; + prop-int = <deadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <h# deadbeef>; + }; + }; + + subnode@2 { + prop-int = <d# 123456789>; + + subsubnode@0 { + compatible = "subsubnode2", "subsubnode"; + prop-int = <o# 0726746425>; + }; + }; +}; |