From 8c59a97ce096ab1e25fa828cbff371b3953e990c Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Fri, 14 Sep 2018 14:01:09 +0100 Subject: Fix missing labels when emitting dts format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When there is a label inside a sequence of ints at the end of a property, an assertion is hit because write_propval() expects all the labels to be at the very end of the property data. This is clearly wrong behaviour. To reproduce run: "dtc -O dts tests/label01.dts". dtc fails on property /randomnode/blob. Fix by reworking the write_propval() loop to remove the separate iterating over label markers. Instead handle the label markers as part of the main marker iteration loop. This guarantees that each label marker is handled at the right location, even if all the data markers have already been handled, and has the added advantage of making the code simpler. However, a side effect of this code is that a label at the very end of an int sequence will be emitted outside the sequence delimiters. For example: Input: intprop = < 1 2 L1: >, L2: < 3 4 L3: > L4:; Output: intprop = < 1 2 >, L1: L2: < 3 4 > L3: L4:; The two representations are equivalent in the data model, but the current test case was looking for the former, but needed to be modified to look for the later. The alternative would be to render labels before closing the sequence, but that makes less sense syntactically because labels between sequences are normally to point at the next one, not the former. For example: Input: intprop = < 1 2 L1: >, L2: < 3 4 L3: > L4:; Output: intprop = < 1 2 L1: L2: >, < 3 4 L3: L4: >; DTC doesn't current have the information to know if the label should be inside or outside the sequence, but in common usage, it is more likely that L1 & L2 refer to the second sequence, not the end of the first. Fixes: 32b9c6130762 ("Preserve datatype markers when emitting dts format") Reported-by: Łukasz Dobrowolski Signed-off-by: Grant Likely Cc: David Gibson Cc: Rob Herring Signed-off-by: David Gibson --- tests/type-preservation.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/type-preservation.dts b/tests/type-preservation.dts index 06d5778..3e380ba 100644 --- a/tests/type-preservation.dts +++ b/tests/type-preservation.dts @@ -9,12 +9,12 @@ reg = <0x01>; int-array = <0x00 0x01>, int_value_label: <0x02 0x03>; int8 = [56]; - int8-array = [00 12 34 56 label:]; + int8-array = [00 12 34 56] label:; int16 = /bits/ 16 <0x3210>; int16-array = /bits/ 16 <0x1234 0x5678 0x90ab 0xcdef>; int16-matrix = /bits/ 16 <0x1234 0x5678>, <0x90ab 0xcdef>; int64 = /bits/ 64 <0x200000000>; - int64-array = /bits/ 64 <0x100000000 0x00 int64_array_label_end:>; + int64-array = /bits/ 64 <0x100000000 0x00> int64_array_label_end:; a-string-with-nulls = "foo\0bar", "baz"; subsub1: subsubnode { -- cgit v1.1