diff options
Diffstat (limited to 'coverage-report/libfdt')
25 files changed, 427 insertions, 427 deletions
diff --git a/coverage-report/libfdt/fdt.c.func-sort-c.html b/coverage-report/libfdt/fdt.c.func-sort-c.html index 5792202..489bb95 100644 --- a/coverage-report/libfdt/fdt.c.func-sort-c.html +++ b/coverage-report/libfdt/fdt.c.func-sort-c.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">10</td> @@ -90,43 +90,43 @@ </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#87">fdt_check_header</a></td> - <td class="coverFnHi">11</td> + <td class="coverFnHi">9</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#81">fdt_header_size</a></td> - <td class="coverFnHi">11</td> + <td class="coverFnHi">9</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#67">fdt_header_size_</a></td> - <td class="coverFnHi">11</td> + <td class="coverFnHi">9</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#217">fdt_check_node_offset_</a></td> - <td class="coverFnHi">16</td> + <td class="coverFnHi">15</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#55">check_block_</a></td> - <td class="coverFnHi">22</td> + <td class="coverFnHi">18</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#16">fdt_ro_probe_</a></td> - <td class="coverFnHi">45</td> + <td class="coverFnHi">39</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#50">check_off_</a></td> - <td class="coverFnHi">55</td> + <td class="coverFnHi">45</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#309">fdt_find_string_</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#163">fdt_next_tag</a></td> - <td class="coverFnHi">3355</td> + <td class="coverFnHi">1069</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#141">fdt_offset_ptr</a></td> - <td class="coverFnHi">14315</td> + <td class="coverFnHi">4860</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/fdt.c.func.html b/coverage-report/libfdt/fdt.c.func.html index ad092d6..f149cf5 100644 --- a/coverage-report/libfdt/fdt.c.func.html +++ b/coverage-report/libfdt/fdt.c.func.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">10</td> @@ -70,19 +70,19 @@ </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#55">check_block_</a></td> - <td class="coverFnHi">22</td> + <td class="coverFnHi">18</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#50">check_off_</a></td> - <td class="coverFnHi">55</td> + <td class="coverFnHi">45</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#87">fdt_check_header</a></td> - <td class="coverFnHi">11</td> + <td class="coverFnHi">9</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#217">fdt_check_node_offset_</a></td> - <td class="coverFnHi">16</td> + <td class="coverFnHi">15</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#229">fdt_check_prop_offset_</a></td> @@ -90,7 +90,7 @@ </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#309">fdt_find_string_</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#281">fdt_first_subnode</a></td> @@ -98,11 +98,11 @@ </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#81">fdt_header_size</a></td> - <td class="coverFnHi">11</td> + <td class="coverFnHi">9</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#67">fdt_header_size_</a></td> - <td class="coverFnHi">11</td> + <td class="coverFnHi">9</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#321">fdt_move</a></td> @@ -118,15 +118,15 @@ </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#163">fdt_next_tag</a></td> - <td class="coverFnHi">3355</td> + <td class="coverFnHi">1069</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#141">fdt_offset_ptr</a></td> - <td class="coverFnHi">14315</td> + <td class="coverFnHi">4860</td> </tr> <tr> <td class="coverFn"><a href="fdt.c.gcov.html#16">fdt_ro_probe_</a></td> - <td class="coverFnHi">45</td> + <td class="coverFnHi">39</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/fdt.c.gcov.html b/coverage-report/libfdt/fdt.c.gcov.html index 00ccd1f..ce4eff3 100644 --- a/coverage-report/libfdt/fdt.c.gcov.html +++ b/coverage-report/libfdt/fdt.c.gcov.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">10</td> @@ -86,23 +86,23 @@ <a name="15"><span class="lineNum"> 15 </span> : : * that the given buffer contains what appears to be a flattened</a> <a name="16"><span class="lineNum"> 16 </span> : : * device tree with sane information in its header.</a> <a name="17"><span class="lineNum"> 17 </span> : : */</a> -<a name="18"><span class="lineNum"> 18 </span> :<span class="lineCov"> 45 : int32_t fdt_ro_probe_(const void *fdt)</span></a> +<a name="18"><span class="lineNum"> 18 </span> :<span class="lineCov"> 39 : int32_t fdt_ro_probe_(const void *fdt)</span></a> <a name="19"><span class="lineNum"> 19 </span> : : {</a> -<a name="20"><span class="lineNum"> 20 </span> :<span class="lineCov"> 45 : uint32_t totalsize = fdt_totalsize(fdt);</span></a> +<a name="20"><span class="lineNum"> 20 </span> :<span class="lineCov"> 39 : uint32_t totalsize = fdt_totalsize(fdt);</span></a> <a name="21"><span class="lineNum"> 21 </span> : : </a> -<a name="22"><span class="lineNum"> 22 </span> :<span class="lineCov"> 45 : if (can_assume(VALID_DTB))</span></a> +<a name="22"><span class="lineNum"> 22 </span> :<span class="lineCov"> 39 : if (can_assume(VALID_DTB))</span></a> <a name="23"><span class="lineNum"> 23 </span> :<span class="lineNoCov"> 0 : return totalsize;</span></a> <a name="24"><span class="lineNum"> 24 </span> : : </a> <a name="25"><span class="lineNum"> 25 </span> : : /* The device tree must be at an 8-byte aligned address */</a> -<a name="26"><span class="lineNum"> 26 </span> :<span class="lineCov"> 45 : if ((uintptr_t)fdt & 7)</span></a> +<a name="26"><span class="lineNum"> 26 </span> :<span class="lineCov"> 39 : if ((uintptr_t)fdt & 7)</span></a> <a name="27"><span class="lineNum"> 27 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_ALIGNMENT;</span></a> <a name="28"><span class="lineNum"> 28 </span> : : </a> -<a name="29"><span class="lineNum"> 29 </span> :<span class="lineCov"> 45 : if (fdt_magic(fdt) == FDT_MAGIC) {</span></a> +<a name="29"><span class="lineNum"> 29 </span> :<span class="lineCov"> 39 : if (fdt_magic(fdt) == FDT_MAGIC) {</span></a> <a name="30"><span class="lineNum"> 30 </span> : : /* Complete tree */</a> -<a name="31"><span class="lineNum"> 31 </span> :<span class="lineCov"> 45 : if (!can_assume(LATEST)) {</span></a> -<a name="32"><span class="lineNum"> 32 </span> :<span class="lineCov"> 45 : if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)</span></a> +<a name="31"><span class="lineNum"> 31 </span> :<span class="lineCov"> 39 : if (!can_assume(LATEST)) {</span></a> +<a name="32"><span class="lineNum"> 32 </span> :<span class="lineCov"> 39 : if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)</span></a> <a name="33"><span class="lineNum"> 33 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADVERSION;</span></a> -<a name="34"><span class="lineNum"> 34 </span> :<span class="lineCov"> 45 : if (fdt_last_comp_version(fdt) ></span></a> +<a name="34"><span class="lineNum"> 34 </span> :<span class="lineCov"> 39 : if (fdt_last_comp_version(fdt) ></span></a> <a name="35"><span class="lineNum"> 35 </span> : : FDT_LAST_SUPPORTED_VERSION)</a> <a name="36"><span class="lineNum"> 36 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADVERSION;</span></a> <a name="37"><span class="lineNum"> 37 </span> : : }</a> @@ -114,189 +114,189 @@ <a name="43"><span class="lineNum"> 43 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADMAGIC;</span></a> <a name="44"><span class="lineNum"> 44 </span> : : }</a> <a name="45"><span class="lineNum"> 45 </span> : : </a> -<a name="46"><span class="lineNum"> 46 </span> :<span class="lineCov"> 45 : if (totalsize < INT32_MAX)</span></a> -<a name="47"><span class="lineNum"> 47 </span> :<span class="lineCov"> 45 : return totalsize;</span></a> +<a name="46"><span class="lineNum"> 46 </span> :<span class="lineCov"> 39 : if (totalsize < INT32_MAX)</span></a> +<a name="47"><span class="lineNum"> 47 </span> :<span class="lineCov"> 39 : return totalsize;</span></a> <a name="48"><span class="lineNum"> 48 </span> : : else</a> <a name="49"><span class="lineNum"> 49 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_TRUNCATED;</span></a> <a name="50"><span class="lineNum"> 50 </span> : : }</a> <a name="51"><span class="lineNum"> 51 </span> : : </a> -<a name="52"><span class="lineNum"> 52 </span> :<span class="lineCov"> 55 : static int check_off_(uint32_t hdrsize, uint32_t totalsize, uint32_t off)</span></a> +<a name="52"><span class="lineNum"> 52 </span> :<span class="lineCov"> 45 : static int check_off_(uint32_t hdrsize, uint32_t totalsize, uint32_t off)</span></a> <a name="53"><span class="lineNum"> 53 </span> : : {</a> -<a name="54"><span class="lineNum"> 54 </span> :<span class="lineCov"> 55 : return (off >= hdrsize) && (off <= totalsize);</span></a> +<a name="54"><span class="lineNum"> 54 </span> :<span class="lineCov"> 45 : return (off >= hdrsize) && (off <= totalsize);</span></a> <a name="55"><span class="lineNum"> 55 </span> : : }</a> <a name="56"><span class="lineNum"> 56 </span> : : </a> -<a name="57"><span class="lineNum"> 57 </span> :<span class="lineCov"> 22 : static int check_block_(uint32_t hdrsize, uint32_t totalsize,</span></a> +<a name="57"><span class="lineNum"> 57 </span> :<span class="lineCov"> 18 : static int check_block_(uint32_t hdrsize, uint32_t totalsize,</span></a> <a name="58"><span class="lineNum"> 58 </span> : : uint32_t base, uint32_t size)</a> <a name="59"><span class="lineNum"> 59 </span> : : {</a> -<a name="60"><span class="lineNum"> 60 </span> :<span class="lineCov"> 22 : if (!check_off_(hdrsize, totalsize, base))</span></a> +<a name="60"><span class="lineNum"> 60 </span> :<span class="lineCov"> 18 : if (!check_off_(hdrsize, totalsize, base))</span></a> <a name="61"><span class="lineNum"> 61 </span> :<span class="lineNoCov"> 0 : return 0; /* block start out of bounds */</span></a> -<a name="62"><span class="lineNum"> 62 </span> :<span class="lineCov"> 22 : if ((base + size) < base)</span></a> +<a name="62"><span class="lineNum"> 62 </span> :<span class="lineCov"> 18 : if ((base + size) < base)</span></a> <a name="63"><span class="lineNum"> 63 </span> :<span class="lineNoCov"> 0 : return 0; /* overflow */</span></a> -<a name="64"><span class="lineNum"> 64 </span> :<span class="lineCov"> 22 : if (!check_off_(hdrsize, totalsize, base + size))</span></a> +<a name="64"><span class="lineNum"> 64 </span> :<span class="lineCov"> 18 : if (!check_off_(hdrsize, totalsize, base + size))</span></a> <a name="65"><span class="lineNum"> 65 </span> :<span class="lineNoCov"> 0 : return 0; /* block end out of bounds */</span></a> -<a name="66"><span class="lineNum"> 66 </span> :<span class="lineCov"> 22 : return 1;</span></a> +<a name="66"><span class="lineNum"> 66 </span> :<span class="lineCov"> 18 : return 1;</span></a> <a name="67"><span class="lineNum"> 67 </span> : : }</a> <a name="68"><span class="lineNum"> 68 </span> : : </a> -<a name="69"><span class="lineNum"> 69 </span> :<span class="lineCov"> 11 : size_t fdt_header_size_(uint32_t version)</span></a> +<a name="69"><span class="lineNum"> 69 </span> :<span class="lineCov"> 9 : size_t fdt_header_size_(uint32_t version)</span></a> <a name="70"><span class="lineNum"> 70 </span> : : {</a> -<a name="71"><span class="lineNum"> 71 </span> :<span class="lineCov"> 11 : if (version <= 1)</span></a> +<a name="71"><span class="lineNum"> 71 </span> :<span class="lineCov"> 9 : if (version <= 1)</span></a> <a name="72"><span class="lineNum"> 72 </span> :<span class="lineNoCov"> 0 : return FDT_V1_SIZE;</span></a> -<a name="73"><span class="lineNum"> 73 </span> :<span class="lineCov"> 11 : else if (version <= 2)</span></a> +<a name="73"><span class="lineNum"> 73 </span> :<span class="lineCov"> 9 : else if (version <= 2)</span></a> <a name="74"><span class="lineNum"> 74 </span> :<span class="lineNoCov"> 0 : return FDT_V2_SIZE;</span></a> -<a name="75"><span class="lineNum"> 75 </span> :<span class="lineCov"> 11 : else if (version <= 3)</span></a> +<a name="75"><span class="lineNum"> 75 </span> :<span class="lineCov"> 9 : else if (version <= 3)</span></a> <a name="76"><span class="lineNum"> 76 </span> :<span class="lineNoCov"> 0 : return FDT_V3_SIZE;</span></a> -<a name="77"><span class="lineNum"> 77 </span> :<span class="lineCov"> 11 : else if (version <= 16)</span></a> +<a name="77"><span class="lineNum"> 77 </span> :<span class="lineCov"> 9 : else if (version <= 16)</span></a> <a name="78"><span class="lineNum"> 78 </span> :<span class="lineNoCov"> 0 : return FDT_V16_SIZE;</span></a> <a name="79"><span class="lineNum"> 79 </span> : : else</a> -<a name="80"><span class="lineNum"> 80 </span> :<span class="lineCov"> 11 : return FDT_V17_SIZE;</span></a> +<a name="80"><span class="lineNum"> 80 </span> :<span class="lineCov"> 9 : return FDT_V17_SIZE;</span></a> <a name="81"><span class="lineNum"> 81 </span> : : }</a> <a name="82"><span class="lineNum"> 82 </span> : : </a> -<a name="83"><span class="lineNum"> 83 </span> :<span class="lineCov"> 11 : size_t fdt_header_size(const void *fdt)</span></a> +<a name="83"><span class="lineNum"> 83 </span> :<span class="lineCov"> 9 : size_t fdt_header_size(const void *fdt)</span></a> <a name="84"><span class="lineNum"> 84 </span> : : {</a> -<a name="85"><span class="lineNum"> 85 </span> :<span class="lineCov"> 22 : return can_assume(LATEST) ? FDT_V17_SIZE :</span></a> -<a name="86"><span class="lineNum"> 86 </span> :<span class="lineCov"> 11 : fdt_header_size_(fdt_version(fdt));</span></a> +<a name="85"><span class="lineNum"> 85 </span> :<span class="lineCov"> 18 : return can_assume(LATEST) ? FDT_V17_SIZE :</span></a> +<a name="86"><span class="lineNum"> 86 </span> :<span class="lineCov"> 9 : fdt_header_size_(fdt_version(fdt));</span></a> <a name="87"><span class="lineNum"> 87 </span> : : }</a> <a name="88"><span class="lineNum"> 88 </span> : : </a> -<a name="89"><span class="lineNum"> 89 </span> :<span class="lineCov"> 11 : int fdt_check_header(const void *fdt)</span></a> +<a name="89"><span class="lineNum"> 89 </span> :<span class="lineCov"> 9 : int fdt_check_header(const void *fdt)</span></a> <a name="90"><span class="lineNum"> 90 </span> : : {</a> <a name="91"><span class="lineNum"> 91 </span> : : size_t hdrsize;</a> <a name="92"><span class="lineNum"> 92 </span> : : </a> <a name="93"><span class="lineNum"> 93 </span> : : /* The device tree must be at an 8-byte aligned address */</a> -<a name="94"><span class="lineNum"> 94 </span> :<span class="lineCov"> 11 : if ((uintptr_t)fdt & 7)</span></a> +<a name="94"><span class="lineNum"> 94 </span> :<span class="lineCov"> 9 : if ((uintptr_t)fdt & 7)</span></a> <a name="95"><span class="lineNum"> 95 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_ALIGNMENT;</span></a> <a name="96"><span class="lineNum"> 96 </span> : : </a> -<a name="97"><span class="lineNum"> 97 </span> :<span class="lineCov"> 11 : if (fdt_magic(fdt) != FDT_MAGIC)</span></a> +<a name="97"><span class="lineNum"> 97 </span> :<span class="lineCov"> 9 : if (fdt_magic(fdt) != FDT_MAGIC)</span></a> <a name="98"><span class="lineNum"> 98 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADMAGIC;</span></a> -<a name="99"><span class="lineNum"> 99 </span> :<span class="lineCov"> 11 : if (!can_assume(LATEST)) {</span></a> -<a name="100"><span class="lineNum"> 100 </span> :<span class="lineCov"> 11 : if ((fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)</span></a> -<a name="101"><span class="lineNum"> 101 </span> :<span class="lineCov"> 11 : || (fdt_last_comp_version(fdt) ></span></a> +<a name="99"><span class="lineNum"> 99 </span> :<span class="lineCov"> 9 : if (!can_assume(LATEST)) {</span></a> +<a name="100"><span class="lineNum"> 100 </span> :<span class="lineCov"> 9 : if ((fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)</span></a> +<a name="101"><span class="lineNum"> 101 </span> :<span class="lineCov"> 9 : || (fdt_last_comp_version(fdt) ></span></a> <a name="102"><span class="lineNum"> 102 </span> : : FDT_LAST_SUPPORTED_VERSION))</a> <a name="103"><span class="lineNum"> 103 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADVERSION;</span></a> -<a name="104"><span class="lineNum"> 104 </span> :<span class="lineCov"> 11 : if (fdt_version(fdt) < fdt_last_comp_version(fdt))</span></a> +<a name="104"><span class="lineNum"> 104 </span> :<span class="lineCov"> 9 : if (fdt_version(fdt) < fdt_last_comp_version(fdt))</span></a> <a name="105"><span class="lineNum"> 105 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADVERSION;</span></a> <a name="106"><span class="lineNum"> 106 </span> : : }</a> -<a name="107"><span class="lineNum"> 107 </span> :<span class="lineCov"> 11 : hdrsize = fdt_header_size(fdt);</span></a> -<a name="108"><span class="lineNum"> 108 </span> :<span class="lineCov"> 11 : if (!can_assume(VALID_DTB)) {</span></a> +<a name="107"><span class="lineNum"> 107 </span> :<span class="lineCov"> 9 : hdrsize = fdt_header_size(fdt);</span></a> +<a name="108"><span class="lineNum"> 108 </span> :<span class="lineCov"> 9 : if (!can_assume(VALID_DTB)) {</span></a> <a name="109"><span class="lineNum"> 109 </span> : : </a> -<a name="110"><span class="lineNum"> 110 </span> :<span class="lineCov"> 11 : if ((fdt_totalsize(fdt) < hdrsize)</span></a> -<a name="111"><span class="lineNum"> 111 </span> :<span class="lineCov"> 11 : || (fdt_totalsize(fdt) > INT_MAX))</span></a> +<a name="110"><span class="lineNum"> 110 </span> :<span class="lineCov"> 9 : if ((fdt_totalsize(fdt) < hdrsize)</span></a> +<a name="111"><span class="lineNum"> 111 </span> :<span class="lineCov"> 9 : || (fdt_totalsize(fdt) > INT_MAX))</span></a> <a name="112"><span class="lineNum"> 112 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_TRUNCATED;</span></a> <a name="113"><span class="lineNum"> 113 </span> : : </a> <a name="114"><span class="lineNum"> 114 </span> : : /* Bounds check memrsv block */</a> -<a name="115"><span class="lineNum"> 115 </span> :<span class="lineCov"> 11 : if (!check_off_(hdrsize, fdt_totalsize(fdt),</span></a> +<a name="115"><span class="lineNum"> 115 </span> :<span class="lineCov"> 9 : if (!check_off_(hdrsize, fdt_totalsize(fdt),</span></a> <a name="116"><span class="lineNum"> 116 </span> : : fdt_off_mem_rsvmap(fdt)))</a> <a name="117"><span class="lineNum"> 117 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_TRUNCATED;</span></a> <a name="118"><span class="lineNum"> 118 </span> : : }</a> <a name="119"><span class="lineNum"> 119 </span> : : </a> -<a name="120"><span class="lineNum"> 120 </span> :<span class="lineCov"> 11 : if (!can_assume(VALID_DTB)) {</span></a> +<a name="120"><span class="lineNum"> 120 </span> :<span class="lineCov"> 9 : if (!can_assume(VALID_DTB)) {</span></a> <a name="121"><span class="lineNum"> 121 </span> : : /* Bounds check structure block */</a> -<a name="122"><span class="lineNum"> 122 </span> :<span class="lineCov"> 11 : if (!can_assume(LATEST) && fdt_version(fdt) < 17) {</span></a> +<a name="122"><span class="lineNum"> 122 </span> :<span class="lineCov"> 9 : if (!can_assume(LATEST) && fdt_version(fdt) < 17) {</span></a> <a name="123"><span class="lineNum"> 123 </span> :<span class="lineNoCov"> 0 : if (!check_off_(hdrsize, fdt_totalsize(fdt),</span></a> <a name="124"><span class="lineNum"> 124 </span> : : fdt_off_dt_struct(fdt)))</a> <a name="125"><span class="lineNum"> 125 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_TRUNCATED;</span></a> <a name="126"><span class="lineNum"> 126 </span> : : } else {</a> -<a name="127"><span class="lineNum"> 127 </span> :<span class="lineCov"> 11 : if (!check_block_(hdrsize, fdt_totalsize(fdt),</span></a> +<a name="127"><span class="lineNum"> 127 </span> :<span class="lineCov"> 9 : if (!check_block_(hdrsize, fdt_totalsize(fdt),</span></a> <a name="128"><span class="lineNum"> 128 </span> : : fdt_off_dt_struct(fdt),</a> <a name="129"><span class="lineNum"> 129 </span> : : fdt_size_dt_struct(fdt)))</a> <a name="130"><span class="lineNum"> 130 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_TRUNCATED;</span></a> <a name="131"><span class="lineNum"> 131 </span> : : }</a> <a name="132"><span class="lineNum"> 132 </span> : : </a> <a name="133"><span class="lineNum"> 133 </span> : : /* Bounds check strings block */</a> -<a name="134"><span class="lineNum"> 134 </span> :<span class="lineCov"> 11 : if (!check_block_(hdrsize, fdt_totalsize(fdt),</span></a> +<a name="134"><span class="lineNum"> 134 </span> :<span class="lineCov"> 9 : if (!check_block_(hdrsize, fdt_totalsize(fdt),</span></a> <a name="135"><span class="lineNum"> 135 </span> : : fdt_off_dt_strings(fdt),</a> <a name="136"><span class="lineNum"> 136 </span> : : fdt_size_dt_strings(fdt)))</a> <a name="137"><span class="lineNum"> 137 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_TRUNCATED;</span></a> <a name="138"><span class="lineNum"> 138 </span> : : }</a> <a name="139"><span class="lineNum"> 139 </span> : : </a> -<a name="140"><span class="lineNum"> 140 </span> :<span class="lineCov"> 11 : return 0;</span></a> +<a name="140"><span class="lineNum"> 140 </span> :<span class="lineCov"> 9 : return 0;</span></a> <a name="141"><span class="lineNum"> 141 </span> : : }</a> <a name="142"><span class="lineNum"> 142 </span> : : </a> -<a name="143"><span class="lineNum"> 143 </span> :<span class="lineCov"> 14315 : const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)</span></a> +<a name="143"><span class="lineNum"> 143 </span> :<span class="lineCov"> 4860 : const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)</span></a> <a name="144"><span class="lineNum"> 144 </span> : : {</a> -<a name="145"><span class="lineNum"> 145 </span> :<span class="lineCov"> 14315 : unsigned int uoffset = offset;</span></a> -<a name="146"><span class="lineNum"> 146 </span> :<span class="lineCov"> 14315 : unsigned int absoffset = offset + fdt_off_dt_struct(fdt);</span></a> +<a name="145"><span class="lineNum"> 145 </span> :<span class="lineCov"> 4860 : unsigned int uoffset = offset;</span></a> +<a name="146"><span class="lineNum"> 146 </span> :<span class="lineCov"> 4860 : unsigned int absoffset = offset + fdt_off_dt_struct(fdt);</span></a> <a name="147"><span class="lineNum"> 147 </span> : : </a> -<a name="148"><span class="lineNum"> 148 </span> :<span class="lineCov"> 14315 : if (offset < 0)</span></a> +<a name="148"><span class="lineNum"> 148 </span> :<span class="lineCov"> 4860 : if (offset < 0)</span></a> <a name="149"><span class="lineNum"> 149 </span> :<span class="lineNoCov"> 0 : return NULL;</span></a> <a name="150"><span class="lineNum"> 150 </span> : : </a> -<a name="151"><span class="lineNum"> 151 </span> :<span class="lineCov"> 14315 : if (!can_assume(VALID_INPUT))</span></a> -<a name="152"><span class="lineNum"> 152 </span> :<span class="lineCov"> 14315 : if ((absoffset < uoffset)</span></a> -<a name="153"><span class="lineNum"> 153 </span> :<span class="lineCov"> 14315 : || ((absoffset + len) < absoffset)</span></a> -<a name="154"><span class="lineNum"> 154 </span> :<span class="lineCov"> 14315 : || (absoffset + len) > fdt_totalsize(fdt))</span></a> +<a name="151"><span class="lineNum"> 151 </span> :<span class="lineCov"> 4860 : if (!can_assume(VALID_INPUT))</span></a> +<a name="152"><span class="lineNum"> 152 </span> :<span class="lineCov"> 4860 : if ((absoffset < uoffset)</span></a> +<a name="153"><span class="lineNum"> 153 </span> :<span class="lineCov"> 4860 : || ((absoffset + len) < absoffset)</span></a> +<a name="154"><span class="lineNum"> 154 </span> :<span class="lineCov"> 4860 : || (absoffset + len) > fdt_totalsize(fdt))</span></a> <a name="155"><span class="lineNum"> 155 </span> :<span class="lineNoCov"> 0 : return NULL;</span></a> <a name="156"><span class="lineNum"> 156 </span> : : </a> -<a name="157"><span class="lineNum"> 157 </span> :<span class="lineCov"> 14315 : if (can_assume(LATEST) || fdt_version(fdt) >= 0x11)</span></a> -<a name="158"><span class="lineNum"> 158 </span> :<span class="lineCov"> 14315 : if (((uoffset + len) < uoffset)</span></a> -<a name="159"><span class="lineNum"> 159 </span> :<span class="lineCov"> 14315 : || ((offset + len) > fdt_size_dt_struct(fdt)))</span></a> +<a name="157"><span class="lineNum"> 157 </span> :<span class="lineCov"> 4860 : if (can_assume(LATEST) || fdt_version(fdt) >= 0x11)</span></a> +<a name="158"><span class="lineNum"> 158 </span> :<span class="lineCov"> 4860 : if (((uoffset + len) < uoffset)</span></a> +<a name="159"><span class="lineNum"> 159 </span> :<span class="lineCov"> 4860 : || ((offset + len) > fdt_size_dt_struct(fdt)))</span></a> <a name="160"><span class="lineNum"> 160 </span> :<span class="lineNoCov"> 0 : return NULL;</span></a> <a name="161"><span class="lineNum"> 161 </span> : : </a> -<a name="162"><span class="lineNum"> 162 </span> :<span class="lineCov"> 14315 : return fdt_offset_ptr_(fdt, offset);</span></a> +<a name="162"><span class="lineNum"> 162 </span> :<span class="lineCov"> 4860 : return fdt_offset_ptr_(fdt, offset);</span></a> <a name="163"><span class="lineNum"> 163 </span> : : }</a> <a name="164"><span class="lineNum"> 164 </span> : : </a> -<a name="165"><span class="lineNum"> 165 </span> :<span class="lineCov"> 3355 : uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)</span></a> +<a name="165"><span class="lineNum"> 165 </span> :<span class="lineCov"> 1069 : uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)</span></a> <a name="166"><span class="lineNum"> 166 </span> : : {</a> <a name="167"><span class="lineNum"> 167 </span> : : const fdt32_t *tagp, *lenp;</a> <a name="168"><span class="lineNum"> 168 </span> : : uint32_t tag;</a> -<a name="169"><span class="lineNum"> 169 </span> :<span class="lineCov"> 3355 : int offset = startoffset;</span></a> +<a name="169"><span class="lineNum"> 169 </span> :<span class="lineCov"> 1069 : int offset = startoffset;</span></a> <a name="170"><span class="lineNum"> 170 </span> : : const char *p;</a> <a name="171"><span class="lineNum"> 171 </span> : : </a> -<a name="172"><span class="lineNum"> 172 </span> :<span class="lineCov"> 3355 : *nextoffset = -FDT_ERR_TRUNCATED;</span></a> -<a name="173"><span class="lineNum"> 173 </span> :<span class="lineCov"> 3355 : tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE);</span></a> -<a name="174"><span class="lineNum"> 174 </span> :<span class="lineCov"> 3355 : if (!can_assume(VALID_DTB) && !tagp)</span></a> +<a name="172"><span class="lineNum"> 172 </span> :<span class="lineCov"> 1069 : *nextoffset = -FDT_ERR_TRUNCATED;</span></a> +<a name="173"><span class="lineNum"> 173 </span> :<span class="lineCov"> 1069 : tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE);</span></a> +<a name="174"><span class="lineNum"> 174 </span> :<span class="lineCov"> 1069 : if (!can_assume(VALID_DTB) && !tagp)</span></a> <a name="175"><span class="lineNum"> 175 </span> :<span class="lineNoCov"> 0 : return FDT_END; /* premature end */</span></a> -<a name="176"><span class="lineNum"> 176 </span> :<span class="lineCov"> 3355 : tag = fdt32_to_cpu(*tagp);</span></a> -<a name="177"><span class="lineNum"> 177 </span> :<span class="lineCov"> 3355 : offset += FDT_TAGSIZE;</span></a> +<a name="176"><span class="lineNum"> 176 </span> :<span class="lineCov"> 1069 : tag = fdt32_to_cpu(*tagp);</span></a> +<a name="177"><span class="lineNum"> 177 </span> :<span class="lineCov"> 1069 : offset += FDT_TAGSIZE;</span></a> <a name="178"><span class="lineNum"> 178 </span> : : </a> -<a name="179"><span class="lineNum"> 179 </span> :<span class="lineCov"> 3355 : *nextoffset = -FDT_ERR_BADSTRUCTURE;</span></a> -<a name="180"><span class="lineNum"> 180 </span> :<span class="lineCov"> 3355 : switch (tag) {</span></a> -<a name="181"><span class="lineNum"> 181 </span> :<span class="lineCov"> 4756 : case FDT_BEGIN_NODE:</span></a> +<a name="179"><span class="lineNum"> 179 </span> :<span class="lineCov"> 1069 : *nextoffset = -FDT_ERR_BADSTRUCTURE;</span></a> +<a name="180"><span class="lineNum"> 180 </span> :<span class="lineCov"> 1069 : switch (tag) {</span></a> +<a name="181"><span class="lineNum"> 181 </span> :<span class="lineCov"> 1844 : case FDT_BEGIN_NODE:</span></a> <a name="182"><span class="lineNum"> 182 </span> : : /* skip name */</a> <a name="183"><span class="lineNum"> 183 </span> : : do {</a> -<a name="184"><span class="lineNum"> 184 </span> :<span class="lineCov"> 4756 : p = fdt_offset_ptr(fdt, offset++, 1);</span></a> -<a name="185"><span class="lineNum"> 185 </span> :<span class="lineCov"> 4756 : } while (p && (*p != '\0'));</span></a> -<a name="186"><span class="lineNum"> 186 </span> :<span class="lineCov"> 259 : if (!can_assume(VALID_DTB) && !p)</span></a> +<a name="184"><span class="lineNum"> 184 </span> :<span class="lineCov"> 1844 : p = fdt_offset_ptr(fdt, offset++, 1);</span></a> +<a name="185"><span class="lineNum"> 185 </span> :<span class="lineCov"> 1844 : } while (p && (*p != '\0'));</span></a> +<a name="186"><span class="lineNum"> 186 </span> :<span class="lineCov"> 102 : if (!can_assume(VALID_DTB) && !p)</span></a> <a name="187"><span class="lineNum"> 187 </span> :<span class="lineNoCov"> 0 : return FDT_END; /* premature end */</span></a> -<a name="188"><span class="lineNum"> 188 </span> :<span class="lineCov"> 259 : break;</span></a> +<a name="188"><span class="lineNum"> 188 </span> :<span class="lineCov"> 102 : break;</span></a> <a name="189"><span class="lineNum"> 189 </span> : : </a> -<a name="190"><span class="lineNum"> 190 </span> :<span class="lineCov"> 2849 : case FDT_PROP:</span></a> -<a name="191"><span class="lineNum"> 191 </span> :<span class="lineCov"> 2849 : lenp = fdt_offset_ptr(fdt, offset, sizeof(*lenp));</span></a> -<a name="192"><span class="lineNum"> 192 </span> :<span class="lineCov"> 2849 : if (!can_assume(VALID_DTB) && !lenp)</span></a> +<a name="190"><span class="lineNum"> 190 </span> :<span class="lineCov"> 878 : case FDT_PROP:</span></a> +<a name="191"><span class="lineNum"> 191 </span> :<span class="lineCov"> 878 : lenp = fdt_offset_ptr(fdt, offset, sizeof(*lenp));</span></a> +<a name="192"><span class="lineNum"> 192 </span> :<span class="lineCov"> 878 : if (!can_assume(VALID_DTB) && !lenp)</span></a> <a name="193"><span class="lineNum"> 193 </span> :<span class="lineNoCov"> 0 : return FDT_END; /* premature end */</span></a> <a name="194"><span class="lineNum"> 194 </span> : : /* skip-name offset, length and value */</a> -<a name="195"><span class="lineNum"> 195 </span> :<span class="lineCov"> 2849 : offset += sizeof(struct fdt_property) - FDT_TAGSIZE</span></a> -<a name="196"><span class="lineNum"> 196 </span> :<span class="lineCov"> 2849 : + fdt32_to_cpu(*lenp);</span></a> -<a name="197"><span class="lineNum"> 197 </span> :<span class="lineCov"> 5698 : if (!can_assume(LATEST) &&</span></a> -<a name="198"><span class="lineNum"> 198 </span> :<span class="lineCov"> 2849 : fdt_version(fdt) < 0x10 && fdt32_to_cpu(*lenp) >= 8 &&</span></a> +<a name="195"><span class="lineNum"> 195 </span> :<span class="lineCov"> 878 : offset += sizeof(struct fdt_property) - FDT_TAGSIZE</span></a> +<a name="196"><span class="lineNum"> 196 </span> :<span class="lineCov"> 878 : + fdt32_to_cpu(*lenp);</span></a> +<a name="197"><span class="lineNum"> 197 </span> :<span class="lineCov"> 1756 : if (!can_assume(LATEST) &&</span></a> +<a name="198"><span class="lineNum"> 198 </span> :<span class="lineCov"> 878 : fdt_version(fdt) < 0x10 && fdt32_to_cpu(*lenp) >= 8 &&</span></a> <a name="199"><span class="lineNum"> 199 </span> :<span class="lineNoCov"> 0 : ((offset - fdt32_to_cpu(*lenp)) % 8) != 0)</span></a> <a name="200"><span class="lineNum"> 200 </span> :<span class="lineNoCov"> 0 : offset += 4;</span></a> -<a name="201"><span class="lineNum"> 201 </span> :<span class="lineCov"> 2849 : break;</span></a> +<a name="201"><span class="lineNum"> 201 </span> :<span class="lineCov"> 878 : break;</span></a> <a name="202"><span class="lineNum"> 202 </span> : : </a> -<a name="203"><span class="lineNum"> 203 </span> :<span class="lineCov"> 247 : case FDT_END:</span></a> +<a name="203"><span class="lineNum"> 203 </span> :<span class="lineCov"> 89 : case FDT_END:</span></a> <a name="204"><span class="lineNum"> 204 </span> : : case FDT_END_NODE:</a> <a name="205"><span class="lineNum"> 205 </span> : : case FDT_NOP:</a> -<a name="206"><span class="lineNum"> 206 </span> :<span class="lineCov"> 247 : break;</span></a> +<a name="206"><span class="lineNum"> 206 </span> :<span class="lineCov"> 89 : break;</span></a> <a name="207"><span class="lineNum"> 207 </span> : : </a> <a name="208"><span class="lineNum"> 208 </span> :<span class="lineNoCov"> 0 : default:</span></a> <a name="209"><span class="lineNum"> 209 </span> :<span class="lineNoCov"> 0 : return FDT_END;</span></a> <a name="210"><span class="lineNum"> 210 </span> : : }</a> <a name="211"><span class="lineNum"> 211 </span> : : </a> -<a name="212"><span class="lineNum"> 212 </span> :<span class="lineCov"> 3355 : if (!fdt_offset_ptr(fdt, startoffset, offset - startoffset))</span></a> +<a name="212"><span class="lineNum"> 212 </span> :<span class="lineCov"> 1069 : if (!fdt_offset_ptr(fdt, startoffset, offset - startoffset))</span></a> <a name="213"><span class="lineNum"> 213 </span> :<span class="lineNoCov"> 0 : return FDT_END; /* premature end */</span></a> <a name="214"><span class="lineNum"> 214 </span> : : </a> -<a name="215"><span class="lineNum"> 215 </span> :<span class="lineCov"> 3355 : *nextoffset = FDT_TAGALIGN(offset);</span></a> -<a name="216"><span class="lineNum"> 216 </span> :<span class="lineCov"> 3355 : return tag;</span></a> +<a name="215"><span class="lineNum"> 215 </span> :<span class="lineCov"> 1069 : *nextoffset = FDT_TAGALIGN(offset);</span></a> +<a name="216"><span class="lineNum"> 216 </span> :<span class="lineCov"> 1069 : return tag;</span></a> <a name="217"><span class="lineNum"> 217 </span> : : }</a> <a name="218"><span class="lineNum"> 218 </span> : : </a> -<a name="219"><span class="lineNum"> 219 </span> :<span class="lineCov"> 16 : int fdt_check_node_offset_(const void *fdt, int offset)</span></a> +<a name="219"><span class="lineNum"> 219 </span> :<span class="lineCov"> 15 : int fdt_check_node_offset_(const void *fdt, int offset)</span></a> <a name="220"><span class="lineNum"> 220 </span> : : {</a> -<a name="221"><span class="lineNum"> 221 </span> :<span class="lineCov"> 16 : if (!can_assume(VALID_INPUT)</span></a> -<a name="222"><span class="lineNum"> 222 </span> :<span class="lineCov"> 16 : && ((offset < 0) || (offset % FDT_TAGSIZE)))</span></a> +<a name="221"><span class="lineNum"> 221 </span> :<span class="lineCov"> 15 : if (!can_assume(VALID_INPUT)</span></a> +<a name="222"><span class="lineNum"> 222 </span> :<span class="lineCov"> 15 : && ((offset < 0) || (offset % FDT_TAGSIZE)))</span></a> <a name="223"><span class="lineNum"> 223 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADOFFSET;</span></a> <a name="224"><span class="lineNum"> 224 </span> : : </a> -<a name="225"><span class="lineNum"> 225 </span> :<span class="lineCov"> 16 : if (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE)</span></a> +<a name="225"><span class="lineNum"> 225 </span> :<span class="lineCov"> 15 : if (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE)</span></a> <a name="226"><span class="lineNum"> 226 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADOFFSET;</span></a> <a name="227"><span class="lineNum"> 227 </span> : : </a> -<a name="228"><span class="lineNum"> 228 </span> :<span class="lineCov"> 16 : return offset;</span></a> +<a name="228"><span class="lineNum"> 228 </span> :<span class="lineCov"> 15 : return offset;</span></a> <a name="229"><span class="lineNum"> 229 </span> : : }</a> <a name="230"><span class="lineNum"> 230 </span> : : </a> <a name="231"><span class="lineNum"> 231 </span> :<span class="lineNoCov"> 0 : int fdt_check_prop_offset_(const void *fdt, int offset)</span></a> @@ -379,16 +379,16 @@ <a name="308"><span class="lineNum"> 308 </span> :<span class="lineNoCov"> 0 : return offset;</span></a> <a name="309"><span class="lineNum"> 309 </span> : : }</a> <a name="310"><span class="lineNum"> 310 </span> : : </a> -<a name="311"><span class="lineNum"> 311 </span> :<span class="lineCov"> 2811 : const char *fdt_find_string_(const char *strtab, int tabsize, const char *s)</span></a> +<a name="311"><span class="lineNum"> 311 </span> :<span class="lineCov"> 846 : const char *fdt_find_string_(const char *strtab, int tabsize, const char *s)</span></a> <a name="312"><span class="lineNum"> 312 </span> : : {</a> -<a name="313"><span class="lineNum"> 313 </span> :<span class="lineCov"> 2811 : int len = strlen(s) + 1;</span></a> -<a name="314"><span class="lineNum"> 314 </span> :<span class="lineCov"> 2811 : const char *last = strtab + tabsize - len;</span></a> +<a name="313"><span class="lineNum"> 313 </span> :<span class="lineCov"> 846 : int len = strlen(s) + 1;</span></a> +<a name="314"><span class="lineNum"> 314 </span> :<span class="lineCov"> 846 : const char *last = strtab + tabsize - len;</span></a> <a name="315"><span class="lineNum"> 315 </span> : : const char *p;</a> <a name="316"><span class="lineNum"> 316 </span> : : </a> -<a name="317"><span class="lineNum"> 317 </span> :<span class="lineCov"> 1245328 : for (p = strtab; p <= last; p++)</span></a> -<a name="318"><span class="lineNum"> 318 </span> :<span class="lineCov"> 1245130 : if (memcmp(p, s, len) == 0)</span></a> -<a name="319"><span class="lineNum"> 319 </span> :<span class="lineCov"> 2613 : return p;</span></a> -<a name="320"><span class="lineNum"> 320 </span> :<span class="lineCov"> 198 : return NULL;</span></a> +<a name="317"><span class="lineNum"> 317 </span> :<span class="lineCov"> 420392 : for (p = strtab; p <= last; p++)</span></a> +<a name="318"><span class="lineNum"> 318 </span> :<span class="lineCov"> 420293 : if (memcmp(p, s, len) == 0)</span></a> +<a name="319"><span class="lineNum"> 319 </span> :<span class="lineCov"> 747 : return p;</span></a> +<a name="320"><span class="lineNum"> 320 </span> :<span class="lineCov"> 99 : return NULL;</span></a> <a name="321"><span class="lineNum"> 321 </span> : : }</a> <a name="322"><span class="lineNum"> 322 </span> : : </a> <a name="323"><span class="lineNum"> 323 </span> :<span class="lineNoCov"> 0 : int fdt_move(const void *fdt, void *buf, int bufsize)</span></a> diff --git a/coverage-report/libfdt/fdt_ro.c.func-sort-c.html b/coverage-report/libfdt/fdt_ro.c.func-sort-c.html index 25653c0..10e3364 100644 --- a/coverage-report/libfdt/fdt_ro.c.func-sort-c.html +++ b/coverage-report/libfdt/fdt_ro.c.func-sort-c.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">3</td> @@ -222,11 +222,11 @@ </tr> <tr> <td class="coverFn"><a href="fdt_ro.c.gcov.html#32">fdt_get_string</a></td> - <td class="coverFnHi">38</td> + <td class="coverFnHi">32</td> </tr> <tr> <td class="coverFn"><a href="fdt_ro.c.gcov.html#98">fdt_string</a></td> - <td class="coverFnHi">38</td> + <td class="coverFnHi">32</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/fdt_ro.c.func.html b/coverage-report/libfdt/fdt_ro.c.func.html index 2805b7a..76646e8 100644 --- a/coverage-report/libfdt/fdt_ro.c.func.html +++ b/coverage-report/libfdt/fdt_ro.c.func.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">3</td> @@ -126,7 +126,7 @@ </tr> <tr> <td class="coverFn"><a href="fdt_ro.c.gcov.html#32">fdt_get_string</a></td> - <td class="coverFnHi">38</td> + <td class="coverFnHi">32</td> </tr> <tr> <td class="coverFn"><a href="fdt_ro.c.gcov.html#500">fdt_getprop</a></td> @@ -190,7 +190,7 @@ </tr> <tr> <td class="coverFn"><a href="fdt_ro.c.gcov.html#98">fdt_string</a></td> - <td class="coverFnHi">38</td> + <td class="coverFnHi">32</td> </tr> <tr> <td class="coverFn"><a href="fdt_ro.c.gcov.html#103">fdt_string_eq_</a></td> diff --git a/coverage-report/libfdt/fdt_ro.c.gcov.html b/coverage-report/libfdt/fdt_ro.c.gcov.html index cc8bddb..4af8f22 100644 --- a/coverage-report/libfdt/fdt_ro.c.gcov.html +++ b/coverage-report/libfdt/fdt_ro.c.gcov.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">3</td> @@ -102,7 +102,7 @@ <a name="31"><span class="lineNum"> 31 </span> :<span class="lineNoCov"> 0 : return 0;</span></a> <a name="32"><span class="lineNum"> 32 </span> : : }</a> <a name="33"><span class="lineNum"> 33 </span> : : </a> -<a name="34"><span class="lineNum"> 34 </span> :<span class="lineCov"> 38 : const char *fdt_get_string(const void *fdt, int stroffset, int *lenp)</span></a> +<a name="34"><span class="lineNum"> 34 </span> :<span class="lineCov"> 32 : const char *fdt_get_string(const void *fdt, int stroffset, int *lenp)</span></a> <a name="35"><span class="lineNum"> 35 </span> : : {</a> <a name="36"><span class="lineNum"> 36 </span> : : int32_t totalsize;</a> <a name="37"><span class="lineNum"> 37 </span> : : uint32_t absoffset;</a> @@ -110,31 +110,31 @@ <a name="39"><span class="lineNum"> 39 </span> : : int err;</a> <a name="40"><span class="lineNum"> 40 </span> : : const char *s, *n;</a> <a name="41"><span class="lineNum"> 41 </span> : : </a> -<a name="42"><span class="lineNum"> 42 </span> :<span class="lineCov"> 38 : if (can_assume(VALID_INPUT)) {</span></a> +<a name="42"><span class="lineNum"> 42 </span> :<span class="lineCov"> 32 : if (can_assume(VALID_INPUT)) {</span></a> <a name="43"><span class="lineNum"> 43 </span> :<span class="lineNoCov"> 0 : s = (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset;</span></a> <a name="44"><span class="lineNum"> 44 </span> : : </a> <a name="45"><span class="lineNum"> 45 </span> :<span class="lineNoCov"> 0 : if (lenp)</span></a> <a name="46"><span class="lineNum"> 46 </span> :<span class="lineNoCov"> 0 : *lenp = strlen(s);</span></a> <a name="47"><span class="lineNum"> 47 </span> :<span class="lineNoCov"> 0 : return s;</span></a> <a name="48"><span class="lineNum"> 48 </span> : : }</a> -<a name="49"><span class="lineNum"> 49 </span> :<span class="lineCov"> 38 : totalsize = fdt_ro_probe_(fdt);</span></a> -<a name="50"><span class="lineNum"> 50 </span> :<span class="lineCov"> 38 : err = totalsize;</span></a> -<a name="51"><span class="lineNum"> 51 </span> :<span class="lineCov"> 38 : if (totalsize < 0)</span></a> +<a name="49"><span class="lineNum"> 49 </span> :<span class="lineCov"> 32 : totalsize = fdt_ro_probe_(fdt);</span></a> +<a name="50"><span class="lineNum"> 50 </span> :<span class="lineCov"> 32 : err = totalsize;</span></a> +<a name="51"><span class="lineNum"> 51 </span> :<span class="lineCov"> 32 : if (totalsize < 0)</span></a> <a name="52"><span class="lineNum"> 52 </span> :<span class="lineNoCov"> 0 : goto fail;</span></a> <a name="53"><span class="lineNum"> 53 </span> : : </a> -<a name="54"><span class="lineNum"> 54 </span> :<span class="lineCov"> 38 : err = -FDT_ERR_BADOFFSET;</span></a> -<a name="55"><span class="lineNum"> 55 </span> :<span class="lineCov"> 38 : absoffset = stroffset + fdt_off_dt_strings(fdt);</span></a> -<a name="56"><span class="lineNum"> 56 </span> :<span class="lineCov"> 38 : if (absoffset >= (unsigned)totalsize)</span></a> +<a name="54"><span class="lineNum"> 54 </span> :<span class="lineCov"> 32 : err = -FDT_ERR_BADOFFSET;</span></a> +<a name="55"><span class="lineNum"> 55 </span> :<span class="lineCov"> 32 : absoffset = stroffset + fdt_off_dt_strings(fdt);</span></a> +<a name="56"><span class="lineNum"> 56 </span> :<span class="lineCov"> 32 : if (absoffset >= (unsigned)totalsize)</span></a> <a name="57"><span class="lineNum"> 57 </span> :<span class="lineNoCov"> 0 : goto fail;</span></a> -<a name="58"><span class="lineNum"> 58 </span> :<span class="lineCov"> 38 : len = totalsize - absoffset;</span></a> +<a name="58"><span class="lineNum"> 58 </span> :<span class="lineCov"> 32 : len = totalsize - absoffset;</span></a> <a name="59"><span class="lineNum"> 59 </span> : : </a> -<a name="60"><span class="lineNum"> 60 </span> :<span class="lineCov"> 38 : if (fdt_magic(fdt) == FDT_MAGIC) {</span></a> -<a name="61"><span class="lineNum"> 61 </span> :<span class="lineCov"> 38 : if (stroffset < 0)</span></a> +<a name="60"><span class="lineNum"> 60 </span> :<span class="lineCov"> 32 : if (fdt_magic(fdt) == FDT_MAGIC) {</span></a> +<a name="61"><span class="lineNum"> 61 </span> :<span class="lineCov"> 32 : if (stroffset < 0)</span></a> <a name="62"><span class="lineNum"> 62 </span> :<span class="lineNoCov"> 0 : goto fail;</span></a> -<a name="63"><span class="lineNum"> 63 </span> :<span class="lineCov"> 38 : if (can_assume(LATEST) || fdt_version(fdt) >= 17) {</span></a> -<a name="64"><span class="lineNum"> 64 </span> :<span class="lineCov"> 38 : if ((unsigned)stroffset >= fdt_size_dt_strings(fdt))</span></a> +<a name="63"><span class="lineNum"> 63 </span> :<span class="lineCov"> 32 : if (can_assume(LATEST) || fdt_version(fdt) >= 17) {</span></a> +<a name="64"><span class="lineNum"> 64 </span> :<span class="lineCov"> 32 : if ((unsigned)stroffset >= fdt_size_dt_strings(fdt))</span></a> <a name="65"><span class="lineNum"> 65 </span> :<span class="lineNoCov"> 0 : goto fail;</span></a> -<a name="66"><span class="lineNum"> 66 </span> :<span class="lineCov"> 38 : if ((fdt_size_dt_strings(fdt) - stroffset) < len)</span></a> +<a name="66"><span class="lineNum"> 66 </span> :<span class="lineCov"> 32 : if ((fdt_size_dt_strings(fdt) - stroffset) < len)</span></a> <a name="67"><span class="lineNum"> 67 </span> :<span class="lineNoCov"> 0 : len = fdt_size_dt_strings(fdt) - stroffset;</span></a> <a name="68"><span class="lineNum"> 68 </span> : : }</a> <a name="69"><span class="lineNum"> 69 </span> :<span class="lineNoCov"> 0 : } else if (fdt_magic(fdt) == FDT_SW_MAGIC) {</span></a> @@ -150,17 +150,17 @@ <a name="79"><span class="lineNum"> 79 </span> :<span class="lineNoCov"> 0 : goto fail;</span></a> <a name="80"><span class="lineNum"> 80 </span> : : }</a> <a name="81"><span class="lineNum"> 81 </span> : : </a> -<a name="82"><span class="lineNum"> 82 </span> :<span class="lineCov"> 38 : s = (const char *)fdt + absoffset;</span></a> -<a name="83"><span class="lineNum"> 83 </span> :<span class="lineCov"> 38 : n = memchr(s, '\0', len);</span></a> -<a name="84"><span class="lineNum"> 84 </span> :<span class="lineCov"> 38 : if (!n) {</span></a> +<a name="82"><span class="lineNum"> 82 </span> :<span class="lineCov"> 32 : s = (const char *)fdt + absoffset;</span></a> +<a name="83"><span class="lineNum"> 83 </span> :<span class="lineCov"> 32 : n = memchr(s, '\0', len);</span></a> +<a name="84"><span class="lineNum"> 84 </span> :<span class="lineCov"> 32 : if (!n) {</span></a> <a name="85"><span class="lineNum"> 85 </span> : : /* missing terminating NULL */</a> <a name="86"><span class="lineNum"> 86 </span> :<span class="lineNoCov"> 0 : err = -FDT_ERR_TRUNCATED;</span></a> <a name="87"><span class="lineNum"> 87 </span> :<span class="lineNoCov"> 0 : goto fail;</span></a> <a name="88"><span class="lineNum"> 88 </span> : : }</a> <a name="89"><span class="lineNum"> 89 </span> : : </a> -<a name="90"><span class="lineNum"> 90 </span> :<span class="lineCov"> 38 : if (lenp)</span></a> +<a name="90"><span class="lineNum"> 90 </span> :<span class="lineCov"> 32 : if (lenp)</span></a> <a name="91"><span class="lineNum"> 91 </span> :<span class="lineNoCov"> 0 : *lenp = n - s;</span></a> -<a name="92"><span class="lineNum"> 92 </span> :<span class="lineCov"> 38 : return s;</span></a> +<a name="92"><span class="lineNum"> 92 </span> :<span class="lineCov"> 32 : return s;</span></a> <a name="93"><span class="lineNum"> 93 </span> : : </a> <a name="94"><span class="lineNum"> 94 </span> :<span class="lineNoCov"> 0 : fail:</span></a> <a name="95"><span class="lineNum"> 95 </span> :<span class="lineNoCov"> 0 : if (lenp)</span></a> @@ -168,9 +168,9 @@ <a name="97"><span class="lineNum"> 97 </span> :<span class="lineNoCov"> 0 : return NULL;</span></a> <a name="98"><span class="lineNum"> 98 </span> : : }</a> <a name="99"><span class="lineNum"> 99 </span> : : </a> -<a name="100"><span class="lineNum"> 100 </span> :<span class="lineCov"> 38 : const char *fdt_string(const void *fdt, int stroffset)</span></a> +<a name="100"><span class="lineNum"> 100 </span> :<span class="lineCov"> 32 : const char *fdt_string(const void *fdt, int stroffset)</span></a> <a name="101"><span class="lineNum"> 101 </span> : : {</a> -<a name="102"><span class="lineNum"> 102 </span> :<span class="lineCov"> 38 : return fdt_get_string(fdt, stroffset, NULL);</span></a> +<a name="102"><span class="lineNum"> 102 </span> :<span class="lineCov"> 32 : return fdt_get_string(fdt, stroffset, NULL);</span></a> <a name="103"><span class="lineNum"> 103 </span> : : }</a> <a name="104"><span class="lineNum"> 104 </span> : : </a> <a name="105"><span class="lineNum"> 105 </span> :<span class="lineNoCov"> 0 : static int fdt_string_eq_(const void *fdt, int stroffset,</span></a> diff --git a/coverage-report/libfdt/fdt_strerror.c.func-sort-c.html b/coverage-report/libfdt/fdt_strerror.c.func-sort-c.html index 27bdb80..9e4f9df 100644 --- a/coverage-report/libfdt/fdt_strerror.c.func-sort-c.html +++ b/coverage-report/libfdt/fdt_strerror.c.func-sort-c.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">0</td> diff --git a/coverage-report/libfdt/fdt_strerror.c.func.html b/coverage-report/libfdt/fdt_strerror.c.func.html index e08d95c..9d1ffa6 100644 --- a/coverage-report/libfdt/fdt_strerror.c.func.html +++ b/coverage-report/libfdt/fdt_strerror.c.func.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">0</td> diff --git a/coverage-report/libfdt/fdt_strerror.c.gcov.html b/coverage-report/libfdt/fdt_strerror.c.gcov.html index 6d03c56..0d62119 100644 --- a/coverage-report/libfdt/fdt_strerror.c.gcov.html +++ b/coverage-report/libfdt/fdt_strerror.c.gcov.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">0</td> diff --git a/coverage-report/libfdt/fdt_sw.c.func-sort-c.html b/coverage-report/libfdt/fdt_sw.c.func-sort-c.html index 7474b79..6ea1f37 100644 --- a/coverage-report/libfdt/fdt_sw.c.func-sort-c.html +++ b/coverage-report/libfdt/fdt_sw.c.func-sort-c.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">15</td> @@ -82,63 +82,63 @@ </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#107">fdt_create_with_flags</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#335">fdt_finish</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#206">fdt_finish_reservemap</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#186">fdt_add_reservemap_entry</a></td> - <td class="coverFnHi">8</td> + <td class="coverFnHi">4</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#36">fdt_sw_probe_memrsv_</a></td> - <td class="coverFnHi">8</td> - </tr> - <tr> - <td class="coverFn"><a href="fdt_sw.c.gcov.html#248">fdt_add_string_</a></td> - <td class="coverFnHi">198</td> + <td class="coverFnHi">4</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#217">fdt_begin_node</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#234">fdt_end_node</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> + </tr> + <tr> + <td class="coverFn"><a href="fdt_sw.c.gcov.html#248">fdt_add_string_</a></td> + <td class="coverFnHi">99</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#274">fdt_find_add_string_</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#323">fdt_property</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#291">fdt_property_placeholder</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#81">sw_flags</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#92">fdt_grab_space_</a></td> - <td class="coverFnHi">3285</td> + <td class="coverFnHi">1007</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#62">fdt_sw_probe_struct_</a></td> - <td class="coverFnHi">3285</td> + <td class="coverFnHi">1007</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#11">fdt_sw_probe_</a></td> - <td class="coverFnHi">3293</td> + <td class="coverFnHi">1011</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/fdt_sw.c.func.html b/coverage-report/libfdt/fdt_sw.c.func.html index cf62c8a..6346340 100644 --- a/coverage-report/libfdt/fdt_sw.c.func.html +++ b/coverage-report/libfdt/fdt_sw.c.func.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">15</td> @@ -70,15 +70,15 @@ </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#186">fdt_add_reservemap_entry</a></td> - <td class="coverFnHi">8</td> + <td class="coverFnHi">4</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#248">fdt_add_string_</a></td> - <td class="coverFnHi">198</td> + <td class="coverFnHi">99</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#217">fdt_begin_node</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#141">fdt_create</a></td> @@ -86,7 +86,7 @@ </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#107">fdt_create_with_flags</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#266">fdt_del_last_string_</a></td> @@ -94,31 +94,31 @@ </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#234">fdt_end_node</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#274">fdt_find_add_string_</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#335">fdt_finish</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#206">fdt_finish_reservemap</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#92">fdt_grab_space_</a></td> - <td class="coverFnHi">3285</td> + <td class="coverFnHi">1007</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#323">fdt_property</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#291">fdt_property_placeholder</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#146">fdt_resize</a></td> @@ -126,19 +126,19 @@ </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#11">fdt_sw_probe_</a></td> - <td class="coverFnHi">3293</td> + <td class="coverFnHi">1011</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#36">fdt_sw_probe_memrsv_</a></td> - <td class="coverFnHi">8</td> + <td class="coverFnHi">4</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#62">fdt_sw_probe_struct_</a></td> - <td class="coverFnHi">3285</td> + <td class="coverFnHi">1007</td> </tr> <tr> <td class="coverFn"><a href="fdt_sw.c.gcov.html#81">sw_flags</a></td> - <td class="coverFnHi">2811</td> + <td class="coverFnHi">846</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/fdt_sw.c.gcov.html b/coverage-report/libfdt/fdt_sw.c.gcov.html index 908239a..abb78b1 100644 --- a/coverage-report/libfdt/fdt_sw.c.gcov.html +++ b/coverage-report/libfdt/fdt_sw.c.gcov.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">15</td> @@ -81,16 +81,16 @@ <a name="10"><span class="lineNum"> 10 </span> : : </a> <a name="11"><span class="lineNum"> 11 </span> : : #include "libfdt_internal.h"</a> <a name="12"><span class="lineNum"> 12 </span> : : </a> -<a name="13"><span class="lineNum"> 13 </span> :<span class="lineCov"> 3293 : static int fdt_sw_probe_(void *fdt)</span></a> +<a name="13"><span class="lineNum"> 13 </span> :<span class="lineCov"> 1011 : static int fdt_sw_probe_(void *fdt)</span></a> <a name="14"><span class="lineNum"> 14 </span> : : {</a> -<a name="15"><span class="lineNum"> 15 </span> :<span class="lineCov"> 3293 : if (!can_assume(VALID_INPUT)) {</span></a> -<a name="16"><span class="lineNum"> 16 </span> :<span class="lineCov"> 3293 : if (fdt_magic(fdt) == FDT_MAGIC)</span></a> +<a name="15"><span class="lineNum"> 15 </span> :<span class="lineCov"> 1011 : if (!can_assume(VALID_INPUT)) {</span></a> +<a name="16"><span class="lineNum"> 16 </span> :<span class="lineCov"> 1011 : if (fdt_magic(fdt) == FDT_MAGIC)</span></a> <a name="17"><span class="lineNum"> 17 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADSTATE;</span></a> -<a name="18"><span class="lineNum"> 18 </span> :<span class="lineCov"> 3293 : else if (fdt_magic(fdt) != FDT_SW_MAGIC)</span></a> +<a name="18"><span class="lineNum"> 18 </span> :<span class="lineCov"> 1011 : else if (fdt_magic(fdt) != FDT_SW_MAGIC)</span></a> <a name="19"><span class="lineNum"> 19 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADMAGIC;</span></a> <a name="20"><span class="lineNum"> 20 </span> : : }</a> <a name="21"><span class="lineNum"> 21 </span> : : </a> -<a name="22"><span class="lineNum"> 22 </span> :<span class="lineCov"> 3293 : return 0;</span></a> +<a name="22"><span class="lineNum"> 22 </span> :<span class="lineCov"> 1011 : return 0;</span></a> <a name="23"><span class="lineNum"> 23 </span> : : }</a> <a name="24"><span class="lineNum"> 24 </span> : : </a> <a name="25"><span class="lineNum"> 25 </span> : : #define FDT_SW_PROBE(fdt) \</a> @@ -106,15 +106,15 @@ <a name="35"><span class="lineNum"> 35 </span> : : * fdt_add_reservemap_entry()</a> <a name="36"><span class="lineNum"> 36 </span> : : * fdt_finish_reservemap() [moves to 'struct' state]</a> <a name="37"><span class="lineNum"> 37 </span> : : */</a> -<a name="38"><span class="lineNum"> 38 </span> :<span class="lineCov"> 8 : static int fdt_sw_probe_memrsv_(void *fdt)</span></a> +<a name="38"><span class="lineNum"> 38 </span> :<span class="lineCov"> 4 : static int fdt_sw_probe_memrsv_(void *fdt)</span></a> <a name="39"><span class="lineNum"> 39 </span> : : {</a> -<a name="40"><span class="lineNum"> 40 </span> :<span class="lineCov"> 8 : int err = fdt_sw_probe_(fdt);</span></a> -<a name="41"><span class="lineNum"> 41 </span> :<span class="lineCov"> 8 : if (err)</span></a> +<a name="40"><span class="lineNum"> 40 </span> :<span class="lineCov"> 4 : int err = fdt_sw_probe_(fdt);</span></a> +<a name="41"><span class="lineNum"> 41 </span> :<span class="lineCov"> 4 : if (err)</span></a> <a name="42"><span class="lineNum"> 42 </span> :<span class="lineNoCov"> 0 : return err;</span></a> <a name="43"><span class="lineNum"> 43 </span> : : </a> -<a name="44"><span class="lineNum"> 44 </span> :<span class="lineCov"> 8 : if (!can_assume(VALID_INPUT) && fdt_off_dt_strings(fdt) != 0)</span></a> +<a name="44"><span class="lineNum"> 44 </span> :<span class="lineCov"> 4 : if (!can_assume(VALID_INPUT) && fdt_off_dt_strings(fdt) != 0)</span></a> <a name="45"><span class="lineNum"> 45 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADSTATE;</span></a> -<a name="46"><span class="lineNum"> 46 </span> :<span class="lineCov"> 8 : return 0;</span></a> +<a name="46"><span class="lineNum"> 46 </span> :<span class="lineCov"> 4 : return 0;</span></a> <a name="47"><span class="lineNum"> 47 </span> : : }</a> <a name="48"><span class="lineNum"> 48 </span> : : </a> <a name="49"><span class="lineNum"> 49 </span> : : #define FDT_SW_PROBE_MEMRSV(fdt) \</a> @@ -132,16 +132,16 @@ <a name="61"><span class="lineNum"> 61 </span> : : * fdt_property*()</a> <a name="62"><span class="lineNum"> 62 </span> : : * fdt_finish() [moves to 'complete' state]</a> <a name="63"><span class="lineNum"> 63 </span> : : */</a> -<a name="64"><span class="lineNum"> 64 </span> :<span class="lineCov"> 3285 : static int fdt_sw_probe_struct_(void *fdt)</span></a> +<a name="64"><span class="lineNum"> 64 </span> :<span class="lineCov"> 1007 : static int fdt_sw_probe_struct_(void *fdt)</span></a> <a name="65"><span class="lineNum"> 65 </span> : : {</a> -<a name="66"><span class="lineNum"> 66 </span> :<span class="lineCov"> 3285 : int err = fdt_sw_probe_(fdt);</span></a> -<a name="67"><span class="lineNum"> 67 </span> :<span class="lineCov"> 3285 : if (err)</span></a> +<a name="66"><span class="lineNum"> 66 </span> :<span class="lineCov"> 1007 : int err = fdt_sw_probe_(fdt);</span></a> +<a name="67"><span class="lineNum"> 67 </span> :<span class="lineCov"> 1007 : if (err)</span></a> <a name="68"><span class="lineNum"> 68 </span> :<span class="lineNoCov"> 0 : return err;</span></a> <a name="69"><span class="lineNum"> 69 </span> : : </a> -<a name="70"><span class="lineNum"> 70 </span> :<span class="lineCov"> 6570 : if (!can_assume(VALID_INPUT) &&</span></a> -<a name="71"><span class="lineNum"> 71 </span> :<span class="lineCov"> 3285 : fdt_off_dt_strings(fdt) != fdt_totalsize(fdt))</span></a> +<a name="70"><span class="lineNum"> 70 </span> :<span class="lineCov"> 2014 : if (!can_assume(VALID_INPUT) &&</span></a> +<a name="71"><span class="lineNum"> 71 </span> :<span class="lineCov"> 1007 : fdt_off_dt_strings(fdt) != fdt_totalsize(fdt))</span></a> <a name="72"><span class="lineNum"> 72 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADSTATE;</span></a> -<a name="73"><span class="lineNum"> 73 </span> :<span class="lineCov"> 3285 : return 0;</span></a> +<a name="73"><span class="lineNum"> 73 </span> :<span class="lineCov"> 1007 : return 0;</span></a> <a name="74"><span class="lineNum"> 74 </span> : : }</a> <a name="75"><span class="lineNum"> 75 </span> : : </a> <a name="76"><span class="lineNum"> 76 </span> : : #define FDT_SW_PROBE_STRUCT(fdt) \</a> @@ -151,10 +151,10 @@ <a name="80"><span class="lineNum"> 80 </span> : : return err; \</a> <a name="81"><span class="lineNum"> 81 </span> : : }</a> <a name="82"><span class="lineNum"> 82 </span> : : </a> -<a name="83"><span class="lineNum"> 83 </span> :<span class="lineCov"> 2811 : static inline uint32_t sw_flags(void *fdt)</span></a> +<a name="83"><span class="lineNum"> 83 </span> :<span class="lineCov"> 846 : static inline uint32_t sw_flags(void *fdt)</span></a> <a name="84"><span class="lineNum"> 84 </span> : : {</a> <a name="85"><span class="lineNum"> 85 </span> : : /* assert: (fdt_magic(fdt) == FDT_SW_MAGIC) */</a> -<a name="86"><span class="lineNum"> 86 </span> :<span class="lineCov"> 2811 : return fdt_last_comp_version(fdt);</span></a> +<a name="86"><span class="lineNum"> 86 </span> :<span class="lineCov"> 846 : return fdt_last_comp_version(fdt);</span></a> <a name="87"><span class="lineNum"> 87 </span> : : }</a> <a name="88"><span class="lineNum"> 88 </span> : : </a> <a name="89"><span class="lineNum"> 89 </span> : : /* 'complete' state: Enter this state after fdt_finish()</a> @@ -162,34 +162,34 @@ <a name="91"><span class="lineNum"> 91 </span> : : * Allowed functions: none</a> <a name="92"><span class="lineNum"> 92 </span> : : */</a> <a name="93"><span class="lineNum"> 93 </span> : : </a> -<a name="94"><span class="lineNum"> 94 </span> :<span class="lineCov"> 3285 : static void *fdt_grab_space_(void *fdt, size_t len)</span></a> +<a name="94"><span class="lineNum"> 94 </span> :<span class="lineCov"> 1007 : static void *fdt_grab_space_(void *fdt, size_t len)</span></a> <a name="95"><span class="lineNum"> 95 </span> : : {</a> -<a name="96"><span class="lineNum"> 96 </span> :<span class="lineCov"> 3285 : unsigned int offset = fdt_size_dt_struct(fdt);</span></a> +<a name="96"><span class="lineNum"> 96 </span> :<span class="lineCov"> 1007 : unsigned int offset = fdt_size_dt_struct(fdt);</span></a> <a name="97"><span class="lineNum"> 97 </span> : : unsigned int spaceleft;</a> <a name="98"><span class="lineNum"> 98 </span> : : </a> -<a name="99"><span class="lineNum"> 99 </span> :<span class="lineCov"> 3285 : spaceleft = fdt_totalsize(fdt) - fdt_off_dt_struct(fdt)</span></a> -<a name="100"><span class="lineNum"> 100 </span> :<span class="lineCov"> 3285 : - fdt_size_dt_strings(fdt);</span></a> +<a name="99"><span class="lineNum"> 99 </span> :<span class="lineCov"> 1007 : spaceleft = fdt_totalsize(fdt) - fdt_off_dt_struct(fdt)</span></a> +<a name="100"><span class="lineNum"> 100 </span> :<span class="lineCov"> 1007 : - fdt_size_dt_strings(fdt);</span></a> <a name="101"><span class="lineNum"> 101 </span> : : </a> -<a name="102"><span class="lineNum"> 102 </span> :<span class="lineCov"> 3285 : if ((offset + len < offset) || (offset + len > spaceleft))</span></a> +<a name="102"><span class="lineNum"> 102 </span> :<span class="lineCov"> 1007 : if ((offset + len < offset) || (offset + len > spaceleft))</span></a> <a name="103"><span class="lineNum"> 103 </span> :<span class="lineNoCov"> 0 : return NULL;</span></a> <a name="104"><span class="lineNum"> 104 </span> : : </a> -<a name="105"><span class="lineNum"> 105 </span> :<span class="lineCov"> 3285 : fdt_set_size_dt_struct(fdt, offset + len);</span></a> -<a name="106"><span class="lineNum"> 106 </span> :<span class="lineCov"> 3285 : return fdt_offset_ptr_w_(fdt, offset);</span></a> +<a name="105"><span class="lineNum"> 105 </span> :<span class="lineCov"> 1007 : fdt_set_size_dt_struct(fdt, offset + len);</span></a> +<a name="106"><span class="lineNum"> 106 </span> :<span class="lineCov"> 1007 : return fdt_offset_ptr_w_(fdt, offset);</span></a> <a name="107"><span class="lineNum"> 107 </span> : : }</a> <a name="108"><span class="lineNum"> 108 </span> : : </a> -<a name="109"><span class="lineNum"> 109 </span> :<span class="lineCov"> 2 : int fdt_create_with_flags(void *buf, int bufsize, uint32_t flags)</span></a> +<a name="109"><span class="lineNum"> 109 </span> :<span class="lineCov"> 1 : int fdt_create_with_flags(void *buf, int bufsize, uint32_t flags)</span></a> <a name="110"><span class="lineNum"> 110 </span> : : {</a> -<a name="111"><span class="lineNum"> 111 </span> :<span class="lineCov"> 2 : const int hdrsize = FDT_ALIGN(sizeof(struct fdt_header),</span></a> +<a name="111"><span class="lineNum"> 111 </span> :<span class="lineCov"> 1 : const int hdrsize = FDT_ALIGN(sizeof(struct fdt_header),</span></a> <a name="112"><span class="lineNum"> 112 </span> : : sizeof(struct fdt_reserve_entry));</a> -<a name="113"><span class="lineNum"> 113 </span> :<span class="lineCov"> 2 : void *fdt = buf;</span></a> +<a name="113"><span class="lineNum"> 113 </span> :<span class="lineCov"> 1 : void *fdt = buf;</span></a> <a name="114"><span class="lineNum"> 114 </span> : : </a> -<a name="115"><span class="lineNum"> 115 </span> :<span class="lineCov"> 2 : if (bufsize < hdrsize)</span></a> +<a name="115"><span class="lineNum"> 115 </span> :<span class="lineCov"> 1 : if (bufsize < hdrsize)</span></a> <a name="116"><span class="lineNum"> 116 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_NOSPACE;</span></a> <a name="117"><span class="lineNum"> 117 </span> : : </a> -<a name="118"><span class="lineNum"> 118 </span> :<span class="lineCov"> 2 : if (flags & ~FDT_CREATE_FLAGS_ALL)</span></a> +<a name="118"><span class="lineNum"> 118 </span> :<span class="lineCov"> 1 : if (flags & ~FDT_CREATE_FLAGS_ALL)</span></a> <a name="119"><span class="lineNum"> 119 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_BADFLAGS;</span></a> <a name="120"><span class="lineNum"> 120 </span> : : </a> -<a name="121"><span class="lineNum"> 121 </span> :<span class="lineCov"> 2 : memset(buf, 0, bufsize);</span></a> +<a name="121"><span class="lineNum"> 121 </span> :<span class="lineCov"> 1 : memset(buf, 0, bufsize);</span></a> <a name="122"><span class="lineNum"> 122 </span> : : </a> <a name="123"><span class="lineNum"> 123 </span> : : /*</a> <a name="124"><span class="lineNum"> 124 </span> : : * magic and last_comp_version keep intermediate state during the fdt</a> @@ -198,17 +198,17 @@ <a name="127"><span class="lineNum"> 127 </span> : : *</a> <a name="128"><span class="lineNum"> 128 </span> : : * flags should be accessed with sw_flags().</a> <a name="129"><span class="lineNum"> 129 </span> : : */</a> -<a name="130"><span class="lineNum"> 130 </span> :<span class="lineCov"> 2 : fdt_set_magic(fdt, FDT_SW_MAGIC);</span></a> -<a name="131"><span class="lineNum"> 131 </span> :<span class="lineCov"> 2 : fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);</span></a> -<a name="132"><span class="lineNum"> 132 </span> :<span class="lineCov"> 2 : fdt_set_last_comp_version(fdt, flags);</span></a> +<a name="130"><span class="lineNum"> 130 </span> :<span class="lineCov"> 1 : fdt_set_magic(fdt, FDT_SW_MAGIC);</span></a> +<a name="131"><span class="lineNum"> 131 </span> :<span class="lineCov"> 1 : fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);</span></a> +<a name="132"><span class="lineNum"> 132 </span> :<span class="lineCov"> 1 : fdt_set_last_comp_version(fdt, flags);</span></a> <a name="133"><span class="lineNum"> 133 </span> : : </a> -<a name="134"><span class="lineNum"> 134 </span> :<span class="lineCov"> 2 : fdt_set_totalsize(fdt, bufsize);</span></a> +<a name="134"><span class="lineNum"> 134 </span> :<span class="lineCov"> 1 : fdt_set_totalsize(fdt, bufsize);</span></a> <a name="135"><span class="lineNum"> 135 </span> : : </a> -<a name="136"><span class="lineNum"> 136 </span> :<span class="lineCov"> 2 : fdt_set_off_mem_rsvmap(fdt, hdrsize);</span></a> -<a name="137"><span class="lineNum"> 137 </span> :<span class="lineCov"> 2 : fdt_set_off_dt_struct(fdt, fdt_off_mem_rsvmap(fdt));</span></a> -<a name="138"><span class="lineNum"> 138 </span> :<span class="lineCov"> 2 : fdt_set_off_dt_strings(fdt, 0);</span></a> +<a name="136"><span class="lineNum"> 136 </span> :<span class="lineCov"> 1 : fdt_set_off_mem_rsvmap(fdt, hdrsize);</span></a> +<a name="137"><span class="lineNum"> 137 </span> :<span class="lineCov"> 1 : fdt_set_off_dt_struct(fdt, fdt_off_mem_rsvmap(fdt));</span></a> +<a name="138"><span class="lineNum"> 138 </span> :<span class="lineCov"> 1 : fdt_set_off_dt_strings(fdt, 0);</span></a> <a name="139"><span class="lineNum"> 139 </span> : : </a> -<a name="140"><span class="lineNum"> 140 </span> :<span class="lineCov"> 2 : return 0;</span></a> +<a name="140"><span class="lineNum"> 140 </span> :<span class="lineCov"> 1 : return 0;</span></a> <a name="141"><span class="lineNum"> 141 </span> : : }</a> <a name="142"><span class="lineNum"> 142 </span> : : </a> <a name="143"><span class="lineNum"> 143 </span> :<span class="lineNoCov"> 0 : int fdt_create(void *buf, int bufsize)</span></a> @@ -256,83 +256,83 @@ <a name="185"><span class="lineNum"> 185 </span> :<span class="lineNoCov"> 0 : return 0;</span></a> <a name="186"><span class="lineNum"> 186 </span> : : }</a> <a name="187"><span class="lineNum"> 187 </span> : : </a> -<a name="188"><span class="lineNum"> 188 </span> :<span class="lineCov"> 8 : int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)</span></a> +<a name="188"><span class="lineNum"> 188 </span> :<span class="lineCov"> 4 : int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)</span></a> <a name="189"><span class="lineNum"> 189 </span> : : {</a> <a name="190"><span class="lineNum"> 190 </span> : : struct fdt_reserve_entry *re;</a> <a name="191"><span class="lineNum"> 191 </span> : : int offset;</a> <a name="192"><span class="lineNum"> 192 </span> : : </a> -<a name="193"><span class="lineNum"> 193 </span> :<span class="lineCov"> 8 : FDT_SW_PROBE_MEMRSV(fdt);</span></a> +<a name="193"><span class="lineNum"> 193 </span> :<span class="lineCov"> 4 : FDT_SW_PROBE_MEMRSV(fdt);</span></a> <a name="194"><span class="lineNum"> 194 </span> : : </a> -<a name="195"><span class="lineNum"> 195 </span> :<span class="lineCov"> 8 : offset = fdt_off_dt_struct(fdt);</span></a> -<a name="196"><span class="lineNum"> 196 </span> :<span class="lineCov"> 8 : if ((offset + sizeof(*re)) > fdt_totalsize(fdt))</span></a> +<a name="195"><span class="lineNum"> 195 </span> :<span class="lineCov"> 4 : offset = fdt_off_dt_struct(fdt);</span></a> +<a name="196"><span class="lineNum"> 196 </span> :<span class="lineCov"> 4 : if ((offset + sizeof(*re)) > fdt_totalsize(fdt))</span></a> <a name="197"><span class="lineNum"> 197 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_NOSPACE;</span></a> <a name="198"><span class="lineNum"> 198 </span> : : </a> -<a name="199"><span class="lineNum"> 199 </span> :<span class="lineCov"> 8 : re = (struct fdt_reserve_entry *)((char *)fdt + offset);</span></a> -<a name="200"><span class="lineNum"> 200 </span> :<span class="lineCov"> 8 : re->address = cpu_to_fdt64(addr);</span></a> -<a name="201"><span class="lineNum"> 201 </span> :<span class="lineCov"> 8 : re->size = cpu_to_fdt64(size);</span></a> +<a name="199"><span class="lineNum"> 199 </span> :<span class="lineCov"> 4 : re = (struct fdt_reserve_entry *)((char *)fdt + offset);</span></a> +<a name="200"><span class="lineNum"> 200 </span> :<span class="lineCov"> 4 : re->address = cpu_to_fdt64(addr);</span></a> +<a name="201"><span class="lineNum"> 201 </span> :<span class="lineCov"> 4 : re->size = cpu_to_fdt64(size);</span></a> <a name="202"><span class="lineNum"> 202 </span> : : </a> -<a name="203"><span class="lineNum"> 203 </span> :<span class="lineCov"> 8 : fdt_set_off_dt_struct(fdt, offset + sizeof(*re));</span></a> +<a name="203"><span class="lineNum"> 203 </span> :<span class="lineCov"> 4 : fdt_set_off_dt_struct(fdt, offset + sizeof(*re));</span></a> <a name="204"><span class="lineNum"> 204 </span> : : </a> -<a name="205"><span class="lineNum"> 205 </span> :<span class="lineCov"> 8 : return 0;</span></a> +<a name="205"><span class="lineNum"> 205 </span> :<span class="lineCov"> 4 : return 0;</span></a> <a name="206"><span class="lineNum"> 206 </span> : : }</a> <a name="207"><span class="lineNum"> 207 </span> : : </a> -<a name="208"><span class="lineNum"> 208 </span> :<span class="lineCov"> 2 : int fdt_finish_reservemap(void *fdt)</span></a> +<a name="208"><span class="lineNum"> 208 </span> :<span class="lineCov"> 1 : int fdt_finish_reservemap(void *fdt)</span></a> <a name="209"><span class="lineNum"> 209 </span> : : {</a> -<a name="210"><span class="lineNum"> 210 </span> :<span class="lineCov"> 2 : int err = fdt_add_reservemap_entry(fdt, 0, 0);</span></a> +<a name="210"><span class="lineNum"> 210 </span> :<span class="lineCov"> 1 : int err = fdt_add_reservemap_entry(fdt, 0, 0);</span></a> <a name="211"><span class="lineNum"> 211 </span> : : </a> -<a name="212"><span class="lineNum"> 212 </span> :<span class="lineCov"> 2 : if (err)</span></a> +<a name="212"><span class="lineNum"> 212 </span> :<span class="lineCov"> 1 : if (err)</span></a> <a name="213"><span class="lineNum"> 213 </span> :<span class="lineNoCov"> 0 : return err;</span></a> <a name="214"><span class="lineNum"> 214 </span> : : </a> -<a name="215"><span class="lineNum"> 215 </span> :<span class="lineCov"> 2 : fdt_set_off_dt_strings(fdt, fdt_totalsize(fdt));</span></a> -<a name="216"><span class="lineNum"> 216 </span> :<span class="lineCov"> 2 : return 0;</span></a> +<a name="215"><span class="lineNum"> 215 </span> :<span class="lineCov"> 1 : fdt_set_off_dt_strings(fdt, fdt_totalsize(fdt));</span></a> +<a name="216"><span class="lineNum"> 216 </span> :<span class="lineCov"> 1 : return 0;</span></a> <a name="217"><span class="lineNum"> 217 </span> : : }</a> <a name="218"><span class="lineNum"> 218 </span> : : </a> -<a name="219"><span class="lineNum"> 219 </span> :<span class="lineCov"> 236 : int fdt_begin_node(void *fdt, const char *name)</span></a> +<a name="219"><span class="lineNum"> 219 </span> :<span class="lineCov"> 80 : int fdt_begin_node(void *fdt, const char *name)</span></a> <a name="220"><span class="lineNum"> 220 </span> : : {</a> <a name="221"><span class="lineNum"> 221 </span> : : struct fdt_node_header *nh;</a> <a name="222"><span class="lineNum"> 222 </span> : : int namelen;</a> <a name="223"><span class="lineNum"> 223 </span> : : </a> -<a name="224"><span class="lineNum"> 224 </span> :<span class="lineCov"> 236 : FDT_SW_PROBE_STRUCT(fdt);</span></a> +<a name="224"><span class="lineNum"> 224 </span> :<span class="lineCov"> 80 : FDT_SW_PROBE_STRUCT(fdt);</span></a> <a name="225"><span class="lineNum"> 225 </span> : : </a> -<a name="226"><span class="lineNum"> 226 </span> :<span class="lineCov"> 236 : namelen = strlen(name) + 1;</span></a> -<a name="227"><span class="lineNum"> 227 </span> :<span class="lineCov"> 236 : nh = fdt_grab_space_(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));</span></a> -<a name="228"><span class="lineNum"> 228 </span> :<span class="lineCov"> 236 : if (! nh)</span></a> +<a name="226"><span class="lineNum"> 226 </span> :<span class="lineCov"> 80 : namelen = strlen(name) + 1;</span></a> +<a name="227"><span class="lineNum"> 227 </span> :<span class="lineCov"> 80 : nh = fdt_grab_space_(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));</span></a> +<a name="228"><span class="lineNum"> 228 </span> :<span class="lineCov"> 80 : if (! nh)</span></a> <a name="229"><span class="lineNum"> 229 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_NOSPACE;</span></a> <a name="230"><span class="lineNum"> 230 </span> : : </a> -<a name="231"><span class="lineNum"> 231 </span> :<span class="lineCov"> 236 : nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE);</span></a> -<a name="232"><span class="lineNum"> 232 </span> :<span class="lineCov"> 236 : memcpy(nh->name, name, namelen);</span></a> -<a name="233"><span class="lineNum"> 233 </span> :<span class="lineCov"> 236 : return 0;</span></a> +<a name="231"><span class="lineNum"> 231 </span> :<span class="lineCov"> 80 : nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE);</span></a> +<a name="232"><span class="lineNum"> 232 </span> :<span class="lineCov"> 80 : memcpy(nh->name, name, namelen);</span></a> +<a name="233"><span class="lineNum"> 233 </span> :<span class="lineCov"> 80 : return 0;</span></a> <a name="234"><span class="lineNum"> 234 </span> : : }</a> <a name="235"><span class="lineNum"> 235 </span> : : </a> -<a name="236"><span class="lineNum"> 236 </span> :<span class="lineCov"> 236 : int fdt_end_node(void *fdt)</span></a> +<a name="236"><span class="lineNum"> 236 </span> :<span class="lineCov"> 80 : int fdt_end_node(void *fdt)</span></a> <a name="237"><span class="lineNum"> 237 </span> : : {</a> <a name="238"><span class="lineNum"> 238 </span> : : fdt32_t *en;</a> <a name="239"><span class="lineNum"> 239 </span> : : </a> -<a name="240"><span class="lineNum"> 240 </span> :<span class="lineCov"> 236 : FDT_SW_PROBE_STRUCT(fdt);</span></a> +<a name="240"><span class="lineNum"> 240 </span> :<span class="lineCov"> 80 : FDT_SW_PROBE_STRUCT(fdt);</span></a> <a name="241"><span class="lineNum"> 241 </span> : : </a> -<a name="242"><span class="lineNum"> 242 </span> :<span class="lineCov"> 236 : en = fdt_grab_space_(fdt, FDT_TAGSIZE);</span></a> -<a name="243"><span class="lineNum"> 243 </span> :<span class="lineCov"> 236 : if (! en)</span></a> +<a name="242"><span class="lineNum"> 242 </span> :<span class="lineCov"> 80 : en = fdt_grab_space_(fdt, FDT_TAGSIZE);</span></a> +<a name="243"><span class="lineNum"> 243 </span> :<span class="lineCov"> 80 : if (! en)</span></a> <a name="244"><span class="lineNum"> 244 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_NOSPACE;</span></a> <a name="245"><span class="lineNum"> 245 </span> : : </a> -<a name="246"><span class="lineNum"> 246 </span> :<span class="lineCov"> 236 : *en = cpu_to_fdt32(FDT_END_NODE);</span></a> -<a name="247"><span class="lineNum"> 247 </span> :<span class="lineCov"> 236 : return 0;</span></a> +<a name="246"><span class="lineNum"> 246 </span> :<span class="lineCov"> 80 : *en = cpu_to_fdt32(FDT_END_NODE);</span></a> +<a name="247"><span class="lineNum"> 247 </span> :<span class="lineCov"> 80 : return 0;</span></a> <a name="248"><span class="lineNum"> 248 </span> : : }</a> <a name="249"><span class="lineNum"> 249 </span> : : </a> -<a name="250"><span class="lineNum"> 250 </span> :<span class="lineCov"> 198 : static int fdt_add_string_(void *fdt, const char *s)</span></a> +<a name="250"><span class="lineNum"> 250 </span> :<span class="lineCov"> 99 : static int fdt_add_string_(void *fdt, const char *s)</span></a> <a name="251"><span class="lineNum"> 251 </span> : : {</a> -<a name="252"><span class="lineNum"> 252 </span> :<span class="lineCov"> 198 : char *strtab = (char *)fdt + fdt_totalsize(fdt);</span></a> -<a name="253"><span class="lineNum"> 253 </span> :<span class="lineCov"> 198 : unsigned int strtabsize = fdt_size_dt_strings(fdt);</span></a> -<a name="254"><span class="lineNum"> 254 </span> :<span class="lineCov"> 198 : unsigned int len = strlen(s) + 1;</span></a> +<a name="252"><span class="lineNum"> 252 </span> :<span class="lineCov"> 99 : char *strtab = (char *)fdt + fdt_totalsize(fdt);</span></a> +<a name="253"><span class="lineNum"> 253 </span> :<span class="lineCov"> 99 : unsigned int strtabsize = fdt_size_dt_strings(fdt);</span></a> +<a name="254"><span class="lineNum"> 254 </span> :<span class="lineCov"> 99 : unsigned int len = strlen(s) + 1;</span></a> <a name="255"><span class="lineNum"> 255 </span> : : unsigned int struct_top, offset;</a> <a name="256"><span class="lineNum"> 256 </span> : : </a> -<a name="257"><span class="lineNum"> 257 </span> :<span class="lineCov"> 198 : offset = strtabsize + len;</span></a> -<a name="258"><span class="lineNum"> 258 </span> :<span class="lineCov"> 198 : struct_top = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);</span></a> -<a name="259"><span class="lineNum"> 259 </span> :<span class="lineCov"> 198 : if (fdt_totalsize(fdt) - offset < struct_top)</span></a> +<a name="257"><span class="lineNum"> 257 </span> :<span class="lineCov"> 99 : offset = strtabsize + len;</span></a> +<a name="258"><span class="lineNum"> 258 </span> :<span class="lineCov"> 99 : struct_top = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);</span></a> +<a name="259"><span class="lineNum"> 259 </span> :<span class="lineCov"> 99 : if (fdt_totalsize(fdt) - offset < struct_top)</span></a> <a name="260"><span class="lineNum"> 260 </span> :<span class="lineNoCov"> 0 : return 0; /* no more room :( */</span></a> <a name="261"><span class="lineNum"> 261 </span> : : </a> -<a name="262"><span class="lineNum"> 262 </span> :<span class="lineCov"> 198 : memcpy(strtab - offset, s, len);</span></a> -<a name="263"><span class="lineNum"> 263 </span> :<span class="lineCov"> 198 : fdt_set_size_dt_strings(fdt, strtabsize + len);</span></a> -<a name="264"><span class="lineNum"> 264 </span> :<span class="lineCov"> 198 : return -offset;</span></a> +<a name="262"><span class="lineNum"> 262 </span> :<span class="lineCov"> 99 : memcpy(strtab - offset, s, len);</span></a> +<a name="263"><span class="lineNum"> 263 </span> :<span class="lineCov"> 99 : fdt_set_size_dt_strings(fdt, strtabsize + len);</span></a> +<a name="264"><span class="lineNum"> 264 </span> :<span class="lineCov"> 99 : return -offset;</span></a> <a name="265"><span class="lineNum"> 265 </span> : : }</a> <a name="266"><span class="lineNum"> 266 </span> : : </a> <a name="267"><span class="lineNum"> 267 </span> : : /* Must only be used to roll back in case of error */</a> @@ -344,114 +344,114 @@ <a name="273"><span class="lineNum"> 273 </span> :<span class="lineNoCov"> 0 : fdt_set_size_dt_strings(fdt, strtabsize - len);</span></a> <a name="274"><span class="lineNum"> 274 </span> :<span class="lineNoCov"> 0 : }</span></a> <a name="275"><span class="lineNum"> 275 </span> : : </a> -<a name="276"><span class="lineNum"> 276 </span> :<span class="lineCov"> 2811 : static int fdt_find_add_string_(void *fdt, const char *s, int *allocated)</span></a> +<a name="276"><span class="lineNum"> 276 </span> :<span class="lineCov"> 846 : static int fdt_find_add_string_(void *fdt, const char *s, int *allocated)</span></a> <a name="277"><span class="lineNum"> 277 </span> : : {</a> -<a name="278"><span class="lineNum"> 278 </span> :<span class="lineCov"> 2811 : char *strtab = (char *)fdt + fdt_totalsize(fdt);</span></a> -<a name="279"><span class="lineNum"> 279 </span> :<span class="lineCov"> 2811 : int strtabsize = fdt_size_dt_strings(fdt);</span></a> +<a name="278"><span class="lineNum"> 278 </span> :<span class="lineCov"> 846 : char *strtab = (char *)fdt + fdt_totalsize(fdt);</span></a> +<a name="279"><span class="lineNum"> 279 </span> :<span class="lineCov"> 846 : int strtabsize = fdt_size_dt_strings(fdt);</span></a> <a name="280"><span class="lineNum"> 280 </span> : : const char *p;</a> <a name="281"><span class="lineNum"> 281 </span> : : </a> -<a name="282"><span class="lineNum"> 282 </span> :<span class="lineCov"> 2811 : *allocated = 0;</span></a> +<a name="282"><span class="lineNum"> 282 </span> :<span class="lineCov"> 846 : *allocated = 0;</span></a> <a name="283"><span class="lineNum"> 283 </span> : : </a> -<a name="284"><span class="lineNum"> 284 </span> :<span class="lineCov"> 2811 : p = fdt_find_string_(strtab - strtabsize, strtabsize, s);</span></a> -<a name="285"><span class="lineNum"> 285 </span> :<span class="lineCov"> 2811 : if (p)</span></a> -<a name="286"><span class="lineNum"> 286 </span> :<span class="lineCov"> 2613 : return p - strtab;</span></a> +<a name="284"><span class="lineNum"> 284 </span> :<span class="lineCov"> 846 : p = fdt_find_string_(strtab - strtabsize, strtabsize, s);</span></a> +<a name="285"><span class="lineNum"> 285 </span> :<span class="lineCov"> 846 : if (p)</span></a> +<a name="286"><span class="lineNum"> 286 </span> :<span class="lineCov"> 747 : return p - strtab;</span></a> <a name="287"><span class="lineNum"> 287 </span> : : </a> -<a name="288"><span class="lineNum"> 288 </span> :<span class="lineCov"> 198 : *allocated = 1;</span></a> +<a name="288"><span class="lineNum"> 288 </span> :<span class="lineCov"> 99 : *allocated = 1;</span></a> <a name="289"><span class="lineNum"> 289 </span> : : </a> -<a name="290"><span class="lineNum"> 290 </span> :<span class="lineCov"> 198 : return fdt_add_string_(fdt, s);</span></a> +<a name="290"><span class="lineNum"> 290 </span> :<span class="lineCov"> 99 : return fdt_add_string_(fdt, s);</span></a> <a name="291"><span class="lineNum"> 291 </span> : : }</a> <a name="292"><span class="lineNum"> 292 </span> : : </a> -<a name="293"><span class="lineNum"> 293 </span> :<span class="lineCov"> 2811 : int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp)</span></a> +<a name="293"><span class="lineNum"> 293 </span> :<span class="lineCov"> 846 : int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp)</span></a> <a name="294"><span class="lineNum"> 294 </span> : : {</a> <a name="295"><span class="lineNum"> 295 </span> : : struct fdt_property *prop;</a> <a name="296"><span class="lineNum"> 296 </span> : : int nameoff;</a> <a name="297"><span class="lineNum"> 297 </span> : : int allocated;</a> <a name="298"><span class="lineNum"> 298 </span> : : </a> -<a name="299"><span class="lineNum"> 299 </span> :<span class="lineCov"> 2811 : FDT_SW_PROBE_STRUCT(fdt);</span></a> +<a name="299"><span class="lineNum"> 299 </span> :<span class="lineCov"> 846 : FDT_SW_PROBE_STRUCT(fdt);</span></a> <a name="300"><span class="lineNum"> 300 </span> : : </a> <a name="301"><span class="lineNum"> 301 </span> : : /* String de-duplication can be slow, _NO_NAME_DEDUP skips it */</a> -<a name="302"><span class="lineNum"> 302 </span> :<span class="lineCov"> 2811 : if (sw_flags(fdt) & FDT_CREATE_FLAG_NO_NAME_DEDUP) {</span></a> +<a name="302"><span class="lineNum"> 302 </span> :<span class="lineCov"> 846 : if (sw_flags(fdt) & FDT_CREATE_FLAG_NO_NAME_DEDUP) {</span></a> <a name="303"><span class="lineNum"> 303 </span> :<span class="lineNoCov"> 0 : allocated = 1;</span></a> <a name="304"><span class="lineNum"> 304 </span> :<span class="lineNoCov"> 0 : nameoff = fdt_add_string_(fdt, name);</span></a> <a name="305"><span class="lineNum"> 305 </span> : : } else {</a> -<a name="306"><span class="lineNum"> 306 </span> :<span class="lineCov"> 2811 : nameoff = fdt_find_add_string_(fdt, name, &allocated);</span></a> +<a name="306"><span class="lineNum"> 306 </span> :<span class="lineCov"> 846 : nameoff = fdt_find_add_string_(fdt, name, &allocated);</span></a> <a name="307"><span class="lineNum"> 307 </span> : : }</a> -<a name="308"><span class="lineNum"> 308 </span> :<span class="lineCov"> 2811 : if (nameoff == 0)</span></a> +<a name="308"><span class="lineNum"> 308 </span> :<span class="lineCov"> 846 : if (nameoff == 0)</span></a> <a name="309"><span class="lineNum"> 309 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_NOSPACE;</span></a> <a name="310"><span class="lineNum"> 310 </span> : : </a> -<a name="311"><span class="lineNum"> 311 </span> :<span class="lineCov"> 2811 : prop = fdt_grab_space_(fdt, sizeof(*prop) + FDT_TAGALIGN(len));</span></a> -<a name="312"><span class="lineNum"> 312 </span> :<span class="lineCov"> 2811 : if (! prop) {</span></a> +<a name="311"><span class="lineNum"> 311 </span> :<span class="lineCov"> 846 : prop = fdt_grab_space_(fdt, sizeof(*prop) + FDT_TAGALIGN(len));</span></a> +<a name="312"><span class="lineNum"> 312 </span> :<span class="lineCov"> 846 : if (! prop) {</span></a> <a name="313"><span class="lineNum"> 313 </span> :<span class="lineNoCov"> 0 : if (allocated)</span></a> <a name="314"><span class="lineNum"> 314 </span> :<span class="lineNoCov"> 0 : fdt_del_last_string_(fdt, name);</span></a> <a name="315"><span class="lineNum"> 315 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_NOSPACE;</span></a> <a name="316"><span class="lineNum"> 316 </span> : : }</a> <a name="317"><span class="lineNum"> 317 </span> : : </a> -<a name="318"><span class="lineNum"> 318 </span> :<span class="lineCov"> 2811 : prop->tag = cpu_to_fdt32(FDT_PROP);</span></a> -<a name="319"><span class="lineNum"> 319 </span> :<span class="lineCov"> 2811 : prop->nameoff = cpu_to_fdt32(nameoff);</span></a> -<a name="320"><span class="lineNum"> 320 </span> :<span class="lineCov"> 2811 : prop->len = cpu_to_fdt32(len);</span></a> -<a name="321"><span class="lineNum"> 321 </span> :<span class="lineCov"> 2811 : *valp = prop->data;</span></a> -<a name="322"><span class="lineNum"> 322 </span> :<span class="lineCov"> 2811 : return 0;</span></a> +<a name="318"><span class="lineNum"> 318 </span> :<span class="lineCov"> 846 : prop->tag = cpu_to_fdt32(FDT_PROP);</span></a> +<a name="319"><span class="lineNum"> 319 </span> :<span class="lineCov"> 846 : prop->nameoff = cpu_to_fdt32(nameoff);</span></a> +<a name="320"><span class="lineNum"> 320 </span> :<span class="lineCov"> 846 : prop->len = cpu_to_fdt32(len);</span></a> +<a name="321"><span class="lineNum"> 321 </span> :<span class="lineCov"> 846 : *valp = prop->data;</span></a> +<a name="322"><span class="lineNum"> 322 </span> :<span class="lineCov"> 846 : return 0;</span></a> <a name="323"><span class="lineNum"> 323 </span> : : }</a> <a name="324"><span class="lineNum"> 324 </span> : : </a> -<a name="325"><span class="lineNum"> 325 </span> :<span class="lineCov"> 2811 : int fdt_property(void *fdt, const char *name, const void *val, int len)</span></a> +<a name="325"><span class="lineNum"> 325 </span> :<span class="lineCov"> 846 : int fdt_property(void *fdt, const char *name, const void *val, int len)</span></a> <a name="326"><span class="lineNum"> 326 </span> : : {</a> <a name="327"><span class="lineNum"> 327 </span> : : void *ptr;</a> <a name="328"><span class="lineNum"> 328 </span> : : int ret;</a> <a name="329"><span class="lineNum"> 329 </span> : : </a> -<a name="330"><span class="lineNum"> 330 </span> :<span class="lineCov"> 2811 : ret = fdt_property_placeholder(fdt, name, len, &ptr);</span></a> -<a name="331"><span class="lineNum"> 331 </span> :<span class="lineCov"> 2811 : if (ret)</span></a> +<a name="330"><span class="lineNum"> 330 </span> :<span class="lineCov"> 846 : ret = fdt_property_placeholder(fdt, name, len, &ptr);</span></a> +<a name="331"><span class="lineNum"> 331 </span> :<span class="lineCov"> 846 : if (ret)</span></a> <a name="332"><span class="lineNum"> 332 </span> :<span class="lineNoCov"> 0 : return ret;</span></a> -<a name="333"><span class="lineNum"> 333 </span> :<span class="lineCov"> 2811 : memcpy(ptr, val, len);</span></a> -<a name="334"><span class="lineNum"> 334 </span> :<span class="lineCov"> 2811 : return 0;</span></a> +<a name="333"><span class="lineNum"> 333 </span> :<span class="lineCov"> 846 : memcpy(ptr, val, len);</span></a> +<a name="334"><span class="lineNum"> 334 </span> :<span class="lineCov"> 846 : return 0;</span></a> <a name="335"><span class="lineNum"> 335 </span> : : }</a> <a name="336"><span class="lineNum"> 336 </span> : : </a> -<a name="337"><span class="lineNum"> 337 </span> :<span class="lineCov"> 2 : int fdt_finish(void *fdt)</span></a> +<a name="337"><span class="lineNum"> 337 </span> :<span class="lineCov"> 1 : int fdt_finish(void *fdt)</span></a> <a name="338"><span class="lineNum"> 338 </span> : : {</a> -<a name="339"><span class="lineNum"> 339 </span> :<span class="lineCov"> 2 : char *p = (char *)fdt;</span></a> +<a name="339"><span class="lineNum"> 339 </span> :<span class="lineCov"> 1 : char *p = (char *)fdt;</span></a> <a name="340"><span class="lineNum"> 340 </span> : : fdt32_t *end;</a> <a name="341"><span class="lineNum"> 341 </span> : : int oldstroffset, newstroffset;</a> <a name="342"><span class="lineNum"> 342 </span> : : uint32_t tag;</a> <a name="343"><span class="lineNum"> 343 </span> : : int offset, nextoffset;</a> <a name="344"><span class="lineNum"> 344 </span> : : </a> -<a name="345"><span class="lineNum"> 345 </span> :<span class="lineCov"> 2 : FDT_SW_PROBE_STRUCT(fdt);</span></a> +<a name="345"><span class="lineNum"> 345 </span> :<span class="lineCov"> 1 : FDT_SW_PROBE_STRUCT(fdt);</span></a> <a name="346"><span class="lineNum"> 346 </span> : : </a> <a name="347"><span class="lineNum"> 347 </span> : : /* Add terminator */</a> -<a name="348"><span class="lineNum"> 348 </span> :<span class="lineCov"> 2 : end = fdt_grab_space_(fdt, sizeof(*end));</span></a> -<a name="349"><span class="lineNum"> 349 </span> :<span class="lineCov"> 2 : if (! end)</span></a> +<a name="348"><span class="lineNum"> 348 </span> :<span class="lineCov"> 1 : end = fdt_grab_space_(fdt, sizeof(*end));</span></a> +<a name="349"><span class="lineNum"> 349 </span> :<span class="lineCov"> 1 : if (! end)</span></a> <a name="350"><span class="lineNum"> 350 </span> :<span class="lineNoCov"> 0 : return -FDT_ERR_NOSPACE;</span></a> -<a name="351"><span class="lineNum"> 351 </span> :<span class="lineCov"> 2 : *end = cpu_to_fdt32(FDT_END);</span></a> +<a name="351"><span class="lineNum"> 351 </span> :<span class="lineCov"> 1 : *end = cpu_to_fdt32(FDT_END);</span></a> <a name="352"><span class="lineNum"> 352 </span> : : </a> <a name="353"><span class="lineNum"> 353 </span> : : /* Relocate the string table */</a> -<a name="354"><span class="lineNum"> 354 </span> :<span class="lineCov"> 2 : oldstroffset = fdt_totalsize(fdt) - fdt_size_dt_strings(fdt);</span></a> -<a name="355"><span class="lineNum"> 355 </span> :<span class="lineCov"> 2 : newstroffset = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);</span></a> -<a name="356"><span class="lineNum"> 356 </span> :<span class="lineCov"> 2 : memmove(p + newstroffset, p + oldstroffset, fdt_size_dt_strings(fdt));</span></a> -<a name="357"><span class="lineNum"> 357 </span> :<span class="lineCov"> 2 : fdt_set_off_dt_strings(fdt, newstroffset);</span></a> +<a name="354"><span class="lineNum"> 354 </span> :<span class="lineCov"> 1 : oldstroffset = fdt_totalsize(fdt) - fdt_size_dt_strings(fdt);</span></a> +<a name="355"><span class="lineNum"> 355 </span> :<span class="lineCov"> 1 : newstroffset = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);</span></a> +<a name="356"><span class="lineNum"> 356 </span> :<span class="lineCov"> 1 : memmove(p + newstroffset, p + oldstroffset, fdt_size_dt_strings(fdt));</span></a> +<a name="357"><span class="lineNum"> 357 </span> :<span class="lineCov"> 1 : fdt_set_off_dt_strings(fdt, newstroffset);</span></a> <a name="358"><span class="lineNum"> 358 </span> : : </a> <a name="359"><span class="lineNum"> 359 </span> : : /* Walk the structure, correcting string offsets */</a> -<a name="360"><span class="lineNum"> 360 </span> :<span class="lineCov"> 2 : offset = 0;</span></a> -<a name="361"><span class="lineNum"> 361 </span> :<span class="lineCov"> 3285 : while ((tag = fdt_next_tag(fdt, offset, &nextoffset)) != FDT_END) {</span></a> -<a name="362"><span class="lineNum"> 362 </span> :<span class="lineCov"> 3283 : if (tag == FDT_PROP) {</span></a> +<a name="360"><span class="lineNum"> 360 </span> :<span class="lineCov"> 1 : offset = 0;</span></a> +<a name="361"><span class="lineNum"> 361 </span> :<span class="lineCov"> 1007 : while ((tag = fdt_next_tag(fdt, offset, &nextoffset)) != FDT_END) {</span></a> +<a name="362"><span class="lineNum"> 362 </span> :<span class="lineCov"> 1006 : if (tag == FDT_PROP) {</span></a> <a name="363"><span class="lineNum"> 363 </span> : : struct fdt_property *prop =</a> -<a name="364"><span class="lineNum"> 364 </span> :<span class="lineCov"> 2811 : fdt_offset_ptr_w_(fdt, offset);</span></a> +<a name="364"><span class="lineNum"> 364 </span> :<span class="lineCov"> 846 : fdt_offset_ptr_w_(fdt, offset);</span></a> <a name="365"><span class="lineNum"> 365 </span> : : int nameoff;</a> <a name="366"><span class="lineNum"> 366 </span> : : </a> -<a name="367"><span class="lineNum"> 367 </span> :<span class="lineCov"> 2811 : nameoff = fdt32_to_cpu(prop->nameoff);</span></a> -<a name="368"><span class="lineNum"> 368 </span> :<span class="lineCov"> 2811 : nameoff += fdt_size_dt_strings(fdt);</span></a> -<a name="369"><span class="lineNum"> 369 </span> :<span class="lineCov"> 2811 : prop->nameoff = cpu_to_fdt32(nameoff);</span></a> +<a name="367"><span class="lineNum"> 367 </span> :<span class="lineCov"> 846 : nameoff = fdt32_to_cpu(prop->nameoff);</span></a> +<a name="368"><span class="lineNum"> 368 </span> :<span class="lineCov"> 846 : nameoff += fdt_size_dt_strings(fdt);</span></a> +<a name="369"><span class="lineNum"> 369 </span> :<span class="lineCov"> 846 : prop->nameoff = cpu_to_fdt32(nameoff);</span></a> <a name="370"><span class="lineNum"> 370 </span> : : }</a> -<a name="371"><span class="lineNum"> 371 </span> :<span class="lineCov"> 3283 : offset = nextoffset;</span></a> +<a name="371"><span class="lineNum"> 371 </span> :<span class="lineCov"> 1006 : offset = nextoffset;</span></a> <a name="372"><span class="lineNum"> 372 </span> : : }</a> -<a name="373"><span class="lineNum"> 373 </span> :<span class="lineCov"> 2 : if (nextoffset < 0)</span></a> +<a name="373"><span class="lineNum"> 373 </span> :<span class="lineCov"> 1 : if (nextoffset < 0)</span></a> <a name="374"><span class="lineNum"> 374 </span> :<span class="lineNoCov"> 0 : return nextoffset;</span></a> <a name="375"><span class="lineNum"> 375 </span> : : </a> <a name="376"><span class="lineNum"> 376 </span> : : /* Finally, adjust the header */</a> -<a name="377"><span class="lineNum"> 377 </span> :<span class="lineCov"> 2 : fdt_set_totalsize(fdt, newstroffset + fdt_size_dt_strings(fdt));</span></a> +<a name="377"><span class="lineNum"> 377 </span> :<span class="lineCov"> 1 : fdt_set_totalsize(fdt, newstroffset + fdt_size_dt_strings(fdt));</span></a> <a name="378"><span class="lineNum"> 378 </span> : : </a> <a name="379"><span class="lineNum"> 379 </span> : : /* And fix up fields that were keeping intermediate state. */</a> -<a name="380"><span class="lineNum"> 380 </span> :<span class="lineCov"> 2 : fdt_set_last_comp_version(fdt, FDT_LAST_COMPATIBLE_VERSION);</span></a> -<a name="381"><span class="lineNum"> 381 </span> :<span class="lineCov"> 2 : fdt_set_magic(fdt, FDT_MAGIC);</span></a> +<a name="380"><span class="lineNum"> 380 </span> :<span class="lineCov"> 1 : fdt_set_last_comp_version(fdt, FDT_LAST_COMPATIBLE_VERSION);</span></a> +<a name="381"><span class="lineNum"> 381 </span> :<span class="lineCov"> 1 : fdt_set_magic(fdt, FDT_MAGIC);</span></a> <a name="382"><span class="lineNum"> 382 </span> : : </a> -<a name="383"><span class="lineNum"> 383 </span> :<span class="lineCov"> 2 : return 0;</span></a> +<a name="383"><span class="lineNum"> 383 </span> :<span class="lineCov"> 1 : return 0;</span></a> <a name="384"><span class="lineNum"> 384 </span> : : }</a> </pre> </td> diff --git a/coverage-report/libfdt/index-sort-b.html b/coverage-report/libfdt/index-sort-b.html index 2dd25b5..01485a2 100644 --- a/coverage-report/libfdt/index-sort-b.html +++ b/coverage-report/libfdt/index-sort-b.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">47</td> @@ -82,14 +82,14 @@ <td class="tableHead" colspan=2>Branches <span class="tableHeadSort"><img src="../glass.png" width=10 height=14 alt="Sort by branch coverage" title="Sort by branch coverage" border=0></span></td> </tr> <tr> - <td class="coverFile"><a href="libfdt_internal.h.gcov.html">libfdt_internal.h</a></td> + <td class="coverFile"><a href="fdt.c.gcov.html">fdt.c</a></td> <td class="coverBar" align="center"> - <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=43 height=10 alt="42.9%"><img src="../snow.png" width=57 height=10 alt="42.9%"></td></tr></table> + <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=51 height=10 alt="50.5%"><img src="../snow.png" width=49 height=10 alt="50.5%"></td></tr></table> </td> - <td class="coverPerLo">42.9 %</td> - <td class="coverNumLo">6 / 14</td> - <td class="coverPerLo">50.0 %</td> - <td class="coverNumLo">3 / 6</td> + <td class="coverPerLo">50.5 %</td> + <td class="coverNumLo">94 / 186</td> + <td class="coverPerLo">66.7 %</td> + <td class="coverNumLo">10 / 15</td> <td class="coverPerHi">-</td> <td class="coverNumHi">0 / 0</td> </tr> @@ -106,18 +106,6 @@ <td class="coverNumHi">0 / 0</td> </tr> <tr> - <td class="coverFile"><a href="libfdt.h.gcov.html">libfdt.h</a></td> - <td class="coverBar" align="center"> - <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table> - </td> - <td class="coverPerHi">100.0 %</td> - <td class="coverNumHi">20 / 20</td> - <td class="coverPerHi">100.0 %</td> - <td class="coverNumHi">12 / 12</td> - <td class="coverPerHi">-</td> - <td class="coverNumHi">0 / 0</td> - </tr> - <tr> <td class="coverFile"><a href="fdt_strerror.c.gcov.html">fdt_strerror.c</a></td> <td class="coverBar" align="center"> <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../snow.png" width=100 height=10 alt="0.0%"></td></tr></table> @@ -130,38 +118,50 @@ <td class="coverNumHi">0 / 0</td> </tr> <tr> - <td class="coverFile"><a href="libfdt_env.h.gcov.html">libfdt_env.h</a></td> + <td class="coverFile"><a href="fdt_sw.c.gcov.html">fdt_sw.c</a></td> + <td class="coverBar" align="center"> + <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=71 height=10 alt="70.8%"><img src="../snow.png" width=29 height=10 alt="70.8%"></td></tr></table> + </td> + <td class="coverPerLo">70.8 %</td> + <td class="coverNumLo">126 / 178</td> + <td class="coverPerMed">83.3 %</td> + <td class="coverNumMed">15 / 18</td> + <td class="coverPerHi">-</td> + <td class="coverNumHi">0 / 0</td> + </tr> + <tr> + <td class="coverFile"><a href="libfdt.h.gcov.html">libfdt.h</a></td> <td class="coverBar" align="center"> <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table> </td> <td class="coverPerHi">100.0 %</td> - <td class="coverNumHi">8 / 8</td> + <td class="coverNumHi">20 / 20</td> <td class="coverPerHi">100.0 %</td> - <td class="coverNumHi">4 / 4</td> + <td class="coverNumHi">12 / 12</td> <td class="coverPerHi">-</td> <td class="coverNumHi">0 / 0</td> </tr> <tr> - <td class="coverFile"><a href="fdt.c.gcov.html">fdt.c</a></td> + <td class="coverFile"><a href="libfdt_env.h.gcov.html">libfdt_env.h</a></td> <td class="coverBar" align="center"> - <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=51 height=10 alt="50.5%"><img src="../snow.png" width=49 height=10 alt="50.5%"></td></tr></table> + <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../emerald.png" width=100 height=10 alt="100.0%"></td></tr></table> </td> - <td class="coverPerLo">50.5 %</td> - <td class="coverNumLo">94 / 186</td> - <td class="coverPerLo">66.7 %</td> - <td class="coverNumLo">10 / 15</td> + <td class="coverPerHi">100.0 %</td> + <td class="coverNumHi">8 / 8</td> + <td class="coverPerHi">100.0 %</td> + <td class="coverNumHi">4 / 4</td> <td class="coverPerHi">-</td> <td class="coverNumHi">0 / 0</td> </tr> <tr> - <td class="coverFile"><a href="fdt_sw.c.gcov.html">fdt_sw.c</a></td> + <td class="coverFile"><a href="libfdt_internal.h.gcov.html">libfdt_internal.h</a></td> <td class="coverBar" align="center"> - <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=71 height=10 alt="70.8%"><img src="../snow.png" width=29 height=10 alt="70.8%"></td></tr></table> + <table border=0 cellspacing=0 cellpadding=1><tr><td class="coverBarOutline"><img src="../ruby.png" width=43 height=10 alt="42.9%"><img src="../snow.png" width=57 height=10 alt="42.9%"></td></tr></table> </td> - <td class="coverPerLo">70.8 %</td> - <td class="coverNumLo">126 / 178</td> - <td class="coverPerMed">83.3 %</td> - <td class="coverNumMed">15 / 18</td> + <td class="coverPerLo">42.9 %</td> + <td class="coverNumLo">6 / 14</td> + <td class="coverPerLo">50.0 %</td> + <td class="coverNumLo">3 / 6</td> <td class="coverPerHi">-</td> <td class="coverNumHi">0 / 0</td> </tr> diff --git a/coverage-report/libfdt/index-sort-f.html b/coverage-report/libfdt/index-sort-f.html index 9586d80..2718187 100644 --- a/coverage-report/libfdt/index-sort-f.html +++ b/coverage-report/libfdt/index-sort-f.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">47</td> diff --git a/coverage-report/libfdt/index-sort-l.html b/coverage-report/libfdt/index-sort-l.html index d0e2390..f7239f8 100644 --- a/coverage-report/libfdt/index-sort-l.html +++ b/coverage-report/libfdt/index-sort-l.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">47</td> diff --git a/coverage-report/libfdt/index.html b/coverage-report/libfdt/index.html index 9aec1e0..9b410dd 100644 --- a/coverage-report/libfdt/index.html +++ b/coverage-report/libfdt/index.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">47</td> diff --git a/coverage-report/libfdt/libfdt.h.func-sort-c.html b/coverage-report/libfdt/libfdt.h.func-sort-c.html index 9d9f049..dcc731f 100644 --- a/coverage-report/libfdt/libfdt.h.func-sort-c.html +++ b/coverage-report/libfdt/libfdt.h.func-sort-c.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">12</td> @@ -70,51 +70,51 @@ </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#268">fdt_set_off_mem_rsvmap</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#269">fdt_set_version</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#270">fdt_set_last_comp_version</a></td> - <td class="coverFnHi">4</td> + <td class="coverFnHi">2</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#264">fdt_set_magic</a></td> - <td class="coverFnHi">4</td> + <td class="coverFnHi">2</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#265">fdt_set_totalsize</a></td> - <td class="coverFnHi">4</td> + <td class="coverFnHi">2</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#267">fdt_set_off_dt_strings</a></td> - <td class="coverFnHi">6</td> + <td class="coverFnHi">3</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#266">fdt_set_off_dt_struct</a></td> - <td class="coverFnHi">10</td> - </tr> - <tr> - <td class="coverFn"><a href="libfdt.h.gcov.html#272">fdt_set_size_dt_strings</a></td> - <td class="coverFnHi">198</td> + <td class="coverFnHi">5</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#1483">fdt_property_cell</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#1471">fdt_property_u32</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> + </tr> + <tr> + <td class="coverFn"><a href="libfdt.h.gcov.html#272">fdt_set_size_dt_strings</a></td> + <td class="coverFnHi">99</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#273">fdt_set_size_dt_struct</a></td> - <td class="coverFnHi">3285</td> + <td class="coverFnHi">1007</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#139">fdt32_ld</a></td> - <td class="coverFnHi">119701</td> + <td class="coverFnHi">39510</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/libfdt.h.func.html b/coverage-report/libfdt/libfdt.h.func.html index e028e8a..70616d9 100644 --- a/coverage-report/libfdt/libfdt.h.func.html +++ b/coverage-report/libfdt/libfdt.h.func.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">12</td> @@ -70,51 +70,51 @@ </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#139">fdt32_ld</a></td> - <td class="coverFnHi">119701</td> + <td class="coverFnHi">39510</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#1483">fdt_property_cell</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#1471">fdt_property_u32</a></td> - <td class="coverFnHi">236</td> + <td class="coverFnHi">80</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#270">fdt_set_last_comp_version</a></td> - <td class="coverFnHi">4</td> + <td class="coverFnHi">2</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#264">fdt_set_magic</a></td> - <td class="coverFnHi">4</td> + <td class="coverFnHi">2</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#267">fdt_set_off_dt_strings</a></td> - <td class="coverFnHi">6</td> + <td class="coverFnHi">3</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#266">fdt_set_off_dt_struct</a></td> - <td class="coverFnHi">10</td> + <td class="coverFnHi">5</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#268">fdt_set_off_mem_rsvmap</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#272">fdt_set_size_dt_strings</a></td> - <td class="coverFnHi">198</td> + <td class="coverFnHi">99</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#273">fdt_set_size_dt_struct</a></td> - <td class="coverFnHi">3285</td> + <td class="coverFnHi">1007</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#265">fdt_set_totalsize</a></td> - <td class="coverFnHi">4</td> + <td class="coverFnHi">2</td> </tr> <tr> <td class="coverFn"><a href="libfdt.h.gcov.html#269">fdt_set_version</a></td> - <td class="coverFnHi">2</td> + <td class="coverFnHi">1</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/libfdt.h.gcov.html b/coverage-report/libfdt/libfdt.h.gcov.html index fde93bc..71305f0 100644 --- a/coverage-report/libfdt/libfdt.h.gcov.html +++ b/coverage-report/libfdt/libfdt.h.gcov.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">12</td> @@ -209,14 +209,14 @@ <a name="138"><span class="lineNum"> 138 </span> : : return ((uint16_t)bp[0] << 8) | bp[1];</a> <a name="139"><span class="lineNum"> 139 </span> : : }</a> <a name="140"><span class="lineNum"> 140 </span> : : </a> -<a name="141"><span class="lineNum"> 141 </span> :<span class="lineCov"> 119701 : static inline uint32_t fdt32_ld(const fdt32_t *p)</span></a> +<a name="141"><span class="lineNum"> 141 </span> :<span class="lineCov"> 39510 : static inline uint32_t fdt32_ld(const fdt32_t *p)</span></a> <a name="142"><span class="lineNum"> 142 </span> : : {</a> -<a name="143"><span class="lineNum"> 143 </span> :<span class="lineCov"> 119701 : const uint8_t *bp = (const uint8_t *)p;</span></a> +<a name="143"><span class="lineNum"> 143 </span> :<span class="lineCov"> 39510 : const uint8_t *bp = (const uint8_t *)p;</span></a> <a name="144"><span class="lineNum"> 144 </span> : : </a> -<a name="145"><span class="lineNum"> 145 </span> :<span class="lineCov"> 119701 : return ((uint32_t)bp[0] << 24)</span></a> -<a name="146"><span class="lineNum"> 146 </span> :<span class="lineCov"> 119701 : | ((uint32_t)bp[1] << 16)</span></a> -<a name="147"><span class="lineNum"> 147 </span> :<span class="lineCov"> 119701 : | ((uint32_t)bp[2] << 8)</span></a> -<a name="148"><span class="lineNum"> 148 </span> :<span class="lineCov"> 119701 : | bp[3];</span></a> +<a name="145"><span class="lineNum"> 145 </span> :<span class="lineCov"> 39510 : return ((uint32_t)bp[0] << 24)</span></a> +<a name="146"><span class="lineNum"> 146 </span> :<span class="lineCov"> 39510 : | ((uint32_t)bp[1] << 16)</span></a> +<a name="147"><span class="lineNum"> 147 </span> :<span class="lineCov"> 39510 : | ((uint32_t)bp[2] << 8)</span></a> +<a name="148"><span class="lineNum"> 148 </span> :<span class="lineCov"> 39510 : | bp[3];</span></a> <a name="149"><span class="lineNum"> 149 </span> : : }</a> <a name="150"><span class="lineNum"> 150 </span> : : </a> <a name="151"><span class="lineNum"> 151 </span> : : static inline void fdt32_st(void *property, uint32_t value)</a> @@ -334,16 +334,16 @@ <a name="263"><span class="lineNum"> 263 </span> : : struct fdt_header *fdth = (struct fdt_header *)fdt; \</a> <a name="264"><span class="lineNum"> 264 </span> : : fdth->name = cpu_to_fdt32(val); \</a> <a name="265"><span class="lineNum"> 265 </span> : : }</a> -<a name="266"><span class="lineNum"> 266 </span> :<span class="lineCov"> 4 : fdt_set_hdr_(magic);</span></a> -<a name="267"><span class="lineNum"> 267 </span> :<span class="lineCov"> 4 : fdt_set_hdr_(totalsize);</span></a> -<a name="268"><span class="lineNum"> 268 </span> :<span class="lineCov"> 10 : fdt_set_hdr_(off_dt_struct);</span></a> -<a name="269"><span class="lineNum"> 269 </span> :<span class="lineCov"> 6 : fdt_set_hdr_(off_dt_strings);</span></a> -<a name="270"><span class="lineNum"> 270 </span> :<span class="lineCov"> 2 : fdt_set_hdr_(off_mem_rsvmap);</span></a> -<a name="271"><span class="lineNum"> 271 </span> :<span class="lineCov"> 2 : fdt_set_hdr_(version);</span></a> -<a name="272"><span class="lineNum"> 272 </span> :<span class="lineCov"> 4 : fdt_set_hdr_(last_comp_version);</span></a> +<a name="266"><span class="lineNum"> 266 </span> :<span class="lineCov"> 2 : fdt_set_hdr_(magic);</span></a> +<a name="267"><span class="lineNum"> 267 </span> :<span class="lineCov"> 2 : fdt_set_hdr_(totalsize);</span></a> +<a name="268"><span class="lineNum"> 268 </span> :<span class="lineCov"> 5 : fdt_set_hdr_(off_dt_struct);</span></a> +<a name="269"><span class="lineNum"> 269 </span> :<span class="lineCov"> 3 : fdt_set_hdr_(off_dt_strings);</span></a> +<a name="270"><span class="lineNum"> 270 </span> :<span class="lineCov"> 1 : fdt_set_hdr_(off_mem_rsvmap);</span></a> +<a name="271"><span class="lineNum"> 271 </span> :<span class="lineCov"> 1 : fdt_set_hdr_(version);</span></a> +<a name="272"><span class="lineNum"> 272 </span> :<span class="lineCov"> 2 : fdt_set_hdr_(last_comp_version);</span></a> <a name="273"><span class="lineNum"> 273 </span> : : fdt_set_hdr_(boot_cpuid_phys);</a> -<a name="274"><span class="lineNum"> 274 </span> :<span class="lineCov"> 198 : fdt_set_hdr_(size_dt_strings);</span></a> -<a name="275"><span class="lineNum"> 275 </span> :<span class="lineCov"> 3285 : fdt_set_hdr_(size_dt_struct);</span></a> +<a name="274"><span class="lineNum"> 274 </span> :<span class="lineCov"> 99 : fdt_set_hdr_(size_dt_strings);</span></a> +<a name="275"><span class="lineNum"> 275 </span> :<span class="lineCov"> 1007 : fdt_set_hdr_(size_dt_struct);</span></a> <a name="276"><span class="lineNum"> 276 </span> : : #undef fdt_set_hdr_</a> <a name="277"><span class="lineNum"> 277 </span> : : </a> <a name="278"><span class="lineNum"> 278 </span> : : /**</a> @@ -1541,10 +1541,10 @@ <a name="1470"><span class="lineNum"> 1470 </span> : : int fdt_finish_reservemap(void *fdt);</a> <a name="1471"><span class="lineNum"> 1471 </span> : : int fdt_begin_node(void *fdt, const char *name);</a> <a name="1472"><span class="lineNum"> 1472 </span> : : int fdt_property(void *fdt, const char *name, const void *val, int len);</a> -<a name="1473"><span class="lineNum"> 1473 </span> :<span class="lineCov"> 236 : static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val)</span></a> +<a name="1473"><span class="lineNum"> 1473 </span> :<span class="lineCov"> 80 : static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val)</span></a> <a name="1474"><span class="lineNum"> 1474 </span> : : {</a> -<a name="1475"><span class="lineNum"> 1475 </span> :<span class="lineCov"> 236 : fdt32_t tmp = cpu_to_fdt32(val);</span></a> -<a name="1476"><span class="lineNum"> 1476 </span> :<span class="lineCov"> 236 : return fdt_property(fdt, name, &tmp, sizeof(tmp));</span></a> +<a name="1475"><span class="lineNum"> 1475 </span> :<span class="lineCov"> 80 : fdt32_t tmp = cpu_to_fdt32(val);</span></a> +<a name="1476"><span class="lineNum"> 1476 </span> :<span class="lineCov"> 80 : return fdt_property(fdt, name, &tmp, sizeof(tmp));</span></a> <a name="1477"><span class="lineNum"> 1477 </span> : : }</a> <a name="1478"><span class="lineNum"> 1478 </span> : : static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val)</a> <a name="1479"><span class="lineNum"> 1479 </span> : : {</a> @@ -1553,9 +1553,9 @@ <a name="1482"><span class="lineNum"> 1482 </span> : : }</a> <a name="1483"><span class="lineNum"> 1483 </span> : : </a> <a name="1484"><span class="lineNum"> 1484 </span> : : #ifndef SWIG /* Not available in Python */</a> -<a name="1485"><span class="lineNum"> 1485 </span> :<span class="lineCov"> 236 : static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)</span></a> +<a name="1485"><span class="lineNum"> 1485 </span> :<span class="lineCov"> 80 : static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)</span></a> <a name="1486"><span class="lineNum"> 1486 </span> : : {</a> -<a name="1487"><span class="lineNum"> 1487 </span> :<span class="lineCov"> 236 : return fdt_property_u32(fdt, name, val);</span></a> +<a name="1487"><span class="lineNum"> 1487 </span> :<span class="lineCov"> 80 : return fdt_property_u32(fdt, name, val);</span></a> <a name="1488"><span class="lineNum"> 1488 </span> : : }</a> <a name="1489"><span class="lineNum"> 1489 </span> : : #endif</a> <a name="1490"><span class="lineNum"> 1490 </span> : : </a> diff --git a/coverage-report/libfdt/libfdt_env.h.func-sort-c.html b/coverage-report/libfdt/libfdt_env.h.func-sort-c.html index 43193b9..d2e3ca3 100644 --- a/coverage-report/libfdt/libfdt_env.h.func-sort-c.html +++ b/coverage-report/libfdt/libfdt_env.h.func-sort-c.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">4</td> @@ -74,15 +74,15 @@ </tr> <tr> <td class="coverFn"><a href="libfdt_env.h.gcov.html#58">cpu_to_fdt64</a></td> - <td class="coverFnHi">116</td> + <td class="coverFnHi">68</td> </tr> <tr> <td class="coverFn"><a href="libfdt_env.h.gcov.html#45">fdt32_to_cpu</a></td> - <td class="coverFnHi">9349</td> + <td class="coverFnHi">3003</td> </tr> <tr> <td class="coverFn"><a href="libfdt_env.h.gcov.html#49">cpu_to_fdt32</a></td> - <td class="coverFnHi">19861</td> + <td class="coverFnHi">7245</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/libfdt_env.h.func.html b/coverage-report/libfdt/libfdt_env.h.func.html index d35b92c..b9ff696 100644 --- a/coverage-report/libfdt/libfdt_env.h.func.html +++ b/coverage-report/libfdt/libfdt_env.h.func.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">4</td> @@ -70,15 +70,15 @@ </tr> <tr> <td class="coverFn"><a href="libfdt_env.h.gcov.html#49">cpu_to_fdt32</a></td> - <td class="coverFnHi">19861</td> + <td class="coverFnHi">7245</td> </tr> <tr> <td class="coverFn"><a href="libfdt_env.h.gcov.html#58">cpu_to_fdt64</a></td> - <td class="coverFnHi">116</td> + <td class="coverFnHi">68</td> </tr> <tr> <td class="coverFn"><a href="libfdt_env.h.gcov.html#45">fdt32_to_cpu</a></td> - <td class="coverFnHi">9349</td> + <td class="coverFnHi">3003</td> </tr> <tr> <td class="coverFn"><a href="libfdt_env.h.gcov.html#54">fdt64_to_cpu</a></td> diff --git a/coverage-report/libfdt/libfdt_env.h.gcov.html b/coverage-report/libfdt/libfdt_env.h.gcov.html index f9d38d8..56f7c9f 100644 --- a/coverage-report/libfdt/libfdt_env.h.gcov.html +++ b/coverage-report/libfdt/libfdt_env.h.gcov.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">4</td> @@ -115,22 +115,22 @@ <a name="44"><span class="lineNum"> 44 </span> : : return (FDT_FORCE fdt16_t)CPU_TO_FDT16(x);</a> <a name="45"><span class="lineNum"> 45 </span> : : }</a> <a name="46"><span class="lineNum"> 46 </span> : : </a> -<a name="47"><span class="lineNum"> 47 </span> :<span class="lineCov"> 9349 : static inline uint32_t fdt32_to_cpu(fdt32_t x)</span></a> +<a name="47"><span class="lineNum"> 47 </span> :<span class="lineCov"> 3003 : static inline uint32_t fdt32_to_cpu(fdt32_t x)</span></a> <a name="48"><span class="lineNum"> 48 </span> : : {</a> -<a name="49"><span class="lineNum"> 49 </span> :<span class="lineCov"> 9349 : return (FDT_FORCE uint32_t)CPU_TO_FDT32(x);</span></a> +<a name="49"><span class="lineNum"> 49 </span> :<span class="lineCov"> 3003 : return (FDT_FORCE uint32_t)CPU_TO_FDT32(x);</span></a> <a name="50"><span class="lineNum"> 50 </span> : : }</a> -<a name="51"><span class="lineNum"> 51 </span> :<span class="lineCov"> 19861 : static inline fdt32_t cpu_to_fdt32(uint32_t x)</span></a> +<a name="51"><span class="lineNum"> 51 </span> :<span class="lineCov"> 7245 : static inline fdt32_t cpu_to_fdt32(uint32_t x)</span></a> <a name="52"><span class="lineNum"> 52 </span> : : {</a> -<a name="53"><span class="lineNum"> 53 </span> :<span class="lineCov"> 19861 : return (FDT_FORCE fdt32_t)CPU_TO_FDT32(x);</span></a> +<a name="53"><span class="lineNum"> 53 </span> :<span class="lineCov"> 7245 : return (FDT_FORCE fdt32_t)CPU_TO_FDT32(x);</span></a> <a name="54"><span class="lineNum"> 54 </span> : : }</a> <a name="55"><span class="lineNum"> 55 </span> : : </a> <a name="56"><span class="lineNum"> 56 </span> :<span class="lineCov"> 3 : static inline uint64_t fdt64_to_cpu(fdt64_t x)</span></a> <a name="57"><span class="lineNum"> 57 </span> : : {</a> <a name="58"><span class="lineNum"> 58 </span> :<span class="lineCov"> 3 : return (FDT_FORCE uint64_t)CPU_TO_FDT64(x);</span></a> <a name="59"><span class="lineNum"> 59 </span> : : }</a> -<a name="60"><span class="lineNum"> 60 </span> :<span class="lineCov"> 116 : static inline fdt64_t cpu_to_fdt64(uint64_t x)</span></a> +<a name="60"><span class="lineNum"> 60 </span> :<span class="lineCov"> 68 : static inline fdt64_t cpu_to_fdt64(uint64_t x)</span></a> <a name="61"><span class="lineNum"> 61 </span> : : {</a> -<a name="62"><span class="lineNum"> 62 </span> :<span class="lineCov"> 116 : return (FDT_FORCE fdt64_t)CPU_TO_FDT64(x);</span></a> +<a name="62"><span class="lineNum"> 62 </span> :<span class="lineCov"> 68 : return (FDT_FORCE fdt64_t)CPU_TO_FDT64(x);</span></a> <a name="63"><span class="lineNum"> 63 </span> : : }</a> <a name="64"><span class="lineNum"> 64 </span> : : #undef CPU_TO_FDT64</a> <a name="65"><span class="lineNum"> 65 </span> : : #undef CPU_TO_FDT32</a> diff --git a/coverage-report/libfdt/libfdt_internal.h.func-sort-c.html b/coverage-report/libfdt/libfdt_internal.h.func-sort-c.html index 50dc647..60848ee 100644 --- a/coverage-report/libfdt/libfdt_internal.h.func-sort-c.html +++ b/coverage-report/libfdt/libfdt_internal.h.func-sort-c.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">3</td> @@ -82,15 +82,15 @@ </tr> <tr> <td class="coverFn"><a href="libfdt_internal.h.gcov.html#29">fdt_offset_ptr_w_</a></td> - <td class="coverFnHi">6096</td> + <td class="coverFnHi">1853</td> </tr> <tr> <td class="coverFn"><a href="libfdt_internal.h.gcov.html#24">fdt_offset_ptr_</a></td> - <td class="coverFnHi">20456</td> + <td class="coverFnHi">6752</td> </tr> <tr> <td class="coverFn"><a href="libfdt_internal.h.gcov.html#182">can_assume_</a></td> - <td class="coverFnHi">44772</td> + <td class="coverFnHi">14878</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/libfdt_internal.h.func.html b/coverage-report/libfdt/libfdt_internal.h.func.html index b89230d..e9ed5fd 100644 --- a/coverage-report/libfdt/libfdt_internal.h.func.html +++ b/coverage-report/libfdt/libfdt_internal.h.func.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">3</td> @@ -70,7 +70,7 @@ </tr> <tr> <td class="coverFn"><a href="libfdt_internal.h.gcov.html#182">can_assume_</a></td> - <td class="coverFnHi">44772</td> + <td class="coverFnHi">14878</td> </tr> <tr> <td class="coverFn"><a href="libfdt_internal.h.gcov.html#56">fdt32_ld_</a></td> @@ -86,11 +86,11 @@ </tr> <tr> <td class="coverFn"><a href="libfdt_internal.h.gcov.html#24">fdt_offset_ptr_</a></td> - <td class="coverFnHi">20456</td> + <td class="coverFnHi">6752</td> </tr> <tr> <td class="coverFn"><a href="libfdt_internal.h.gcov.html#29">fdt_offset_ptr_w_</a></td> - <td class="coverFnHi">6096</td> + <td class="coverFnHi">1853</td> </tr> </table> <br> diff --git a/coverage-report/libfdt/libfdt_internal.h.gcov.html b/coverage-report/libfdt/libfdt_internal.h.gcov.html index c994f6f..59a9e78 100644 --- a/coverage-report/libfdt/libfdt_internal.h.gcov.html +++ b/coverage-report/libfdt/libfdt_internal.h.gcov.html @@ -37,7 +37,7 @@ </tr> <tr> <td class="headerItem">Date:</td> - <td class="headerValue">2023-09-18 13:49:48</td> + <td class="headerValue">2023-10-11 21:12:14</td> <td></td> <td class="headerItem">Functions:</td> <td class="headerCovTableEntry">3</td> @@ -94,14 +94,14 @@ <a name="23"><span class="lineNum"> 23 </span> : : const char *fdt_find_string_(const char *strtab, int tabsize, const char *s);</a> <a name="24"><span class="lineNum"> 24 </span> : : int fdt_node_end_offset_(void *fdt, int nodeoffset);</a> <a name="25"><span class="lineNum"> 25 </span> : : </a> -<a name="26"><span class="lineNum"> 26 </span> :<span class="lineCov"> 20456 : static inline const void *fdt_offset_ptr_(const void *fdt, int offset)</span></a> +<a name="26"><span class="lineNum"> 26 </span> :<span class="lineCov"> 6752 : static inline const void *fdt_offset_ptr_(const void *fdt, int offset)</span></a> <a name="27"><span class="lineNum"> 27 </span> : : {</a> -<a name="28"><span class="lineNum"> 28 </span> :<span class="lineCov"> 20456 : return (const char *)fdt + fdt_off_dt_struct(fdt) + offset;</span></a> +<a name="28"><span class="lineNum"> 28 </span> :<span class="lineCov"> 6752 : return (const char *)fdt + fdt_off_dt_struct(fdt) + offset;</span></a> <a name="29"><span class="lineNum"> 29 </span> : : }</a> <a name="30"><span class="lineNum"> 30 </span> : : </a> -<a name="31"><span class="lineNum"> 31 </span> :<span class="lineCov"> 6096 : static inline void *fdt_offset_ptr_w_(void *fdt, int offset)</span></a> +<a name="31"><span class="lineNum"> 31 </span> :<span class="lineCov"> 1853 : static inline void *fdt_offset_ptr_w_(void *fdt, int offset)</span></a> <a name="32"><span class="lineNum"> 32 </span> : : {</a> -<a name="33"><span class="lineNum"> 33 </span> :<span class="lineCov"> 6096 : return (void *)(uintptr_t)fdt_offset_ptr_(fdt, offset);</span></a> +<a name="33"><span class="lineNum"> 33 </span> :<span class="lineCov"> 1853 : return (void *)(uintptr_t)fdt_offset_ptr_(fdt, offset);</span></a> <a name="34"><span class="lineNum"> 34 </span> : : }</a> <a name="35"><span class="lineNum"> 35 </span> : : </a> <a name="36"><span class="lineNum"> 36 </span> :<span class="lineNoCov"> 0 : static inline const struct fdt_reserve_entry *fdt_mem_rsv_(const void *fdt, int n)</span></a> @@ -252,9 +252,9 @@ <a name="181"><span class="lineNum"> 181 </span> : : * @mask: Mask to check (ASSUME_...)</a> <a name="182"><span class="lineNum"> 182 </span> : : * @return true if that assumption is enabled, else false</a> <a name="183"><span class="lineNum"> 183 </span> : : */</a> -<a name="184"><span class="lineNum"> 184 </span> :<span class="lineCov"> 44772 : static inline bool can_assume_(int mask)</span></a> +<a name="184"><span class="lineNum"> 184 </span> :<span class="lineCov"> 14878 : static inline bool can_assume_(int mask)</span></a> <a name="185"><span class="lineNum"> 185 </span> : : {</a> -<a name="186"><span class="lineNum"> 186 </span> :<span class="lineCov"> 44772 : return FDT_ASSUME_MASK & mask;</span></a> +<a name="186"><span class="lineNum"> 186 </span> :<span class="lineCov"> 14878 : return FDT_ASSUME_MASK & mask;</span></a> <a name="187"><span class="lineNum"> 187 </span> : : }</a> <a name="188"><span class="lineNum"> 188 </span> : : </a> <a name="189"><span class="lineNum"> 189 </span> : : /** helper macros for checking assumptions */</a> |