From 6c9f0176a916cdbe88e04417e7aa1405d80c500f Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sat, 2 Feb 2019 15:09:53 +1100 Subject: libdl: Add powerpc large memory and small data support. - Add support for architecure sections that can be handled by the architecture back end. - Add trampoline/fixup support for PowerPC. This means the PowerPC now supports large memory loading of applications. - Add a bit allocator to manage small block based regions of memory. - Add small data (sdata/sbss) support for the PowerPC. The support makes the linker allocated small data region of memory a global resource available to libdl loaded object files. Updates #3687 Updates #3685 --- testsuites/libtests/Makefile.am | 7 +- testsuites/libtests/dl01/dl-load.c | 1 + testsuites/libtests/dl02/dl-load.c | 16 +- testsuites/libtests/dl02/dl-o1.c | 10 +- testsuites/libtests/dl02/dl-o2.c | 10 +- testsuites/libtests/dl03/dl-bit-alloc.c | 262 +++++++++++++++++++++ testsuites/libtests/dl03/dl-bit-alloc.h | 14 ++ testsuites/libtests/dl03/init.c | 4 + testsuites/libtests/dl05/dl-load.c | 22 +- testsuites/libtests/dl07/dl-load.c | 27 ++- testsuites/libtests/dl07/dl-o1.c | 16 +- testsuites/libtests/dl07/dl-o2.c | 26 +- testsuites/libtests/dl07/dl-o3.c | 48 ++-- testsuites/libtests/dl07/dl-o4.c | 28 +-- testsuites/libtests/dl07/dl-o5.c | 26 +- testsuites/libtests/dl07/init.c | 2 +- testsuites/libtests/dl08/dl-o1.c | 16 +- testsuites/libtests/dl08/dl-o2.c | 10 +- testsuites/libtests/dl08/dl-o3.c | 22 +- testsuites/libtests/dl08/dl-o4.c | 12 +- testsuites/libtests/dl08/dl-o5.c | 10 +- .../libtests/dl08/dl-o6-123456789-123456789.c | 10 +- testsuites/libtests/dl09/dl-load.c | 4 +- testsuites/libtests/dl09/dl-o1.c | 19 +- testsuites/libtests/dl09/dl-o2.c | 15 +- testsuites/libtests/dl09/dl-o3.c | 25 +- testsuites/libtests/dl09/dl-o4.c | 21 +- testsuites/libtests/dl09/dl-o5.c | 13 +- 28 files changed, 519 insertions(+), 177 deletions(-) create mode 100644 testsuites/libtests/dl03/dl-bit-alloc.c create mode 100644 testsuites/libtests/dl03/dl-bit-alloc.h (limited to 'testsuites') diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am index 166f45e21b..789380ce72 100644 --- a/testsuites/libtests/Makefile.am +++ b/testsuites/libtests/Makefile.am @@ -390,8 +390,9 @@ if TEST_dl03 lib_tests += dl03 lib_screens += dl03/dl03.scn lib_docs += dl03/dl03.doc -dl03_SOURCES = dl03/init.c dl03/dl-cache.c -dl03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dl03) $(support_includes) +dl03_SOURCES = dl03/init.c dl03/dl-cache.c dl03/dl-bit-alloc.c +dl03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dl03) $(support_includes) \ + -I$(top_srcdir)/../../cpukit/libdl endif endif @@ -533,7 +534,7 @@ dl07-o3.o: dl07/dl-o3.c Makefile dl07-o4.o: dl07/dl-o4.c Makefile $(AM_V_CC)$(COMPILE) -c -o $@ $< dl07-o5.o: dl07/dl-o5.c Makefile - $(AM_V_CC)$(COMPILE) -c -o $@ $< + $(AM_V_CC) $(COMPILE) -c -o $@ $< dl07.tar: dl07-o1.o dl07-o2.o dl07-o3.o dl07-o4.o dl07-o5.o @rm -f $@ $(AM_V_GEN)$(PAX) -w -f $@ $+ diff --git a/testsuites/libtests/dl01/dl-load.c b/testsuites/libtests/dl01/dl-load.c index d93550d15b..f807d2a060 100644 --- a/testsuites/libtests/dl01/dl-load.c +++ b/testsuites/libtests/dl01/dl-load.c @@ -26,6 +26,7 @@ RTEMS_RTL_TRACE_ALLOCATOR | \ RTEMS_RTL_TRACE_UNRESOLVED | \ RTEMS_RTL_TRACE_ARCHIVES | \ + RTEMS_RTL_TRACE_GLOBAL_SYM | \ RTEMS_RTL_TRACE_DEPENDENCY) #define DL_DEBUG_TRACE DEBUG_TRACE /* RTEMS_RTL_TRACE_ALL */ #define DL_RTL_CMDS 1 diff --git a/testsuites/libtests/dl02/dl-load.c b/testsuites/libtests/dl02/dl-load.c index 0fa897d5a0..2e76c2dea6 100644 --- a/testsuites/libtests/dl02/dl-load.c +++ b/testsuites/libtests/dl02/dl-load.c @@ -15,8 +15,14 @@ #include #include -#define DL02_DEBUG_TRACE 0 /* RTEMS_RTL_TRACE_ALL */ -#define DL02_RTL_CMDS 0 +#define TEST_TRACE 0 +#if TEST_TRACE + #define DL_DEBUG_TRACE (RTEMS_RTL_TRACE_ALL & ~RTEMS_RTL_TRACE_ALLOCATOR) + #define DL_RTL_CMDS 1 +#else + #define DL_DEBUG_TRACE 0 + #define DL_RTL_CMDS 0 +#endif typedef int (*call_t)(int argc, const char* argv[]); @@ -55,8 +61,8 @@ int dl_load_test(void) int call_ret; int ret; -#if DL02_DEBUG_TRACE - rtems_rtl_trace_set_mask (DL02_DEBUG_TRACE); +#if DL_DEBUG_TRACE + rtems_rtl_trace_set_mask (DL_DEBUG_TRACE); #endif o1 = dl_load_obj("/dl02-o1.o"); @@ -66,7 +72,7 @@ int dl_load_test(void) if (!o1) return 1; -#if DL02_RTL_CMDS +#if DL_RTL_CMDS { char* list[] = { "rtl", "list", NULL }; rtems_rtl_shell_command (2, list); diff --git a/testsuites/libtests/dl02/dl-o1.c b/testsuites/libtests/dl02/dl-o1.c index a4355d6e37..2afb618800 100644 --- a/testsuites/libtests/dl02/dl-o1.c +++ b/testsuites/libtests/dl02/dl-o1.c @@ -36,9 +36,12 @@ static int dl_o1_callback(const char* message, int count) */ int rtems_main (int argc, const char* argv[]); +#define PDOUBLE(_d) ((int) (_d)), (int) ((_d) * 100.0) % 100 + int rtems_main (int argc, const char* argv[]) { func1_t f1; + double f2_ret; int arg; int ret; @@ -56,9 +59,12 @@ int rtems_main (int argc, const char* argv[]) return 0; } - if (dl_o2_func2 (7.1, 33.0) != (7.1 * 33.0)) + f2_ret = dl_o2_func2 (7.1, 33.0); + printf("rtems_main: dl_o2_func2 returned: %d.%02d\n", + PDOUBLE(f2_ret)); + if (f2_ret != (7.1 * 33.0)) { - printf("rtems_main: dl_o2_func1 returned bad value\n"); + printf("rtems_main: dl_o2_func2 returned a bad\n"); return 0; } diff --git a/testsuites/libtests/dl02/dl-o2.c b/testsuites/libtests/dl02/dl-o2.c index 4c1a918dea..507333535b 100644 --- a/testsuites/libtests/dl02/dl-o2.c +++ b/testsuites/libtests/dl02/dl-o2.c @@ -10,7 +10,7 @@ #include -#define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__); +#define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__) int dl_o2_func1 (int argc, char* argv[]) { @@ -21,13 +21,17 @@ int dl_o2_func1 (int argc, char* argv[]) return argc; } +#define PDOUBLE(_d) ((int) (_d)), (int) (((_d) + 0.005) * 100.0) % 100 + double dl_o2_func2 (double d1, double d2) { - return d1 * d2; + double ret = d1 * d2; + printf("dl_o2_func2: d1=%d.%02d d2=%d.%d ret=%d.%02d\n", + PDOUBLE(d1), PDOUBLE(d2), PDOUBLE(ret)); + return ret; } int dl_o2_func3 (dl_o2_call_t callback, int count) { return callback ("string in dl_o2", count + 1); } - diff --git a/testsuites/libtests/dl03/dl-bit-alloc.c b/testsuites/libtests/dl03/dl-bit-alloc.c new file mode 100644 index 0000000000..210f826f03 --- /dev/null +++ b/testsuites/libtests/dl03/dl-bit-alloc.c @@ -0,0 +1,262 @@ +/* + * Copyright (c) 2016, 2018 Chris Johns . All rights reserved. + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +#include "tmacros.h" + +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include "dl-bit-alloc.h" + +#include "rtl-bit-alloc.h" + +#define NUM(m) (sizeof(m) / sizeof(m[0])) + +typedef struct +{ + size_t size; + const uint32_t* map; + size_t map_size; +} alloc_check; + +const uint32_t map_1[] = { + 0x0000003f, + 0x00000000, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_1[] = { + 0xffffffff, + 0x00000000, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_2[] = { + 0xffffffff, + 0x00000001, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_3[] = { + 0xffffffff, + 0x00000007, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_4[] = { + 0xffffffff, + 0x00000fff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_5[] = { + 0xffffffff, + 0x00001fff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_6[] = { + 0xffffffff, + 0x00007fff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_7[] = { + 0xffffffff, + 0x0007ffff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_a_8[] = { + 0xffffffff, + 0x07ffffff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_b_1[] = { + 0xffffffff, + 0x07ffffff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_b_2[] = { + 0xffffffff, + 0x07ffffff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_b_3[] = { + 0xffffffff, + 0x07ffffff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_b_4[] = { + 0xffffffff, + 0x07ffffff, + 0x00000000, + 0x00000000 +}; + +const uint32_t map_free_1[] = { + 0xffffffff, + 0x07ffffff, + 0x00000000, + 0x00000000 +}; + +alloc_check a_allocs[] = { + { 26 * sizeof(uint32_t), map_a_1, NUM(map_a_1) }, + { 4, map_a_2, NUM(map_a_2) }, + { 8, map_a_3, NUM(map_a_3) }, + { 34, map_a_4, NUM(map_a_4) }, + { 4, map_a_5, NUM(map_a_5) }, + { 8, map_a_6, NUM(map_a_6) }, + { 16, map_a_7, NUM(map_a_7) }, + { 32, map_a_8, NUM(map_a_8) } +}; + +alloc_check b_allocs[] = { + { 24, map_b_1, NUM(map_b_1) }, + { 30, map_b_2, NUM(map_b_2) }, + { 8, map_b_3, NUM(map_b_3) }, + { 4, map_b_4, NUM(map_b_4) } +}; + +static bool check_bit_map(rtems_rtl_bit_alloc* balloc, + const uint32_t* map, + size_t size) +{ + size_t i; + rtems_print_buffer ((const unsigned char *) balloc->bits, size * sizeof(uint32_t)); + for (i = 0; i < size; ++i) + { + if (balloc->bits[i] != map[i]) + { + printf("bit-map mismatch: %zu: %08" PRIx32 "\n", i, map[i]); + return false; + } + } + return true; +} + +static void delta_bit_map(rtems_rtl_bit_alloc* balloc, uint32_t* last, size_t size) +{ + size_t i; + for (i = 0; i < size; ++i) + last[i] = last[i] ^ balloc->bits[i]; + printf("Delta:\n"); + rtems_print_buffer ((const unsigned char *) last, size * sizeof(uint32_t)); + memcpy(last, balloc->bits, size * sizeof(uint32_t)); +} + +static void dl_init_rtl(void) +{ + /* + * Check the RTL object is created and can be locked and unlocked. + */ + rtems_test_assert(rtems_rtl_lock () != NULL); + rtems_rtl_unlock (); + rtems_test_assert(rtems_rtl_data_unprotected () != NULL); + rtems_rtl_trace_set_mask(RTEMS_RTL_TRACE_ALL | RTEMS_RTL_TRACE_CACHE); +} + +int dl_bit_alloc_test(void) +{ + rtems_rtl_bit_alloc* balloc; + void* a[NUM(a_allocs)]; + void* b[NUM(b_allocs)]; + uint32_t last_map[4] = { 0 }; + size_t i; + + /* + * Make sure the RTL can initialise. + */ + dl_init_rtl(); + + printf("bit-alloc: open\n"); + balloc = rtems_rtl_bit_alloc_open(NULL, 64 * 1024, sizeof(uint32_t), 21); + rtems_test_assert(balloc != NULL); + + rtems_test_assert(check_bit_map(balloc, map_1, NUM(map_1))); + + for (i = 0; i < NUM(a_allocs); ++i) + { + printf("balloc: %zu\n", a_allocs[i].size); + a[i] = rtems_rtl_bit_alloc_balloc(balloc, a_allocs[i].size); + rtems_test_assert(a[i] != NULL); + printf("balloc: a[%zu] %zu %p\n", i, a_allocs[i].size, a[i]); + rtems_test_assert(check_bit_map(balloc, a_allocs[i].map, a_allocs[i].map_size)); + delta_bit_map(balloc, last_map, NUM(last_map)); + } + + printf("bfree: %p %zu\n", a[3], a_allocs[3].size); + rtems_rtl_bit_alloc_bfree(balloc, a[3], a_allocs[3].size); + delta_bit_map(balloc, last_map, NUM(last_map)); + a[3] = NULL; + + for (i = 0; i < NUM(b_allocs); ++i) + { + printf("balloc: %zu\n", b_allocs[i].size); + b[i] = rtems_rtl_bit_alloc_balloc(balloc, b_allocs[i].size); + rtems_test_assert(b[i] != NULL); + printf("balloc: b[%zu] %zu %p\n", i, b_allocs[i].size, b[i]); + rtems_print_buffer ((const unsigned char *) balloc->bits, 8 * sizeof(uint32_t)); + delta_bit_map(balloc, last_map, NUM(last_map)); + } + + for (i = 0; i < NUM(a_allocs); ++i) + { + if (a[i] != NULL) + { + printf("bfree: a[%zu] %p %zu\n", i, a[i], a_allocs[i].size); + rtems_rtl_bit_alloc_bfree(balloc, a[i], a_allocs[i].size); + rtems_print_buffer ((const unsigned char *) balloc->bits, 8 * sizeof(uint32_t)); + delta_bit_map(balloc, last_map, NUM(last_map)); + } + } + + for (i = 0; i < NUM(b_allocs); ++i) + { + if (b[i] != NULL) + { + printf("bfree: b[%zu] %p %zu\n", i, b[i], b_allocs[i].size); + rtems_rtl_bit_alloc_bfree(balloc, b[i], b_allocs[i].size); + rtems_print_buffer ((const unsigned char *) balloc->bits, 8 * sizeof(uint32_t)); + } + } + + printf("bit-alloc: close\n"); + rtems_rtl_bit_alloc_close(balloc); + + return 0; +} diff --git a/testsuites/libtests/dl03/dl-bit-alloc.h b/testsuites/libtests/dl03/dl-bit-alloc.h new file mode 100644 index 0000000000..5795570397 --- /dev/null +++ b/testsuites/libtests/dl03/dl-bit-alloc.h @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2018 Chris Johns . All rights reserved. + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#if !defined(_DL_BIT_ALLOC_H_) +#define _DL_BIT_ALLOC_H_ + +int dl_bit_alloc_test(void); + +#endif diff --git a/testsuites/libtests/dl03/init.c b/testsuites/libtests/dl03/init.c index 618f29ac2f..6d83762413 100644 --- a/testsuites/libtests/dl03/init.c +++ b/testsuites/libtests/dl03/init.c @@ -18,6 +18,7 @@ #include #include "dl-cache.h" +#include "dl-bit-alloc.h" const char rtems_test_name[] = "libdl (RTL) 3"; @@ -28,6 +29,9 @@ static int test(void) { int ret; ret = dl_cache_test(); + if (ret) + rtems_test_exit(ret); + ret = dl_bit_alloc_test(); if (ret) rtems_test_exit(ret); return 0; diff --git a/testsuites/libtests/dl05/dl-load.c b/testsuites/libtests/dl05/dl-load.c index 5ef64577cc..58704c4d14 100644 --- a/testsuites/libtests/dl05/dl-load.c +++ b/testsuites/libtests/dl05/dl-load.c @@ -20,6 +20,24 @@ #include "dl-load.h" +#define TEST_TRACE 0 +#if TEST_TRACE + #define DEBUG_TRACE (RTEMS_RTL_TRACE_DETAIL | \ + RTEMS_RTL_TRACE_WARNING | \ + RTEMS_RTL_TRACE_LOAD | \ + RTEMS_RTL_TRACE_UNLOAD | \ + RTEMS_RTL_TRACE_SYMBOL | \ + RTEMS_RTL_TRACE_RELOC | \ + RTEMS_RTL_TRACE_ALLOCATOR | \ + RTEMS_RTL_TRACE_UNRESOLVED | \ + RTEMS_RTL_TRACE_ARCHIVES | \ + RTEMS_RTL_TRACE_GLOBAL_SYM | \ + RTEMS_RTL_TRACE_DEPENDENCY) + #define DL_DEBUG_TRACE DEBUG_TRACE /* RTEMS_RTL_TRACE_ALL */ +#else + #define DL_DEBUG_TRACE 0 +#endif + int dl_load_test(void) { void* handle; @@ -34,7 +52,9 @@ int dl_load_test(void) bool throw_runtime = true; #endif - rtems_rtl_trace_set_mask(RTEMS_RTL_TRACE_ALL); +#if DL_DEBUG_TRACE + rtems_rtl_trace_set_mask (DL_DEBUG_TRACE); +#endif handle = dlopen("/dl05-o5.o", RTLD_GLOBAL | RTLD_NOW); if (handle == NULL) diff --git a/testsuites/libtests/dl07/dl-load.c b/testsuites/libtests/dl07/dl-load.c index b0f8bd9dac..b92a745f42 100644 --- a/testsuites/libtests/dl07/dl-load.c +++ b/testsuites/libtests/dl07/dl-load.c @@ -7,8 +7,25 @@ * http://www.rtems.org/license/LICENSE. */ -#define DL07_DEBUG_TRACE 0 /* RTEMS_RTL_TRACE_ALL */ -#define DL07_RTL_CMDS 0 +#define TEST_TRACE 0 +#if TEST_TRACE + #define DEBUG_TRACE (RTEMS_RTL_TRACE_DETAIL | \ + RTEMS_RTL_TRACE_WARNING | \ + RTEMS_RTL_TRACE_LOAD | \ + RTEMS_RTL_TRACE_UNLOAD | \ + RTEMS_RTL_TRACE_SYMBOL | \ + RTEMS_RTL_TRACE_RELOC | \ + RTEMS_RTL_TRACE_ALLOCATOR | \ + RTEMS_RTL_TRACE_UNRESOLVED | \ + RTEMS_RTL_TRACE_ARCHIVES | \ + RTEMS_RTL_TRACE_GLOBAL_SYM | \ + RTEMS_RTL_TRACE_DEPENDENCY) + #define DL_DEBUG_TRACE DEBUG_TRACE /* RTEMS_RTL_TRACE_ALL */ + #define DL_RTL_CMDS 1 +#else + #define DL_DEBUG_TRACE 0 + #define DL_RTL_CMDS 0 +#endif #include @@ -23,7 +40,7 @@ typedef int (*call_sig)(void); static void dl_load_dump (void) { -#if DL07_RTL_CMDS +#if DL_RTL_CMDS char* list[] = { "rtl", "list", NULL }; char* sym[] = { "rtl", "sym", NULL }; printf ("RTL List:\n"); @@ -107,8 +124,8 @@ int dl_load_test(void) printf ("Test source (link in strstr): %s\n", dl_localise_file (__FILE__)); -#if DL07_DEBUG_TRACE - rtems_rtl_trace_set_mask (DL07_DEBUG_TRACE); +#if DL_DEBUG_TRACE + rtems_rtl_trace_set_mask (DL_DEBUG_TRACE); #endif o1 = dl_load_obj("/dl07-o1.o", false); diff --git a/testsuites/libtests/dl07/dl-o1.c b/testsuites/libtests/dl07/dl-o1.c index af5ad1bd17..e3a9cec6cf 100644 --- a/testsuites/libtests/dl07/dl-o1.c +++ b/testsuites/libtests/dl07/dl-o1.c @@ -43,14 +43,14 @@ int rtems_main_o1 (void); int rtems_main_o1 (void) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl01_bss1: %4u: %p: %d\n", PAINT_VAR (dl01_bss1)); - printf (DL_NAME ": dl01_bss2: %4u: %p: %f\n", PAINT_VAR (dl01_bss2[0])); - printf (DL_NAME ": dl01_bss3: %4u: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); - printf (DL_NAME ": dl01_data1: %4u: %p: %d\n", PAINT_VAR (dl01_data1)); + printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1)); + printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0])); + printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); + printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl01_data2: %4u: %p: %f\n", PAINT_VAR (dl01_data2)); - printf (DL_NAME ": dl01_const1: %4u: %p: %d\n", PAINT_VAR (dl01_const1)); - printf (DL_NAME ": dl01_const2: %4u: %p: %f\n", PAINT_VAR (dl01_const2)); - printf (DL_NAME ": dl01_func1: %4u: %p\n", sizeof(dl01_func1), &dl01_func1); + printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2)); + printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1)); + printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2)); + printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1); return 0; } diff --git a/testsuites/libtests/dl07/dl-o2.c b/testsuites/libtests/dl07/dl-o2.c index 423f05a16a..bbb493ef21 100644 --- a/testsuites/libtests/dl07/dl-o2.c +++ b/testsuites/libtests/dl07/dl-o2.c @@ -32,20 +32,20 @@ int rtems_main_o2 (int argc, const char* argv[]); int rtems_main_o2 (int argc, const char* argv[]) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl01_bss1: %4u: %p: %d\n", PAINT_VAR (dl01_bss1)); - printf (DL_NAME ": dl01_bss2: %4u: %p: %f\n", PAINT_VAR (dl01_bss2[0])); - printf (DL_NAME ": dl01_bss3: %4u: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); - printf (DL_NAME ": dl01_data1: %4u: %p: %d\n", PAINT_VAR (dl01_data1)); + printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1)); + printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0])); + printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); + printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl01_data2: %4u: %p: %f\n", PAINT_VAR (dl01_data2)); - printf (DL_NAME ": dl01_const1: %4u: %p: %d\n", PAINT_VAR (dl01_const1)); - printf (DL_NAME ": dl01_const2: %4u: %p: %f\n", PAINT_VAR (dl01_const2)); - printf (DL_NAME ": dl01_func1: %4u: %p\n", sizeof(dl01_func1), &dl01_func1); - printf (DL_NAME ": dl02_bss1: %4u: %p: %d\n", PAINT_VAR (dl02_bss1)); - printf (DL_NAME ": dl02_bss2: %4u: %p: %f\n", PAINT_VAR (dl02_bss2[0])); - printf (DL_NAME ": dl02_bss3: %4u: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); - printf (DL_NAME ": dl02_data1: %4u: %p: %d\n", PAINT_VAR (dl02_data1)); + printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2)); + printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1)); + printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2)); + printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1); + printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1)); + printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0])); + printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); + printf (DL_NAME ": dl02_data1: %4zu: %p: %d\n", PAINT_VAR (dl02_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl02_data2: %4u: %p: %f\n", PAINT_VAR (dl02_data2)); + printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2)); return 0; } diff --git a/testsuites/libtests/dl07/dl-o3.c b/testsuites/libtests/dl07/dl-o3.c index 573e3df1a0..c499f6cab7 100644 --- a/testsuites/libtests/dl07/dl-o3.c +++ b/testsuites/libtests/dl07/dl-o3.c @@ -29,31 +29,31 @@ int rtems_main_o3 (int argc, const char* argv[]); int rtems_main_o3 (int argc, const char* argv[]) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl01_bss1: %4u: %p: %d\n", PAINT_VAR (dl01_bss1)); - printf (DL_NAME ": dl01_bss2: %4u: %p: %f\n", PAINT_VAR (dl01_bss2[0])); - printf (DL_NAME ": dl01_bss3: %4u: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); - printf (DL_NAME ": dl01_data1: %4u: %p: %d\n", PAINT_VAR (dl01_data1)); + printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1)); + printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0])); + printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); + printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl01_data2: %4u: %p: %f\n", PAINT_VAR (dl01_data2)); - printf (DL_NAME ": dl01_const1: %4u: %p: %d\n", PAINT_VAR (dl01_const1)); - printf (DL_NAME ": dl01_const2: %4u: %p: %f\n", PAINT_VAR (dl01_const2)); - printf (DL_NAME ": dl01_func1: %4u: %p\n", sizeof(dl01_func1), &dl01_func1); - printf (DL_NAME ": dl02_bss1: %4u: %p: %d\n", PAINT_VAR (dl02_bss1)); - printf (DL_NAME ": dl02_bss2: %4u: %p: %f\n", PAINT_VAR (dl02_bss2[0])); - printf (DL_NAME ": dl02_bss3: %4u: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); - printf (DL_NAME ": dl02_data1: %4u: %p: %d\n", PAINT_VAR (dl02_data1)); + printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2)); + printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1)); + printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2)); + printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1); + printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1)); + printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0])); + printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); + printf (DL_NAME ": dl02_data1: %4zu: %p: %d\n", PAINT_VAR (dl02_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl02_data2: %4u: %p: %f\n", PAINT_VAR (dl02_data2)); - printf (DL_NAME ": dl04_unresolv_1: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); - printf (DL_NAME ": dl04_unresolv_2: %4u: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); - printf (DL_NAME ": dl04_unresolv_3: %4u: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); - printf (DL_NAME ": dl04_unresolv_4: %4u: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); - printf (DL_NAME ": dl04_unresolv_5: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); - printf (DL_NAME ": dl04_unresolv_6: %4u: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); - printf (DL_NAME ": dl05_unresolv_1: %4u: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); - printf (DL_NAME ": dl05_unresolv_2: %4u: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); - printf (DL_NAME ": dl05_unresolv_3: %4u: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); - printf (DL_NAME ": dl05_unresolv_4: %4u: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); - printf (DL_NAME ": dl05_unresolv_5: %4u: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); + printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2)); + printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); + printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); + printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); + printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); + printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); + printf (DL_NAME ": dl04_unresolv_6: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); + printf (DL_NAME ": dl05_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); + printf (DL_NAME ": dl05_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); + printf (DL_NAME ": dl05_unresolv_3: %4zu: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); + printf (DL_NAME ": dl05_unresolv_4: %4zu: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); + printf (DL_NAME ": dl05_unresolv_5: %4zu: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); return 0; } diff --git a/testsuites/libtests/dl07/dl-o4.c b/testsuites/libtests/dl07/dl-o4.c index a3cb1fb6c5..c9028ae808 100644 --- a/testsuites/libtests/dl07/dl-o4.c +++ b/testsuites/libtests/dl07/dl-o4.c @@ -34,20 +34,20 @@ int rtems_main_o4 (int argc, const char* argv[]); int rtems_main_o4 (int argc, const char* argv[]) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl01_bss1: %4u: %p: %d\n", PAINT_VAR (dl01_bss1)); - printf (DL_NAME ": dl01_bss2: %4u: %p: %f\n", PAINT_VAR (dl01_bss2[0])); - printf (DL_NAME ": dl01_bss3: %4u: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); - printf (DL_NAME ": dl01_data1: %4u: %p: %d\n", PAINT_VAR (dl01_data1)); + printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1)); + printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0])); + printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); + printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl01_data2: %4u: %p: %f\n", PAINT_VAR (dl01_data2)); - printf (DL_NAME ": dl01_const1: %4u: %p: %d\n", PAINT_VAR (dl01_const1)); - printf (DL_NAME ": dl01_const2: %4u: %p: %f\n", PAINT_VAR (dl01_const2)); - printf (DL_NAME ": dl01_func1: %4u: %p\n", sizeof(dl01_func1), &dl01_func1); - printf (DL_NAME ": dl04_unresolv_1: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); - printf (DL_NAME ": dl04_unresolv_2: %4u: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); - printf (DL_NAME ": dl04_unresolv_3: %4u: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); - printf (DL_NAME ": dl04_unresolv_4: %4u: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); - printf (DL_NAME ": dl04_unresolv_5: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); - printf (DL_NAME ": dl04_unresolv_6: %4u: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); + printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2)); + printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1)); + printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2)); + printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1); + printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); + printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); + printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); + printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); + printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); + printf (DL_NAME ": dl04_unresolv_6: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); return 0; } diff --git a/testsuites/libtests/dl07/dl-o5.c b/testsuites/libtests/dl07/dl-o5.c index 49502b3247..fc56fd31a2 100644 --- a/testsuites/libtests/dl07/dl-o5.c +++ b/testsuites/libtests/dl07/dl-o5.c @@ -34,19 +34,19 @@ int rtems_main_o5 (int argc, const char* argv[]); int rtems_main_o5 (int argc, const char* argv[]) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl01_bss1: %4u: %p: %d\n", PAINT_VAR (dl01_bss1)); - printf (DL_NAME ": dl01_bss2: %4u: %p: %f\n", PAINT_VAR (dl01_bss2[0])); - printf (DL_NAME ": dl01_bss3: %4u: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); - printf (DL_NAME ": dl01_data1: %4u: %p: %d\n", PAINT_VAR (dl01_data1)); + printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1)); + printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0])); + printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); + printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl01_data2: %4u: %p: %f\n", PAINT_VAR (dl01_data2)); - printf (DL_NAME ": dl01_const1: %4u: %p: %d\n", PAINT_VAR (dl01_const1)); - printf (DL_NAME ": dl01_const2: %4u: %p: %f\n", PAINT_VAR (dl01_const2)); - printf (DL_NAME ": dl01_func1: %4u: %p\n", sizeof(dl01_func1), &dl01_func1); - printf (DL_NAME ": dl05_unresolv_1: %4u: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); - printf (DL_NAME ": dl05_unresolv_2: %4u: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); - printf (DL_NAME ": dl05_unresolv_3: %4u: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); - printf (DL_NAME ": dl05_unresolv_4: %4u: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); - printf (DL_NAME ": dl05_unresolv_5: %4u: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); + printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2)); + printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1)); + printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2)); + printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1); + printf (DL_NAME ": dl05_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); + printf (DL_NAME ": dl05_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); + printf (DL_NAME ": dl05_unresolv_3: %4zu: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); + printf (DL_NAME ": dl05_unresolv_4: %4zu: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); + printf (DL_NAME ": dl05_unresolv_5: %4zu: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); return 0; } diff --git a/testsuites/libtests/dl07/init.c b/testsuites/libtests/dl07/init.c index 7c482c4944..e398b58b63 100644 --- a/testsuites/libtests/dl07/init.c +++ b/testsuites/libtests/dl07/init.c @@ -56,7 +56,7 @@ static void Init(rtems_task_argument arg) exit (1); } - for (i = 0; i < 100; ++i) + for (i = 0; i < 1; ++i) { printf ("--------------------------------------------------\n"); printf (" Run: %d\n", i); diff --git a/testsuites/libtests/dl08/dl-o1.c b/testsuites/libtests/dl08/dl-o1.c index 22b839a438..e6173f3a78 100644 --- a/testsuites/libtests/dl08/dl-o1.c +++ b/testsuites/libtests/dl08/dl-o1.c @@ -45,15 +45,15 @@ int rtems_main_o1 (void); int rtems_main_o1 (void) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl01_bss1: %4u: %p: %d\n", PAINT_VAR (dl01_bss1)); - printf (DL_NAME ": dl01_bss2: %4u: %p: %f\n", PAINT_VAR (dl01_bss2[0])); - printf (DL_NAME ": dl01_bss3: %4u: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); - printf (DL_NAME ": dl01_data1: %4u: %p: %d\n", PAINT_VAR (dl01_data1)); + printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1)); + printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0])); + printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); + printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl01_data2: %4u: %p: %f\n", PAINT_VAR (dl01_data2)); - printf (DL_NAME ": dl01_const1: %4u: %p: %d\n", PAINT_VAR (dl01_const1)); - printf (DL_NAME ": dl01_const2: %4u: %p: %f\n", PAINT_VAR (dl01_const2)); - printf (DL_NAME ": dl01_func1: %4u: %p\n", sizeof(dl01_func1), &dl01_func1); + printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2)); + printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1)); + printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2)); + printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1); rtems_main_o2 (); diff --git a/testsuites/libtests/dl08/dl-o2.c b/testsuites/libtests/dl08/dl-o2.c index 907fe9a268..e58c8750e9 100644 --- a/testsuites/libtests/dl08/dl-o2.c +++ b/testsuites/libtests/dl08/dl-o2.c @@ -26,12 +26,12 @@ float dl02_data2; int rtems_main_o2 (void) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl02_bss1: %4u: %p: %d\n", PAINT_VAR (dl02_bss1)); - printf (DL_NAME ": dl02_bss2: %4u: %p: %f\n", PAINT_VAR (dl02_bss2[0])); - printf (DL_NAME ": dl02_bss3: %4u: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); - printf (DL_NAME ": dl02_data1: %4u: %p: %d\n", PAINT_VAR (dl02_data1)); + printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1)); + printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0])); + printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); + printf (DL_NAME ": dl02_data1: %4zu: %p: %d\n", PAINT_VAR (dl02_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl02_data2: %4u: %p: %f\n", PAINT_VAR (dl02_data2)); + printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2)); rtems_main_o3 (); diff --git a/testsuites/libtests/dl08/dl-o3.c b/testsuites/libtests/dl08/dl-o3.c index 4333f34057..c84b3d72ad 100644 --- a/testsuites/libtests/dl08/dl-o3.c +++ b/testsuites/libtests/dl08/dl-o3.c @@ -22,17 +22,17 @@ int rtems_main_o3 () { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl04_unresolv_1: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); - printf (DL_NAME ": dl04_unresolv_2: %4u: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); - printf (DL_NAME ": dl04_unresolv_3: %4u: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); - printf (DL_NAME ": dl04_unresolv_4: %4u: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); - printf (DL_NAME ": dl04_unresolv_5: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); - printf (DL_NAME ": dl04_unresolv_6: %4u: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); - printf (DL_NAME ": dl05_unresolv_1: %4u: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); - printf (DL_NAME ": dl05_unresolv_2: %4u: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); - printf (DL_NAME ": dl05_unresolv_3: %4u: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); - printf (DL_NAME ": dl05_unresolv_4: %4u: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); - printf (DL_NAME ": dl05_unresolv_5: %4u: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); + printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); + printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); + printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); + printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); + printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); + printf (DL_NAME ": dl04_unresolv_6: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); + printf (DL_NAME ": dl05_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); + printf (DL_NAME ": dl05_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); + printf (DL_NAME ": dl05_unresolv_3: %4zu: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); + printf (DL_NAME ": dl05_unresolv_4: %4zu: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); + printf (DL_NAME ": dl05_unresolv_5: %4zu: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); rtems_main_o4 (); diff --git a/testsuites/libtests/dl08/dl-o4.c b/testsuites/libtests/dl08/dl-o4.c index 60ada7ac68..72dfbc6850 100644 --- a/testsuites/libtests/dl08/dl-o4.c +++ b/testsuites/libtests/dl08/dl-o4.c @@ -27,12 +27,12 @@ const char* dl04_unresolv_6 = "dl-O4"; int rtems_main_o4 (void) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl04_unresolv_1: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); - printf (DL_NAME ": dl04_unresolv_2: %4u: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); - printf (DL_NAME ": dl04_unresolv_3: %4u: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); - printf (DL_NAME ": dl04_unresolv_4: %4u: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); - printf (DL_NAME ": dl04_unresolv_5: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); - printf (DL_NAME ": dl04_unresolv_6: %4u: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); + printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); + printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); + printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); + printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); + printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); + printf (DL_NAME ": dl04_unresolv_6: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); rtems_main_o5 (); diff --git a/testsuites/libtests/dl08/dl-o5.c b/testsuites/libtests/dl08/dl-o5.c index 28bee5a03d..9257a684d7 100644 --- a/testsuites/libtests/dl08/dl-o5.c +++ b/testsuites/libtests/dl08/dl-o5.c @@ -27,11 +27,11 @@ int64_t dl05_unresolv_5; int rtems_main_o5 (void) { printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl05_unresolv_1: %4u: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); - printf (DL_NAME ": dl05_unresolv_2: %4u: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); - printf (DL_NAME ": dl05_unresolv_3: %4u: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); - printf (DL_NAME ": dl05_unresolv_4: %4u: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); - printf (DL_NAME ": dl05_unresolv_5: %4u: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); + printf (DL_NAME ": dl05_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); + printf (DL_NAME ": dl05_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); + printf (DL_NAME ": dl05_unresolv_3: %4zu: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); + printf (DL_NAME ": dl05_unresolv_4: %4zu: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); + printf (DL_NAME ": dl05_unresolv_5: %4zu: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); rtems_main_o6 (); diff --git a/testsuites/libtests/dl08/dl-o6-123456789-123456789.c b/testsuites/libtests/dl08/dl-o6-123456789-123456789.c index d308b85f1a..4aee277a3d 100644 --- a/testsuites/libtests/dl08/dl-o6-123456789-123456789.c +++ b/testsuites/libtests/dl08/dl-o6-123456789-123456789.c @@ -29,11 +29,11 @@ void dl06_destructor (void) __attribute__ ((destructor)); void dl06_constructor (void) { printf (DL_NAME ": CONSTRUCTOR: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl06_unresolv_1: %4u: %p: %" PRIu64 "\n", PAINT_VAR (dl06_unresolv_1)); - printf (DL_NAME ": dl06_unresolv_2: %4u: %p: %" PRIu16 "\n", PAINT_VAR (dl06_unresolv_2)); - printf (DL_NAME ": dl06_unresolv_3: %4u: %p: %" PRIu32 "\n", PAINT_VAR (dl06_unresolv_3)); - printf (DL_NAME ": dl06_unresolv_4: %4u: %p: %" PRIu8 "\n", PAINT_VAR (dl06_unresolv_4)); - printf (DL_NAME ": dl06_unresolv_5: %4u: %p: %" PRIi64 "\n", PAINT_VAR (dl06_unresolv_5)); + printf (DL_NAME ": dl06_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl06_unresolv_1)); + printf (DL_NAME ": dl06_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl06_unresolv_2)); + printf (DL_NAME ": dl06_unresolv_3: %4zu: %p: %" PRIu32 "\n", PAINT_VAR (dl06_unresolv_3)); + printf (DL_NAME ": dl06_unresolv_4: %4zu: %p: %" PRIu8 "\n", PAINT_VAR (dl06_unresolv_4)); + printf (DL_NAME ": dl06_unresolv_5: %4zu: %p: %" PRIi64 "\n", PAINT_VAR (dl06_unresolv_5)); } void dl06_destructor (void) diff --git a/testsuites/libtests/dl09/dl-load.c b/testsuites/libtests/dl09/dl-load.c index 160f8157d9..ab9a0df85b 100644 --- a/testsuites/libtests/dl09/dl-load.c +++ b/testsuites/libtests/dl09/dl-load.c @@ -18,7 +18,9 @@ RTEMS_RTL_TRACE_ALLOCATOR | \ RTEMS_RTL_TRACE_UNRESOLVED | \ RTEMS_RTL_TRACE_ARCHIVES | \ - RTEMS_RTL_TRACE_DEPENDENCY) + RTEMS_RTL_TRACE_DEPENDENCY | \ + RTEMS_RTL_TRACE_LOAD_SECT | \ + RTEMS_RTL_TRACE_BIT_ALLOC) #define DL09_DEBUG_TRACE DEBUG_TRACE /* RTEMS_RTL_TRACE_ALL */ #define DL09_RTL_CMDS 1 #else diff --git a/testsuites/libtests/dl09/dl-o1.c b/testsuites/libtests/dl09/dl-o1.c index 22b839a438..438c05eee9 100644 --- a/testsuites/libtests/dl09/dl-o1.c +++ b/testsuites/libtests/dl09/dl-o1.c @@ -44,16 +44,17 @@ int rtems_main_o1 (void); int rtems_main_o1 (void) { - printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl01_bss1: %4u: %p: %d\n", PAINT_VAR (dl01_bss1)); - printf (DL_NAME ": dl01_bss2: %4u: %p: %f\n", PAINT_VAR (dl01_bss2[0])); - printf (DL_NAME ": dl01_bss3: %4u: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); - printf (DL_NAME ": dl01_data1: %4u: %p: %d\n", PAINT_VAR (dl01_data1)); + printf (DL_NAME ": module: %s @ %p\n", + dl_localise_file (__FILE__), rtems_main_o1); + printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1)); + printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0])); + printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0])); + printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl01_data2: %4u: %p: %f\n", PAINT_VAR (dl01_data2)); - printf (DL_NAME ": dl01_const1: %4u: %p: %d\n", PAINT_VAR (dl01_const1)); - printf (DL_NAME ": dl01_const2: %4u: %p: %f\n", PAINT_VAR (dl01_const2)); - printf (DL_NAME ": dl01_func1: %4u: %p\n", sizeof(dl01_func1), &dl01_func1); + printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2)); + printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1)); + printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2)); + printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1); rtems_main_o2 (); diff --git a/testsuites/libtests/dl09/dl-o2.c b/testsuites/libtests/dl09/dl-o2.c index 907fe9a268..4b9f15cd28 100644 --- a/testsuites/libtests/dl09/dl-o2.c +++ b/testsuites/libtests/dl09/dl-o2.c @@ -17,7 +17,7 @@ int dl02_bss1; float dl02_bss2[7]; char dl02_bss3[21]; -int dl02_data1; +int dl02_data1 = 0x12345678; float dl02_data2; #define DL_NAME "dlo2" @@ -25,13 +25,14 @@ float dl02_data2; int rtems_main_o2 (void) { - printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl02_bss1: %4u: %p: %d\n", PAINT_VAR (dl02_bss1)); - printf (DL_NAME ": dl02_bss2: %4u: %p: %f\n", PAINT_VAR (dl02_bss2[0])); - printf (DL_NAME ": dl02_bss3: %4u: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); - printf (DL_NAME ": dl02_data1: %4u: %p: %d\n", PAINT_VAR (dl02_data1)); + printf (DL_NAME ": module: %s @ %p\n", + dl_localise_file (__FILE__), rtems_main_o2); + printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1)); + printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0])); + printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0])); + printf (DL_NAME ": dl02_data1: %4zu: %p: %08x\n", PAINT_VAR (dl02_data1)); /* no %f in the rtems test printer */ - printf (DL_NAME ": dl02_data2: %4u: %p: %f\n", PAINT_VAR (dl02_data2)); + printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2)); rtems_main_o3 (); diff --git a/testsuites/libtests/dl09/dl-o3.c b/testsuites/libtests/dl09/dl-o3.c index 4333f34057..7f8f419bb1 100644 --- a/testsuites/libtests/dl09/dl-o3.c +++ b/testsuites/libtests/dl09/dl-o3.c @@ -21,18 +21,19 @@ int rtems_main_o3 () { - printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl04_unresolv_1: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); - printf (DL_NAME ": dl04_unresolv_2: %4u: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); - printf (DL_NAME ": dl04_unresolv_3: %4u: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); - printf (DL_NAME ": dl04_unresolv_4: %4u: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); - printf (DL_NAME ": dl04_unresolv_5: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); - printf (DL_NAME ": dl04_unresolv_6: %4u: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); - printf (DL_NAME ": dl05_unresolv_1: %4u: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); - printf (DL_NAME ": dl05_unresolv_2: %4u: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); - printf (DL_NAME ": dl05_unresolv_3: %4u: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); - printf (DL_NAME ": dl05_unresolv_4: %4u: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); - printf (DL_NAME ": dl05_unresolv_5: %4u: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); + printf (DL_NAME ": module: %s : %p\n", + dl_localise_file (__FILE__), rtems_main_o3); + printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); + printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); + printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); + printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); + printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); + printf (DL_NAME ": dl04_unresolv_6: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); + printf (DL_NAME ": dl05_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); + printf (DL_NAME ": dl05_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); + printf (DL_NAME ": dl05_unresolv_3: %4zu: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); + printf (DL_NAME ": dl05_unresolv_4: %4zu: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); + printf (DL_NAME ": dl05_unresolv_5: %4zu: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); rtems_main_o4 (); diff --git a/testsuites/libtests/dl09/dl-o4.c b/testsuites/libtests/dl09/dl-o4.c index 60ada7ac68..9fea2e5d5c 100644 --- a/testsuites/libtests/dl09/dl-o4.c +++ b/testsuites/libtests/dl09/dl-o4.c @@ -14,10 +14,10 @@ #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__); -int dl04_unresolv_1; +int dl04_unresolv_1 = 12345; float dl04_unresolv_2; -char dl04_unresolv_3; -char* dl04_unresolv_4; +char dl04_unresolv_3 = 'z'; +char* dl04_unresolv_4 = "aBcDeF"; const int dl04_unresolv_5 = 4; const char* dl04_unresolv_6 = "dl-O4"; @@ -26,13 +26,14 @@ const char* dl04_unresolv_6 = "dl-O4"; int rtems_main_o4 (void) { - printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl04_unresolv_1: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); - printf (DL_NAME ": dl04_unresolv_2: %4u: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); - printf (DL_NAME ": dl04_unresolv_3: %4u: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); - printf (DL_NAME ": dl04_unresolv_4: %4u: %p: %p\n", PAINT_VAR (dl04_unresolv_4)); - printf (DL_NAME ": dl04_unresolv_5: %4u: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); - printf (DL_NAME ": dl04_unresolv_6: %4u: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); + printf (DL_NAME ": module: %s @ %p\n", + dl_localise_file (__FILE__), rtems_main_o4); + printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1)); + printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2)); + printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3)); + printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_4)); + printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5)); + printf (DL_NAME ": dl04_unresolv_6: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_6)); rtems_main_o5 (); diff --git a/testsuites/libtests/dl09/dl-o5.c b/testsuites/libtests/dl09/dl-o5.c index fc02e19272..fb1169256c 100644 --- a/testsuites/libtests/dl09/dl-o5.c +++ b/testsuites/libtests/dl09/dl-o5.c @@ -26,12 +26,13 @@ int64_t dl05_unresolv_5; int rtems_main_o5 (void) { - printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__)); - printf (DL_NAME ": dl05_unresolv_1: %4u: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); - printf (DL_NAME ": dl05_unresolv_2: %4u: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); - printf (DL_NAME ": dl05_unresolv_3: %4u: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); - printf (DL_NAME ": dl05_unresolv_4: %4u: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); - printf (DL_NAME ": dl05_unresolv_5: %4u: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); + printf (DL_NAME ": module: %s @ %p\n", + dl_localise_file (__FILE__), rtems_main_o5); + printf (DL_NAME ": dl05_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1)); + printf (DL_NAME ": dl05_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2)); + printf (DL_NAME ": dl05_unresolv_3: %4zu: %p: %" PRIu32 "\n", PAINT_VAR (dl05_unresolv_3)); + printf (DL_NAME ": dl05_unresolv_4: %4zu: %p: %" PRIu8 "\n", PAINT_VAR (dl05_unresolv_4)); + printf (DL_NAME ": dl05_unresolv_5: %4zu: %p: %" PRIi64 "\n", PAINT_VAR (dl05_unresolv_5)); return 0; } -- cgit v1.2.3