d966f08fcd
With -Wsign-compare, compilers warn about a mismatching signedness in comparisons in various files in the tests/ directory. For about half of the cases we can simply change the signed variable to be of an unsigned type, because they will never need to store negative values (which is the best fix of the problem). In the remaining cases we can cast the signed variable to an unsigned type, provided we know for sure it is not negative. We see two different scenarios here: - We either just explicitly checked for this variable to be positive (if (rc < 0) FAIL();), or - We rely on a function returning only positive values in the "length" pointer if the function returned successfully: which we just checked. At two occassions we compare with a constant "-1" (even though the variable is unsigned), so we just change this to ~0U to create an unsigned comparison value. Since this is about the tests, let's also add explicit tests for those values really not being negative. This fixes "make tests" (but not "make check" yet), when compiled with -Wsign-compare. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Message-Id: <20210618172030.9684-2-andre.przywara@arm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
93 lines
2.1 KiB
C
93 lines
2.1 KiB
C
// SPDX-License-Identifier: LGPL-2.1-or-later
|
|
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Testcase/tool for rearranging blocks of a dtb
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <limits.h>
|
|
#include <stdint.h>
|
|
|
|
#include <libfdt.h>
|
|
|
|
#include "tests.h"
|
|
#include "testdata.h"
|
|
|
|
static int nopulate_struct(char *buf, const char *fdt)
|
|
{
|
|
int offset, nextoffset = 0;
|
|
uint32_t tag;
|
|
char *p;
|
|
|
|
p = buf;
|
|
|
|
do {
|
|
offset = nextoffset;
|
|
tag = fdt_next_tag(fdt, offset, &nextoffset);
|
|
|
|
memcpy(p, (const char *)fdt + fdt_off_dt_struct(fdt) + offset,
|
|
nextoffset - offset);
|
|
p += nextoffset - offset;
|
|
|
|
*((fdt32_t *)p) = cpu_to_fdt32(FDT_NOP);
|
|
p += FDT_TAGSIZE;
|
|
|
|
} while (tag != FDT_END);
|
|
|
|
return p - buf;
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
char *fdt, *fdt2, *buf;
|
|
int newsize, struct_end_old, struct_end_new, delta;
|
|
unsigned int struct_start;
|
|
const char *inname;
|
|
char outname[PATH_MAX];
|
|
|
|
test_init(argc, argv);
|
|
if (argc != 2)
|
|
CONFIG("Usage: %s <dtb file>", argv[0]);
|
|
|
|
inname = argv[1];
|
|
fdt = load_blob(argv[1]);
|
|
sprintf(outname, "noppy.%s", inname);
|
|
|
|
if (fdt_version(fdt) < 17)
|
|
FAIL("Can't deal with version <17");
|
|
|
|
buf = xmalloc(2 * fdt_size_dt_struct(fdt));
|
|
|
|
newsize = nopulate_struct(buf, fdt);
|
|
|
|
verbose_printf("Nopulated structure block has new size %d\n", newsize);
|
|
|
|
/* Replace old strcutre block with the new */
|
|
|
|
fdt2 = xmalloc(fdt_totalsize(fdt) + newsize);
|
|
|
|
struct_start = fdt_off_dt_struct(fdt);
|
|
delta = newsize - fdt_size_dt_struct(fdt);
|
|
struct_end_old = struct_start + fdt_size_dt_struct(fdt);
|
|
struct_end_new = struct_start + newsize;
|
|
|
|
memcpy(fdt2, fdt, struct_start);
|
|
memcpy(fdt2 + struct_start, buf, newsize);
|
|
memcpy(fdt2 + struct_end_new, fdt + struct_end_old,
|
|
fdt_totalsize(fdt) - struct_end_old);
|
|
|
|
fdt_set_totalsize(fdt2, fdt_totalsize(fdt) + delta);
|
|
fdt_set_size_dt_struct(fdt2, newsize);
|
|
|
|
if (fdt_off_mem_rsvmap(fdt) > struct_start)
|
|
fdt_set_off_mem_rsvmap(fdt2, fdt_off_mem_rsvmap(fdt) + delta);
|
|
if (fdt_off_dt_strings(fdt) > struct_start)
|
|
fdt_set_off_dt_strings(fdt2, fdt_off_dt_strings(fdt) + delta);
|
|
|
|
save_blob(outname, fdt2);
|
|
|
|
PASS();
|
|
}
|