Add merging of labelled subnodes. This patch allows the following
PATCH 1/1 Add merging of labelled subnodes. This patch allows the following
syntax:
/ {
child {
label: subchild {
};
};
};&label {
prop = "value";
};which will result in the following tree:
/ {
child {
label: subchild {
prop = "value";
};
};
};---
Hi Jon and David
This patch isn't quite finished yet, but I'm getting it out there for feedback. In particular, I'm don't know how best to handle errors in livetree.c. The way I'm currently handling it is calling yyerror() from livetree.c, which results in a compile warning.
I also don't yet have a test case for referencing a label that doesn't exist in the main tree.
I could use some help on how I should be implementing the error handling.
Thanks,
g.
---
dtc-lexer.l | 2 +- dtc-parser.y | 13 +++++++++++ dtc.h | 1 + livetree.c | 30 ++++++++++++++++++++++++++ tests/run_tests.sh | 2 ++ tests/test_tree1.dts | 2 +- tests/test_tree1_merge.dts | 4 +-- tests/test_tree1_merge_labelled.dts | 41 +++++++++++++++++++++++++++++++++++ 8 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 tests/test_tree1_merge_labelled.dts
dtc-lexer.l +1 -1
@@ -109,7 +109,7 @@ static int pop_input_file(void); return DT_LITERAL; } -\&{LABEL} { /* label reference */ +<*>\&{LABEL} { /* label reference */ DPRINT("Ref: %s\n", yytext+1); yylval.labelref = xstrdup(yytext+1); return DT_REF;
dtc-parser.y +13 -0
@@ -76,6 +76,7 @@ static unsigned long long eval_literal(const char *s, int base, int bits); %type <node> devicetree %type <node> devicetrees +%type <node> labelledtree %type <node> nodedef %type <node> subnode %type <nodelist> subnodes
@@ -129,6 +130,10 @@ devicetrees: { $$ = merge_nodes($1, $2); } + | devicetrees labelledtree + { + $$ = merge_labelled_node($1, $2); + } ; devicetree:
@@ -138,6 +143,14 @@ devicetree: } ; +labelledtree: + DT_REF nodedef + { + add_label(&$2->labels, $1); + $$ = $2; + } + ; + nodedef: '{' proplist subnodes '}' ';' {
dtc.h +1 -0
@@ -175,6 +175,7 @@ struct node *build_node(struct property *proplist, struct node *children);struct node *name_node (struct node *node,char *name);struct node *chain_node (struct node *first,struct node *list);struct node *merge_nodes (struct node *old_node,struct node *new_node); +struct node *merge_labelled_node (struct node *tree,struct node *labelled_node);void add_property (struct node *node,struct property *prop);void add_child (struct node *parent,struct node *child);
livetree.c +30 -0
@@ -167,6 +167,36 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)return old_node; } +struct node *merge_labelled_node (struct node *tree,struct node *labelled_node) +{ +struct node *child, *rn; +struct label *tree_label, *child_label; + +/* First, check if this node matches */ +for_each_label (tree->labels, tree_label) { +for_each_label (labelled_node->labels, child_label) { +if (streq (tree_label->label, child_label->label)) +return merge_nodes (tree, labelled_node); + } + } + +/* Otherwise, recursivelly search the children for something matching */ +for_each_child (tree, child) { + rn =merge_labelled_node (child, labelled_node); +if (rn) +return tree; + } + +/* Nothing matched. If this is the root node, then this is an error */ +if (!tree->parent) { +yyerror ("parse error: undefined label in node redefinition" ); +return tree; + } + +/* return NULL so that recursive call knows nothing matched */ +return NULL ; +} +struct node *chain_node (struct node *first,struct node *list) {assert (first->next_sibling ==NULL );
tests/run_tests.sh +2 -0
@@ -300,6 +300,8 @@ dtc_tests () { # Check merge/overlay functionality run_dtc_test -I dts -O dtb -o dtc_tree1_merge.test.dtb test_tree1_merge.dts tree1_tests dtc_tree1_merge.test.dtb test_tree1.dtb + run_dtc_test -I dts -O dtb -o dtc_tree1_merge_labelled.test.dtb test_tree1_merge_labelled.dts + tree1_tests dtc_tree1_merge_labelled.test.dtb test_tree1.dtb run_dtc_test -I dts -O dtb -o multilabel_merge.test.dtb multilabel_merge.dts run_test references multilabel.test.dtb run_test dtbs_equal_ordered multilabel.test.dtb multilabel_merge.test.dtb
tests/test_tree1.dts +1 -1
@@ -25,7 +25,7 @@ linux,phandle = <0x2000>; prop-int = <123456789>; - subsubnode@0 { + ssn0: subsubnode@0 { phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>;
tests/test_tree1_merge.dts +1 -3
@@ -34,12 +34,10 @@ prop-int = [deadbeef]; }; subnode@2 { - subsubnode@0 { + ssn0: subsubnode@0 { phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>; }; }; }; - -
tests/test_tree1_merge_labelled.dts new file +41 -0
41 lines not on this page · raw message
Quoted 22 lines · Grant Likely
syntax:
/ { child { label: subchild { }; }; };&label { prop = "value"; };which will result in the following tree:
/ { child { label: subchild { prop = "value"; }; }; };
Quoted 8 lines
---
Hi Jon and David
This patch isn't quite finished yet, but I'm getting it out there for feedback. In particular, I'm don't know how best to handle errors in
livetree.c. The way I'm currently handling it is callingyyerror()fromlivetree.c, which results in a compile warning.
Hrm, that's a bit ugly.
Quoted 2 lines
I also don't yet have a test case for referencing a label that doesn't exist in the main tree.
Ah, yeah. Testcases for incorrect input are often the fiddliest.
So, here's my counter-proposal. By rearranging the grammar a little, and putting the labelled merge logic into dtc-parser.y itself, it accomplishes the same thing without the warning, and with a bit less code.
dtc-lexer.l +1 -1
@@ -109,7 +109,7 @@ static int pop_input_file(void); return DT_LITERAL; } -\&{LABEL} { /* label reference */ +<*>\&{LABEL} { /* label reference */ DPRINT("Ref: %s\n", yytext+1); yylval.labelref = xstrdup(yytext+1); return DT_REF;
dtc-parser.y +14 -10
@@ -74,7 +74,6 @@ static unsigned long long eval_literal(c %type <prop> propdef %type <proplist> proplist -%type <node> devicetree %type <node> devicetrees %type <node> nodedef %type <node> subnode
@@ -121,20 +120,25 @@ addr: ; devicetrees: - devicetree + '/' nodedef { - $$ = $1; + $$ = name_node($2, ""); } - | devicetrees devicetree + | devicetrees '/' nodedef { - $$ = merge_nodes($1, $2); + $$ = merge_nodes($1, $3); } - ; - -devicetree: - '/' nodedef + | devicetrees DT_REF nodedef { - $$ = name_node($2, ""); + struct node *target; + + target = get_node_by_label($1, $2); + if (target) + merge_nodes(target, $3); + else + yyerror("label does not exist in " + " node redefinition"); + $$ = $1; } ;
tests/run_tests.sh +2 -0
@@ -301,6 +301,8 @@ dtc_tests () { # Check merge/overlay functionality run_dtc_test -I dts -O dtb -o dtc_tree1_merge.test.dtb test_tree1_merge.dts tree1_tests dtc_tree1_merge.test.dtb test_tree1.dtb + run_dtc_test -I dts -O dtb -o dtc_tree1_merge_labelled.test.dtb test_tree1_merge_labelled.dts + tree1_tests dtc_tree1_merge_labelled.test.dtb test_tree1.dtb run_dtc_test -I dts -O dtb -o multilabel_merge.test.dtb multilabel_merge.dts run_test references multilabel.test.dtb run_test dtbs_equal_ordered multilabel.test.dtb multilabel_merge.test.dtb
tests/test_tree1.dts +1 -1
@@ -25,7 +25,7 @@ linux,phandle = <0x2000>; prop-int = <123456789>; - subsubnode@0 { + ssn0: subsubnode@0 { phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>;
tests/test_tree1_merge.dts +1 -3
@@ -34,12 +34,10 @@ prop-int = [deadbeef]; }; subnode@2 { - subsubnode@0 { + ssn0: subsubnode@0 { phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>; }; }; }; - -
tests/test_tree1_merge_labelled.dts new file +41 -0
41 lines not on this page · raw message
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 37 lines · David Gibson
Quoted 22 lines · Grant Likely
syntax:
/ {
child {
label: subchild {
};
};
};&label {
prop = "value";
};which will result in the following tree:
/ {
child {
label: subchild {
prop = "value";
};
};
};Quoted 8 lines
---
Hi Jon and David
This patch isn't quite finished yet, but I'm getting it out there for feedback. In particular, I'm don't know how best to handle errors in
livetree.c. The way I'm currently handling it is callingyyerror()fromlivetree.c, which results in a compile warning.Hrm, that's a bit ugly.
Quoted 2 lines
I also don't yet have a test case for referencing a label that doesn't exist in the main tree.
Quoted 6 lines
Ah, yeah. Testcases for incorrect input are often the fiddliest.
So, here's my counter-proposal. By rearranging the grammar a little, and putting the labelled merge logic into dtc-parser.y itself, it accomplishes the same thing without the warning, and with a bit less code.
Nice. I like. I'll give it a spin tomorrow.
g.
Quoted 159 lines
Index: dtc/dtc-lexer.l
===================================================================dtc-lexer.l 2010-03-01 14:22:26.927391539 +1100 renamed from dtc-lexer.l 2010-02-09 10:26:06.840350087 +1100 +1
-1@@ -109,7 +109,7 @@ static int pop_input_file(void); return DT_LITERAL; } -\&{LABEL} { /* label reference */ +<*>\&{LABEL} { /* label reference */ DPRINT("Ref: %s\n", yytext+1); yylval.labelref = xstrdup(yytext+1); return DT_REF;Index: dtc/dtc-parser.y
===================================================================dtc-parser.y 2010-03-01 17:15:59.779380861 +1100 renamed from dtc-parser.y 2010-02-26 10:40:00.136001074 +1100 +0
-0@@ -74,7 +74,6 @@ static unsigned long long eval_literal(c%type <prop> propdef
%type <proplist> proplist-%type <node> devicetree
%type <node> devicetrees
%type <node> nodedef
%type <node> subnodedtc-parser.y 2010-03-01 17:15:59.779380861 +1100 renamed from dtc-parser.y 2010-02-26 10:40:00.136001074 +1100 +0
-0@@ -121,20 +120,25 @@ addr: ;devicetrees:
- devicetree
+ '/' nodedef
{
- $$ = $1;
+ $$ =name_node($2, "");
}
- | devicetrees devicetree
+ | devicetrees '/' nodedef
{
- $$ =merge_nodes($1, $2);
+ $$ =merge_nodes($1, $3);
}
- ;dtc-parser.y 2010-03-01 17:15:59.779380861 +1100 renamed from dtc-parser.y 2010-02-26 10:40:00.136001074 +1100 +1
-3- -devicetree: - '/' nodedef + | devicetrees DT_REF nodedef{
- $$ =name_node($2, "");
+ struct node *target;
+
+ target =get_node_by_label($1, $2);
+ if (target)
+merge_nodes(target, $3);
+ else
+ yyerror("label does not exist in "
+ " node redefinition");
+ $$ = $1;
}
;Index:
dtc/tests/run_tests.sh
===================================================================tests/run_tests.sh 2010-03-01 14:22:26.931385551 +1100 renamed from tests/run_tests.sh 2010-03-01 14:21:48.607391244 +1100 +0
-0@@ -301,6 +301,8 @@ dtc_tests () { # Check merge/overlay functionality
run_dtc_test-I dts -O dtb -o dtc_tree1_merge.test.dtbtest_tree1_merge.dtstree1_testsdtc_tree1_merge.test.dtb test_tree1.dtb
+ run_dtc_test -I dts -O dtb -o dtc_tree1_merge_labelled.test.dtbtest_tree1_merge_labelled.dts
+ tree1_tests dtc_tree1_merge_labelled.test.dtb test_tree1.dtb
run_dtc_test-I dts -O dtb -o multilabel_merge.test.dtbmultilabel_merge.dtsrun_testreferences multilabel.test.dtb
run_testdtbs_equal_orderedmultilabel.test.dtb multilabel_merge.test.dtb
Index:dtc/tests/test_tree1.dts
===================================================================tests/test_tree1.dts 2010-03-01 14:22:26.959424732 +1100 renamed from tests/test_tree1.dts 2009-11-27 08:45:46.000000000 +1100 +1
-1@@ -25,7 +25,7 @@ linux,phandle = <0x2000>; prop-int = <123456789>; - subsubnode@0 { + ssn0: subsubnode@0 { phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>;Index:
dtc/tests/test_tree1_merge.dts
===================================================================tests/test_tree1_merge.dts 2010-03-01 14:22:26.967424771 +1100 renamed from tests/test_tree1_merge.dts 2010-02-26 10:40:00.136001074 +1100 +1
-3@@ -34,12 +34,10 @@ prop-int = [deadbeef]; }; subnode@2 { - subsubnode@0 { + ssn0: subsubnode@0 { phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>; }; }; }; - -Index:
dtc/tests/test_tree1_merge_labelled.dts
===================================================================tests/test_tree1_merge_labelled.dts 2010-03-01 14:22:26.967424771 +1100 renamed from dev/null 1970-01-01 00:00:00.000000000 +0000 +41
-1@@ -0,0 +1,41 @@ +/dts-v1/; + +/memreserve/ 0xdeadbeef00000000 0x100000; +/memreserve/ 123456789 010000; + +/ { + compatible = "test_tree1"; + prop-int = <0xdeadbeef>; + prop-str = "hello world"; + + subnode@1 { + compatible = "subnode1"; + prop-int = [deadbeef]; + + subsubnode { + compatible = "subsubnode1", "subsubnode"; + prop-int = <0xdeadbeef>; + }; + + ss1 { + }; + }; + + subnode@2 { + linux,phandle = <0x2000>; + prop-int = <123456789>; + + ssn0: subsubnode@0 { + phandle = <0x2001>; + prop-int = <0xbad>; + }; + + ss2 { + }; + }; +}; + +&ssn0 { + compatible = "subsubnode2", "subsubnode"; + prop-int = <0726746425>; +}; --David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_!
http://www.ozlabs.org/~dgibson
Signature · 2 lines
Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.