From 798b3d7ba41567bf4f1f8671448d85f59062d9ea Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 8 Jul 2020 13:17:48 +1000 Subject: [PATCH] memtest: Fix integer size/type printf errors In a couple of places, memtest uses %x to print a pointer which is illegal (and could be problematic on 64-bit). Use %p instead. Additionally, use %ld when printing longs Signed-off-by: Benjamin Herrenschmidt --- litex/soc/software/libbase/memtest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/litex/soc/software/libbase/memtest.c b/litex/soc/software/libbase/memtest.c index 9ab59f90..df528d55 100644 --- a/litex/soc/software/libbase/memtest.c +++ b/litex/soc/software/libbase/memtest.c @@ -172,7 +172,7 @@ void memspeed(unsigned int *addr, unsigned long size, bool read_only) __attribute__((unused)) unsigned long data; const unsigned int sz = sizeof(unsigned long); - printf("Memspeed at 0x%08x...\n", addr); + printf("Memspeed at 0x%p...\n", addr); /* init timer */ timer0_en_write(0); @@ -221,16 +221,16 @@ int memtest(unsigned int *addr, unsigned long maxsize) unsigned long addr_size = MEMTEST_ADDR_SIZE < maxsize ? MEMTEST_ADDR_SIZE : maxsize; unsigned long data_size = MEMTEST_DATA_SIZE < maxsize ? MEMTEST_DATA_SIZE : maxsize; - printf("Memtest at 0x%08x...\n", addr); + printf("Memtest at 0x%p...\n", addr); bus_errors = memtest_bus(addr, bus_size); addr_errors = memtest_addr(addr, addr_size, MEMTEST_ADDR_RANDOM); data_errors = memtest_data(addr, data_size, MEMTEST_DATA_RANDOM); if(bus_errors + addr_errors + data_errors != 0) { - printf("- bus errors: %d/%d\n", bus_errors, 2*bus_size/4); - printf("- addr errors: %d/%d\n", addr_errors, addr_size/4); - printf("- data errors: %d/%d\n", data_errors, data_size/4); + printf("- bus errors: %d/%ld\n", bus_errors, 2*bus_size/4); + printf("- addr errors: %d/%ld\n", addr_errors, addr_size/4); + printf("- data errors: %d/%ld\n", data_errors, data_size/4); printf("Memtest KO\n"); return 0; } -- 2.30.2