[PATCH 11/11] libdl: Add powerpc large memory and small data support.
chrisj at rtems.org
chrisj at rtems.org
Tue Feb 5 01:43:04 UTC 2019
From: Chris Johns <chrisj at rtems.org>
- 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
---
bsps/powerpc/shared/start/linkcmds.base | 22 ++
cpukit/Makefile.am | 1 +
cpukit/include/rtems/rtl/rtl-obj.h | 69 +++-
cpukit/include/rtems/rtl/rtl-trace.h | 1 +
cpukit/libdl/rtl-archive.c | 7 +-
cpukit/libdl/rtl-bit-alloc.c | 197 ++++++++++
cpukit/libdl/rtl-bit-alloc.h | 82 ++++
cpukit/libdl/rtl-elf.c | 59 ++-
cpukit/libdl/rtl-elf.h | 41 +-
cpukit/libdl/rtl-error.c | 1 +
cpukit/libdl/rtl-mdreloc-arm.c | 38 +-
cpukit/libdl/rtl-mdreloc-bfin.c | 32 ++
cpukit/libdl/rtl-mdreloc-h8300.c | 32 ++
cpukit/libdl/rtl-mdreloc-i386.c | 32 ++
cpukit/libdl/rtl-mdreloc-lm32.c | 32 ++
cpukit/libdl/rtl-mdreloc-m68k.c | 36 +-
cpukit/libdl/rtl-mdreloc-mips.c | 32 ++
cpukit/libdl/rtl-mdreloc-moxie.c | 32 ++
cpukit/libdl/rtl-mdreloc-powerpc.c | 359 ++++++++++++++----
cpukit/libdl/rtl-mdreloc-sparc.c | 32 ++
cpukit/libdl/rtl-mdreloc-v850.c | 32 ++
cpukit/libdl/rtl-obj.c | 77 ++--
cpukit/libdl/rtl-shell.c | 2 +-
cpukit/libdl/rtl-unresolved.c | 2 +-
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 +-
52 files changed, 1640 insertions(+), 306 deletions(-)
create mode 100644 cpukit/libdl/rtl-bit-alloc.c
create mode 100644 cpukit/libdl/rtl-bit-alloc.h
create mode 100644 testsuites/libtests/dl03/dl-bit-alloc.c
create mode 100644 testsuites/libtests/dl03/dl-bit-alloc.h
diff --git a/bsps/powerpc/shared/start/linkcmds.base b/bsps/powerpc/shared/start/linkcmds.base
index 4ad302e86b..24f463b295 100644
--- a/bsps/powerpc/shared/start/linkcmds.base
+++ b/bsps/powerpc/shared/start/linkcmds.base
@@ -293,20 +293,42 @@ SECTIONS {
KEEP (*(SORT(.rtemsrwset.*)))
} > REGION_DATA AT > REGION_DATA_LOAD
.sdata : ALIGN_WITH_INPUT {
+ bsp_section_sdata_begin = .;
PROVIDE (_SDA_BASE_ = 32768);
*(.sdata .sdata.* .gnu.linkonce.s.*)
+ bsp_section_sdata_end = .;
bsp_section_data_end = .;
} > REGION_DATA AT > REGION_DATA_LOAD
+ bsp_section_sdata_size = bsp_section_sdata_end - bsp_section_sdata_begin;
bsp_section_data_size = bsp_section_data_end - bsp_section_data_begin;
bsp_section_data_load_begin = LOADADDR (.data);
bsp_section_data_load_end = bsp_section_data_load_begin + bsp_section_data_size;
+ /*
+ * Set bsp_section_sdata_bss_maximum_size to 1 to use the maximum, eg:
+ *
+ * bsp_section_sdata_bss_maximum_size = 1;
+ */
+ bsp_section_sdata_bss_default_size =
+ DEFINED(bsp_section_sdata_bss_maximum_size) ? 65536 : 0;
+ /*
+ * Set bsp_section_sdata_bss_size to the system's sdata and bss data size, eg:
+ *
+ * bsp_section_sdata_bss_maximum_size = 4096;
+ */
+ bsp_section_sdata_sbss_size = DEFINED(bsp_section_sdata_bss_size) ?
+ bsp_section_sdata_bss_size : bsp_section_sdata_bss_default_size;
+
.sbss : ALIGN_WITH_INPUT {
bsp_section_sbss_begin = .;
*(.dynsbss)
*(.sbss .sbss.* .gnu.linkonce.sb.*)
*(.scommon)
bsp_section_sbss_end = .;
+ bsp_section_sdata_libdl_begin = .;
+ . += bsp_section_sdata_sbss_size ? bsp_section_sdata_sbss_size -
+ (bsp_section_sdata_size + bsp_section_sbss_size) : 0;
+ bsp_section_sdata_libdl_end = .;
} > REGION_DATA AT > REGION_DATA
bsp_section_sbss_size = bsp_section_sbss_end - bsp_section_sbss_begin;
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 8ea7cbbfb0..51ab18ca05 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1141,6 +1141,7 @@ librtemscpu_a_SOURCES += libdl/rap-shell.c
librtemscpu_a_SOURCES += libdl/rtl-allocator.c
librtemscpu_a_SOURCES += libdl/rtl-alloc-heap.c
librtemscpu_a_SOURCES += libdl/rtl-archive.c
+librtemscpu_a_SOURCES += libdl/rtl-bit-alloc.c
librtemscpu_a_SOURCES += libdl/rtl.c
librtemscpu_a_SOURCES += libdl/rtl-chain-iterator.c
librtemscpu_a_SOURCES += libdl/rtl-debugger.c
diff --git a/cpukit/include/rtems/rtl/rtl-obj.h b/cpukit/include/rtems/rtl/rtl-obj.h
index e01af20957..9c2b4f0300 100644
--- a/cpukit/include/rtems/rtl/rtl-obj.h
+++ b/cpukit/include/rtems/rtl/rtl-obj.h
@@ -87,25 +87,26 @@ typedef struct rtems_rtl_loader_table
/**
* Flags for the various section types.
*/
-#define RTEMS_RTL_OBJ_SECT_TEXT (1 << 0) /**< Section holds program text. */
-#define RTEMS_RTL_OBJ_SECT_CONST (1 << 1) /**< Section holds program text. */
-#define RTEMS_RTL_OBJ_SECT_DATA (1 << 2) /**< Section holds program data. */
-#define RTEMS_RTL_OBJ_SECT_BSS (1 << 3) /**< Section holds program bss. */
-#define RTEMS_RTL_OBJ_SECT_EH (1 << 4) /**< Section holds exception data. */
-#define RTEMS_RTL_OBJ_SECT_TLS (1 << 5) /**< Section holds TLS data. */
-#define RTEMS_RTL_OBJ_SECT_REL (1 << 6) /**< Section holds relocation recs. */
-#define RTEMS_RTL_OBJ_SECT_RELA (1 << 7) /**< Section holds reloc addend recs. */
-#define RTEMS_RTL_OBJ_SECT_SYM (1 << 8) /**< Section holds symbols. */
-#define RTEMS_RTL_OBJ_SECT_STR (1 << 9) /**< Section holds strings. */
-#define RTEMS_RTL_OBJ_SECT_ALLOC (1 << 10 /**< Section allocates runtime memory. */
-#define RTEMS_RTL_OBJ_SECT_LOAD (1 << 11) /**< Section is loaded from object file. */
-#define RTEMS_RTL_OBJ_SECT_WRITE (1 << 12) /**< Section is writable, ie data. */
-#define RTEMS_RTL_OBJ_SECT_EXEC (1 << 13) /**< Section is executable. */
-#define RTEMS_RTL_OBJ_SECT_ZERO (1 << 14) /**< Section is preset to zero. */
-#define RTEMS_RTL_OBJ_SECT_LINK (1 << 15) /**< Section is link-ordered. */
-#define RTEMS_RTL_OBJ_SECT_CTOR (1 << 16) /**< Section contains constructors. */
-#define RTEMS_RTL_OBJ_SECT_DTOR (1 << 17) /**< Section contains destructors. */
-#define RTEMS_RTL_OBJ_SECT_LOCD (1 << 18) /**< Section has been located. */
+#define RTEMS_RTL_OBJ_SECT_TEXT (1 << 0) /**< Section holds program text. */
+#define RTEMS_RTL_OBJ_SECT_CONST (1 << 1) /**< Section holds program text. */
+#define RTEMS_RTL_OBJ_SECT_DATA (1 << 2) /**< Section holds program data. */
+#define RTEMS_RTL_OBJ_SECT_BSS (1 << 3) /**< Section holds program bss. */
+#define RTEMS_RTL_OBJ_SECT_EH (1 << 4) /**< Section holds exception data. */
+#define RTEMS_RTL_OBJ_SECT_TLS (1 << 5) /**< Section holds TLS data. */
+#define RTEMS_RTL_OBJ_SECT_REL (1 << 6) /**< Section holds relocation recs. */
+#define RTEMS_RTL_OBJ_SECT_RELA (1 << 7) /**< Section holds reloc addend recs. */
+#define RTEMS_RTL_OBJ_SECT_SYM (1 << 8) /**< Section holds symbols. */
+#define RTEMS_RTL_OBJ_SECT_STR (1 << 9) /**< Section holds strings. */
+#define RTEMS_RTL_OBJ_SECT_ALLOC (1 << 10 /**< Section allocates runtime memory. */
+#define RTEMS_RTL_OBJ_SECT_LOAD (1 << 11) /**< Section is loaded from object file. */
+#define RTEMS_RTL_OBJ_SECT_WRITE (1 << 12) /**< Section is writable, ie data. */
+#define RTEMS_RTL_OBJ_SECT_EXEC (1 << 13) /**< Section is executable. */
+#define RTEMS_RTL_OBJ_SECT_ZERO (1 << 14) /**< Section is preset to zero. */
+#define RTEMS_RTL_OBJ_SECT_LINK (1 << 15) /**< Section is link-ordered. */
+#define RTEMS_RTL_OBJ_SECT_CTOR (1 << 16) /**< Section contains constructors. */
+#define RTEMS_RTL_OBJ_SECT_DTOR (1 << 17) /**< Section contains destructors. */
+#define RTEMS_RTL_OBJ_SECT_LOCD (1 << 18) /**< Section has been located. */
+#define RTEMS_RTL_OBJ_SECT_ARCH_ALLOC (1 << 19) /**< Section use arch allocator. */
/**
* Section types mask.
@@ -237,7 +238,7 @@ struct rtems_rtl_obj
/**
* A section handler is called once for each section that needs to be
- * processed by this handler.
+ * processed by this handler. The handler is specific to a task.
*
* @param obj The object file's descriptor the section belongs too.
* @param fd The file descriptor of the object file beling loaded.
@@ -376,6 +377,17 @@ static inline bool rtems_rtl_obj_has_ramp_space (const rtems_rtl_obj* obj,
((obj->tramp_brk - obj->trampoline) + size) <= obj->tramp_size);
}
+/**
+ * Does the section require architecture specific allocations?
+ *
+ * @param sect The section.
+ * @retval bool Returns @true if the section requires arch allocation.
+ */
+static inline bool rtems_rtl_obj_sect_is_arch_alloc (rtems_rtl_obj_sect* sect)
+{
+ return (sect->flags & RTEMS_RTL_OBJ_SECT_ARCH_ALLOC) != 0;
+}
+
/**
* Allocate an object structure on the heap.
*
@@ -728,6 +740,23 @@ bool rtems_rtl_obj_load_symbols (rtems_rtl_obj* obj,
rtems_rtl_obj_sect_handler handler,
void* data);
+/**
+ * Allocate the sections. If a handler is provided (not NULL) it is called for
+ * all section.
+ *
+ * @param obj The object file's descriptor.
+ * @param fd The object file's file descriptor.
+ * @param handler The object file's format specific allocation handler.
+ * @param data User specific data handle.
+ * @retval true The object has been sucessfully loaded.
+ * @retval false The load failed. The RTL error has been set.
+ */
+bool
+rtems_rtl_obj_alloc_sections (rtems_rtl_obj* obj,
+ int fd,
+ rtems_rtl_obj_sect_handler handler,
+ void* data);
+
/**
* Load the sections that have been allocated memory in the target. The bss
* type section does not load any data, it is set to 0. The text and data
diff --git a/cpukit/include/rtems/rtl/rtl-trace.h b/cpukit/include/rtems/rtl/rtl-trace.h
index 6905e02245..cd3921400c 100644
--- a/cpukit/include/rtems/rtl/rtl-trace.h
+++ b/cpukit/include/rtems/rtl/rtl-trace.h
@@ -51,6 +51,7 @@ typedef uint32_t rtems_rtl_trace_mask;
#define RTEMS_RTL_TRACE_ARCHIVES (1UL << 12)
#define RTEMS_RTL_TRACE_ARCHIVE_SYMS (1UL << 13)
#define RTEMS_RTL_TRACE_DEPENDENCY (1UL << 14)
+#define RTEMS_RTL_TRACE_BIT_ALLOC (1UL << 15)
#define RTEMS_RTL_TRACE_ALL (0xffffffffUL & ~(RTEMS_RTL_TRACE_CACHE | \
RTEMS_RTL_TRACE_GLOBAL_SYM | \
RTEMS_RTL_TRACE_ARCHIVE_SYMS))
diff --git a/cpukit/libdl/rtl-archive.c b/cpukit/libdl/rtl-archive.c
index be1199f62f..07d40187e1 100644
--- a/cpukit/libdl/rtl-archive.c
+++ b/cpukit/libdl/rtl-archive.c
@@ -21,6 +21,7 @@
#include <dirent.h>
#include <errno.h>
#include <fnmatch.h>
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
@@ -572,7 +573,7 @@ rtems_rtl_archives_close (rtems_rtl_archives* archives)
{
rtems_chain_node* node;
if (rtems_rtl_trace (RTEMS_RTL_TRACE_ARCHIVES))
- printf ("rtl: archive: close: count=%ds\n",
+ printf ("rtl: archive: close: count=%zu\n",
rtems_chain_node_count_unprotected (&archives->archives));
node = rtems_chain_first (&archives->archives);
while (!rtems_chain_is_tail (&archives->archives, node))
@@ -591,7 +592,7 @@ rtems_rtl_archives_remove (rtems_rtl_archives* archives)
{
rtems_chain_node* node = rtems_chain_first (&archives->archives);
if (rtems_rtl_trace (RTEMS_RTL_TRACE_ARCHIVES))
- printf ("rtl: archive: refresh: remove: checking %d archive(s)\n",
+ printf ("rtl: archive: refresh: remove: checking %zu archive(s)\n",
rtems_chain_node_count_unprotected (&archives->archives));
while (!rtems_chain_is_tail (&archives->archives, node))
{
@@ -716,7 +717,7 @@ rtems_rtl_archive_loader (rtems_rtl_archive* archive, void* data)
archive->symbols.base,
archive->symbols.entries,
archive->symbols.names,
- (archive->symbols.entries + 1) * 4,
+ (unsigned int) (archive->symbols.entries + 1) * 4,
archive->symbols.symbols);
if (rtems_rtl_trace (RTEMS_RTL_TRACE_ARCHIVE_SYMS) &&
diff --git a/cpukit/libdl/rtl-bit-alloc.c b/cpukit/libdl/rtl-bit-alloc.c
new file mode 100644
index 0000000000..b7871f227b
--- /dev/null
+++ b/cpukit/libdl/rtl-bit-alloc.c
@@ -0,0 +1,197 @@
+/*
+ * COPYRIGHT (c) 2019 Chris Johns <chrisj at rtems.org>
+ *
+ * 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.
+ */
+/**
+ * @file
+ *
+ * @ingroup rtems_rtld
+ *
+ * @brief RTEMS Run-Time Link Editor Bit Allocator
+ *
+ * A configurable allocator for small peices of memory where embedding
+ * control blocks into the memory are not viable. The amount of memory
+ * should be small and the minimum allocator a 32bit work or higher.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <errno.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <rtems/rtl/rtl-allocator.h>
+#include "rtl-bit-alloc.h"
+#include "rtl-error.h"
+#include <rtems/rtl/rtl-trace.h>
+
+#define BITS_PER_WORD (sizeof (uint32_t) * 8)
+
+static size_t
+bit_blocks (rtems_rtl_bit_alloc* balloc, size_t size)
+{
+ if (size == 0)
+ return 0;
+ return ((size - 1) / balloc->block_size) + 1;
+}
+
+static size_t
+bit_word (size_t bit)
+{
+ return bit / BITS_PER_WORD;
+}
+
+static size_t
+bit_offset (size_t bit)
+{
+ return bit % (sizeof (uint32_t) * 8);
+}
+
+static uint32_t
+bit_mask (size_t bit)
+{
+ return 1 << bit_offset (bit);
+}
+
+static void
+bit_set (rtems_rtl_bit_alloc* balloc, size_t start, size_t bits)
+{
+ size_t b;
+ for (b = start; b < (start + bits); ++b)
+ balloc->bits[bit_word (b)] |= bit_mask (b);
+}
+
+static void
+bit_clear (rtems_rtl_bit_alloc* balloc, size_t start, size_t bits)
+{
+ size_t b;
+ for (b = start; b < (start + bits); ++b)
+ balloc->bits[bit_word (b)] &= ~bit_mask (b);
+}
+
+static ssize_t
+bit_find_clear (rtems_rtl_bit_alloc* balloc, size_t blocks)
+{
+ size_t base = 0;
+ size_t clear = 0;
+ size_t b;
+
+ for (b = 0; b < balloc->blocks; ++b)
+ {
+ if (balloc->bits[b] != 0xffffffff)
+ {
+ uint32_t word = balloc->bits[b];
+ size_t o;
+ for (o = 0; o < BITS_PER_WORD; ++o, word >>= 1)
+ {
+ if ((word & 1) == 0)
+ {
+ if (clear == 0)
+ base = (b * BITS_PER_WORD) + o;
+ ++clear;
+ if (clear == blocks)
+ return base;
+ }
+ else
+ {
+ clear = 0;
+ base = 0;
+ }
+ }
+ }
+ else
+ {
+ clear = 0;
+ base = 0;
+ }
+ }
+
+ return -1;
+}
+
+rtems_rtl_bit_alloc*
+rtems_rtl_bit_alloc_open (void* base, size_t size, size_t block_size, size_t used)
+{
+ rtems_rtl_bit_alloc* balloc;
+ const size_t base_size = base == NULL ? size : 0;;
+ const size_t blocks = (size / block_size) / BITS_PER_WORD;
+ const size_t bit_bytes = blocks * sizeof(uint32_t);
+
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_BIT_ALLOC))
+ printf ("rtl: balloc: open: base=%p size=%zu" \
+ " block-size=%zu blocks=%zu used=%zu\n",
+ base, size, block_size, blocks, used);
+
+ if (size == 0)
+ {
+ rtems_rtl_set_error (ENOMEM, "bit allocator size is 0");
+ return false;
+ }
+
+ if (used > size)
+ {
+ rtems_rtl_set_error (ENOMEM, "bad bit allocator used value");
+ return false;
+ }
+
+ balloc = rtems_rtl_alloc_new (RTEMS_RTL_ALLOC_OBJECT,
+ sizeof (rtems_rtl_bit_alloc) + bit_bytes + base_size,
+ true);
+ if (balloc == NULL)
+ {
+ rtems_rtl_set_error (ENOMEM, "not bit allocator memory");
+ return NULL;
+ }
+
+ balloc->base =
+ base == NULL ? ((void*) balloc) + sizeof (rtems_rtl_bit_alloc) + bit_bytes: base;
+ balloc->size = size;
+ balloc->bits = ((void*) balloc) + sizeof (rtems_rtl_bit_alloc);
+ balloc->block_size = block_size;
+ balloc->blocks = blocks;
+
+ bit_set (balloc, 0, bit_blocks (balloc, used));
+
+ return balloc;
+}
+
+void
+rtems_rtl_bit_alloc_close (rtems_rtl_bit_alloc* balloc)
+{
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_BIT_ALLOC))
+ printf ("rtl: balloc: close: base=%p size=%zu\n",
+ balloc->base, balloc->size);
+ rtems_rtl_alloc_del (RTEMS_RTL_ALLOC_OBJECT, balloc);
+}
+
+void*
+rtems_rtl_bit_alloc_balloc (rtems_rtl_bit_alloc* balloc, size_t size)
+{
+ size_t blocks = bit_blocks (balloc, size);
+ ssize_t block = bit_find_clear (balloc, blocks);
+ if (block < 0)
+ return NULL;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_BIT_ALLOC))
+ printf ("rtl: balloc: balloc: size=%zu blocks=%zu block=%zi\n",
+ size, blocks, block);
+ bit_set (balloc, block, blocks);
+ return (void*) (balloc->base + (block * balloc->block_size));
+}
+
+void
+rtems_rtl_bit_alloc_bfree (rtems_rtl_bit_alloc* balloc, void* addr, size_t size)
+{
+ const uint8_t* a = (const uint8_t*) addr;
+ if (addr != NULL && a >= balloc->base && a < balloc->base + balloc->size)
+ {
+ size_t block = bit_blocks (balloc, a - balloc->base);
+ size_t blocks = bit_blocks (balloc, size);
+ bit_clear (balloc, block, blocks);
+ }
+}
diff --git a/cpukit/libdl/rtl-bit-alloc.h b/cpukit/libdl/rtl-bit-alloc.h
new file mode 100644
index 0000000000..d977473a96
--- /dev/null
+++ b/cpukit/libdl/rtl-bit-alloc.h
@@ -0,0 +1,82 @@
+/*
+ * COPYRIGHT (c) 2019 Chris Johns <chrisj at rtems.org>
+ *
+ * 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.
+ */
+/**
+ * @file
+ *
+ * @ingroup rtems_rtl
+ *
+ * @brief RTEMS Run-Time Linker Bit Allocator Header
+ */
+
+#if !defined (_RTEMS_RTL_BIT_ALLOC_H_)
+#define _RTEMS_RTL_BIT_ALLOC_H_
+
+#include <rtems/rtl/rtl-fwd.h>
+#include <rtems/rtl/rtl-obj-fwd.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * Bit Allocator data
+ */
+typedef struct rtems_rtl_bit_alloc
+{
+ uint8_t* base; /**< The memory being allocated. */
+ size_t size; /**< The number of bytes of memory being managed. */
+ uint32_t* bits; /**< The bit map indicating which blocks are allocated. */
+ size_t block_size; /**< The size of a block, the minimum allocation unit. */
+ size_t blocks; /**< The number of blocks in the memory. */
+} rtems_rtl_bit_alloc;
+
+/**
+ * Open a bit allocator. The allocator allocates block_size pieces of the memory
+ * being managed.
+ *
+ * @param base The memory to managem NULL to allocate a piece of memory.
+ * @param size The size of the memory being managed in bytes.
+ * @param block_size The minimum allocation unit in bytes.
+ * @param used The amount of memory already in use in bytes.
+ * @retval rtems_rtl_bit_alloc The bit allocator structure.
+ */
+rtems_rtl_bit_alloc* rtems_rtl_bit_alloc_open (void* base,
+ size_t size,
+ size_t block_size,
+ size_t used);
+
+/**
+ * Close the bit allocator.
+ *
+ * @param balloc The allocator to close.
+ */
+
+void rtems_rtl_bit_alloc_close (rtems_rtl_bit_alloc* balloc);
+
+/**
+ * Allocate a piece of memory being managed. The size is in bytes are is rounded
+ * up the next block size.
+ *
+ * @param balloc The allocator.
+ * @param size Number of bytes to allocate.
+ * @return void* The memory if the allocation is successful else NULL if there
+ * is no more memory.
+ */
+void* rtems_rtl_bit_alloc_balloc (rtems_rtl_bit_alloc* balloc, size_t size);
+
+/**
+ * Free an allocated memory block. The size is required because the allocator does not
+ * contain any state information.
+ */
+void rtems_rtl_bit_alloc_bfree (rtems_rtl_bit_alloc* balloc, void* addr, size_t size);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
diff --git a/cpukit/libdl/rtl-elf.c b/cpukit/libdl/rtl-elf.c
index e65c70308d..54ea1464cc 100644
--- a/cpukit/libdl/rtl-elf.c
+++ b/cpukit/libdl/rtl-elf.c
@@ -474,7 +474,6 @@ rtems_rtl_elf_relocs_parser (rtems_rtl_obj* obj,
{
bool r = rtems_rtl_elf_relocate_worker (obj, fd, sect,
rtems_rtl_elf_reloc_parser, data);
- rtems_rtl_obj_update_flags (RTEMS_RTL_OBJ_RELOC_TAG, 0);
return r;
}
@@ -603,10 +602,11 @@ rtems_rtl_elf_common (rtems_rtl_obj* obj,
(ELF_ST_TYPE (symbol.st_info) == STT_COMMON)))
{
if (rtems_rtl_trace (RTEMS_RTL_TRACE_SYMBOL))
- printf ("rtl: com:elf:%-2d bind:%-2d type:%-2d size:%d value:%d\n",
+ printf ("rtl: com:elf:%-2d bind:%-2d type:%-2d size:%d value:%d name:%d\n",
sym, (int) ELF_ST_BIND (symbol.st_info),
(int) ELF_ST_TYPE (symbol.st_info),
- (int) symbol.st_size, (int) symbol.st_value);
+ (int) symbol.st_size, (int) symbol.st_value,
+ (int) symbol.st_name);
/*
* If the size is zero this is the first entry, it defines the common
* section's aligment. The symbol's value is the alignment.
@@ -952,6 +952,36 @@ rtems_rtl_elf_symbols (rtems_rtl_obj* obj,
return true;
}
+static bool
+rtems_rtl_elf_arch_alloc (rtems_rtl_obj* obj,
+ int fd,
+ rtems_rtl_obj_sect* sect,
+ void* data)
+{
+ if (rtems_rtl_obj_sect_is_arch_alloc (sect))
+ return rtems_rtl_elf_arch_section_alloc (obj, sect);
+ return true;
+}
+
+static bool
+rtems_rtl_elf_arch_free (rtems_rtl_obj* obj)
+{
+ int index = -1;
+ while (true)
+ {
+ rtems_rtl_obj_sect* sect;
+ sect = rtems_rtl_obj_find_section_by_mask (obj,
+ index,
+ RTEMS_RTL_OBJ_SECT_ARCH_ALLOC);
+ if (sect == NULL)
+ break;
+ if (!rtems_rtl_elf_arch_section_free (obj, sect))
+ return false;
+ index = sect->section;
+ }
+ return true;
+}
+
static bool
rtems_rtl_elf_loader (rtems_rtl_obj* obj,
int fd,
@@ -1168,6 +1198,22 @@ rtems_rtl_elf_parse_sections (rtems_rtl_obj* obj, int fd, Elf_Ehdr* ehdr)
flags |= RTEMS_RTL_OBJ_SECT_EH;
}
+ /*
+ * Architecture specific parsing. Modified or extends the flags.
+ */
+ flags = rtems_rtl_elf_arch_parse_section (obj, section, name, &shdr, flags);
+ if (flags == 0)
+ {
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_WARNING))
+ printf ("rtl: unsupported section: %2d: type=%02d flags=%02x\n",
+ section, (int) shdr.sh_type, (int) shdr.sh_flags);
+ rtems_rtl_set_error (ENOMEM, "invalid architecture section: %s", name);
+ return false;
+ }
+
+ /*
+ * Add the section.
+ */
if (!rtems_rtl_obj_add_section (obj, section, name,
shdr.sh_size, shdr.sh_offset,
shdr.sh_addralign, shdr.sh_link,
@@ -1410,6 +1456,12 @@ rtems_rtl_elf_file_load (rtems_rtl_obj* obj, int fd)
*/
obj->entry = (void*)(uintptr_t) ehdr.e_entry;
+ /*
+ * Allocate the sections.
+ */
+ if (!rtems_rtl_obj_alloc_sections (obj, fd, rtems_rtl_elf_arch_alloc, &ehdr))
+ return false;
+
/*
* Load the sections and symbols and then relocation to the base address.
*/
@@ -1453,6 +1505,7 @@ rtems_rtl_elf_file_load (rtems_rtl_obj* obj, int fd)
bool
rtems_rtl_elf_file_unload (rtems_rtl_obj* obj)
{
+ rtems_rtl_elf_arch_free (obj);
rtems_rtl_elf_unwind_deregister (obj);
return true;
}
diff --git a/cpukit/libdl/rtl-elf.h b/cpukit/libdl/rtl-elf.h
index d781bfb3a4..73d1e01bb1 100644
--- a/cpukit/libdl/rtl-elf.h
+++ b/cpukit/libdl/rtl-elf.h
@@ -70,7 +70,7 @@ typedef struct rtems_rtl_mdreloc_trmap
/**
* Architecture specific handler to translate unknown section flags to RTL
- * section flags.
+ * section flags. If this function returns 0 an error is raised.
*
* @param obj The object file being relocated.
* @param shdr The ELF section header.
@@ -80,6 +80,45 @@ typedef struct rtems_rtl_mdreloc_trmap
uint32_t rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
const Elf_Shdr* shdr);
+/**
+ * Architecture specific handler to parse the section and add any flags that
+ * may be need to handle the section.
+ *
+ * @param obj The object file being relocated.
+ * @param seciton The section index.
+ * @param name The name of the section
+ * @param shdr The ELF section header.
+ * @param flags The standard ELF parsed flags.
+ * @retval uint32_t Extra RTL object file flags.
+ */
+uint32_t rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags);
+
+/**
+ * Architecture specific handler to allocate a section. Some sections are
+ * specific to an architecture and need special allocators.
+ *
+ * @param obj The object file being relocated.
+ * @param sect The section data.
+ * @retval true The allocator was successful.
+ */
+bool rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect);
+
+/**
+ * Architecture specific handler to free a section. Some sections are
+ * specific to an architecture and need special allocators.
+ *
+ * @param obj The object file being relocated.
+ * @param sect The section data.
+ * @retval true The allocator was successful.
+ */
+bool rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect);
+
/**
* Architecture specific handler to check is a relocation record's type is
* required to resolve a symbol.
diff --git a/cpukit/libdl/rtl-error.c b/cpukit/libdl/rtl-error.c
index 7b72c0a26d..acd89ac07d 100644
--- a/cpukit/libdl/rtl-error.c
+++ b/cpukit/libdl/rtl-error.c
@@ -44,6 +44,7 @@ rtems_rtl_get_error (char* message, size_t max_message)
if (rtl != NULL)
{
int last_errno = rtl->last_errno;
+ rtl->last_errno = 0;
strlcpy (message, rtl->last_error, max_message);
rtems_rtl_unlock ();
return last_errno;
diff --git a/cpukit/libdl/rtl-mdreloc-arm.c b/cpukit/libdl/rtl-mdreloc-arm.c
index 19a5904a25..b0c55c257a 100644
--- a/cpukit/libdl/rtl-mdreloc-arm.c
+++ b/cpukit/libdl/rtl-mdreloc-arm.c
@@ -109,6 +109,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return flags;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
@@ -152,7 +184,7 @@ rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
}
static bool
-rtems_rtl_elf_relor_rel (rtems_rtl_obj* obj,
+rtems_rtl_elf_reloc_rel (rtems_rtl_obj* obj,
const Elf_Rel* rel,
const rtems_rtl_obj_sect* sect,
const char* symname,
@@ -493,7 +525,7 @@ rtems_rtl_elf_relocate_rel_tramp (rtems_rtl_obj* obj,
const Elf_Byte syminfo,
const Elf_Word symvalue)
{
- return rtems_rtl_elf_relor_rel (obj,
+ return rtems_rtl_elf_reloc_rel (obj,
rel,
sect,
symname,
@@ -510,7 +542,7 @@ rtems_rtl_elf_relocate_rel (rtems_rtl_obj* obj,
const Elf_Byte syminfo,
const Elf_Word symvalue)
{
- return rtems_rtl_elf_relor_rel (obj,
+ return rtems_rtl_elf_reloc_rel (obj,
rel,
sect,
symname,
diff --git a/cpukit/libdl/rtl-mdreloc-bfin.c b/cpukit/libdl/rtl-mdreloc-bfin.c
index b4c20fac24..af130276a4 100644
--- a/cpukit/libdl/rtl-mdreloc-bfin.c
+++ b/cpukit/libdl/rtl-mdreloc-bfin.c
@@ -16,6 +16,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj_t* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-mdreloc-h8300.c b/cpukit/libdl/rtl-mdreloc-h8300.c
index e0cb826dc8..4a12f34f36 100644
--- a/cpukit/libdl/rtl-mdreloc-h8300.c
+++ b/cpukit/libdl/rtl-mdreloc-h8300.c
@@ -19,6 +19,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-mdreloc-i386.c b/cpukit/libdl/rtl-mdreloc-i386.c
index 016f99f379..576914cf04 100644
--- a/cpukit/libdl/rtl-mdreloc-i386.c
+++ b/cpukit/libdl/rtl-mdreloc-i386.c
@@ -26,6 +26,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-mdreloc-lm32.c b/cpukit/libdl/rtl-mdreloc-lm32.c
index cf64ea8fb3..9f4606ebad 100644
--- a/cpukit/libdl/rtl-mdreloc-lm32.c
+++ b/cpukit/libdl/rtl-mdreloc-lm32.c
@@ -19,6 +19,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-mdreloc-m68k.c b/cpukit/libdl/rtl-mdreloc-m68k.c
index 1981e93d56..21a60ee62a 100644
--- a/cpukit/libdl/rtl-mdreloc-m68k.c
+++ b/cpukit/libdl/rtl-mdreloc-m68k.c
@@ -39,6 +39,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
@@ -156,12 +188,12 @@ rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
break;
default:
- printf ("rtl: reloc unknown: sym = %lu, type = %lu, offset = %p, "
+ printf ("rtl: reloc unknown: sym = %u, type = %u, offset = %p, "
"contents = %p\n",
ELF_R_SYM(rela->r_info), (uint32_t) ELF_R_TYPE(rela->r_info),
(void *)rela->r_offset, (void *)*where);
rtems_rtl_set_error (EINVAL,
- "%s: Unsupported relocation type %ld "
+ "%s: Unsupported relocation type %d "
"in non-PLT relocations",
sect->name, (uint32_t) ELF_R_TYPE(rela->r_info));
return false;
diff --git a/cpukit/libdl/rtl-mdreloc-mips.c b/cpukit/libdl/rtl-mdreloc-mips.c
index 4860fdfe72..f01a6552a5 100644
--- a/cpukit/libdl/rtl-mdreloc-mips.c
+++ b/cpukit/libdl/rtl-mdreloc-mips.c
@@ -19,6 +19,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-mdreloc-moxie.c b/cpukit/libdl/rtl-mdreloc-moxie.c
index cc0558eaa5..68fa2d2a16 100644
--- a/cpukit/libdl/rtl-mdreloc-moxie.c
+++ b/cpukit/libdl/rtl-mdreloc-moxie.c
@@ -20,6 +20,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-mdreloc-powerpc.c b/cpukit/libdl/rtl-mdreloc-powerpc.c
index b205ed5215..5c52823a0f 100644
--- a/cpukit/libdl/rtl-mdreloc-powerpc.c
+++ b/cpukit/libdl/rtl-mdreloc-powerpc.c
@@ -13,6 +13,7 @@
#include <sys/stat.h>
#include <rtems/rtl/rtl.h>
+#include "rtl-bit-alloc.h"
#include "rtl-elf.h"
#include "rtl-error.h"
#include <rtems/rtl/rtl-trace.h>
@@ -23,6 +24,57 @@
((u_int32_t)(x) + 0x10000) : (u_int32_t)(x)) >> 16)
#define l(x) ((u_int32_t)(x) & 0xffff)
+/*
+ * SDATA allocator.
+ */
+static rtems_rtl_bit_alloc* sdata;
+
+static Elf_Addr
+get_sda_base (void)
+{
+ uint32_t sda_base;
+ __asm__ volatile (" mr %0, 13\n" : "=r" (sda_base));
+ return sda_base;
+}
+
+/*
+ * Access the variables via asm statements to avoid any fix up issues
+ * generated by the C compiler which thinks they belong in the .sdata
+ * section.
+ */
+
+#define GET_ADDR(_l, _v) \
+ __asm__ volatile (" lis %0, " #_l "@h\n" \
+ " ori %0, %0, " #_l "@l\n" : "=r" (_v))
+
+static void*
+get_sdata_start (void)
+{
+ Elf_Addr addr;
+ GET_ADDR(__SDATA_START__, addr);
+ return (void*) addr;
+}
+
+static size_t
+get_sdata_sbss_size (void)
+{
+ Elf_Addr sdata_begin;
+ Elf_Addr sbss_end;
+ GET_ADDR(bsp_section_sdata_begin, sdata_begin);
+ GET_ADDR(bsp_section_sbss_end, sbss_end);
+ return sbss_end - sdata_begin;
+}
+
+static size_t
+get_sdata_libdl_size (void)
+{
+ Elf_Addr begin;
+ Elf_Addr end;
+ GET_ADDR(bsp_section_sdata_libdl_begin, begin);
+ GET_ADDR(bsp_section_sdata_libdl_end, end);
+ return end - begin;
+}
+
uint32_t
rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
const Elf_Shdr* shdr)
@@ -30,6 +82,75 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ struct {
+ const char* label;
+ size_t len;
+ } prefix[] = {
+ #define SEPARATED_PREFIX(_p) { _p, sizeof (_p) - 1 }
+ SEPARATED_PREFIX (".sdata"),
+ SEPARATED_PREFIX (".sbss"),
+ };
+ const size_t prefixes = sizeof (prefix) / sizeof (prefix[0]);
+ size_t p;
+ for (p = 0; p < prefixes; ++p)
+ {
+ if (strncmp (name, prefix[p].label, prefix[p].len) == 0)
+ return flags | RTEMS_RTL_OBJ_SECT_ARCH_ALLOC;
+ }
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_DETAIL))
+ printf ("rtl: section: arch: alloc: name=%s size=%zu flags=%08" PRIx32 \
+ " order=%i link=%d info=%d\n",
+ sect->name, sect->size, sect->flags, sect->load_order,
+ sect->link, sect->info);
+
+ if (sdata == NULL)
+ {
+ sdata = rtems_rtl_bit_alloc_open (get_sdata_start (),
+ get_sdata_libdl_size (),
+ sizeof (uint32_t),
+ get_sdata_sbss_size ());
+ if (sdata == NULL)
+ {
+ rtems_rtl_set_error (ENOMEM, "no memory for sdata allocator");
+ return false;
+ }
+ }
+
+ sect->base = rtems_rtl_bit_alloc_balloc (sdata, sect->size);
+ if (sect->base == NULL)
+ {
+ rtems_rtl_set_error (ENOMEM, "no .sdata memory: %s", sect->name);
+ return false;
+ }
+
+ return true;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_DETAIL))
+ printf ("rtl: section: arch: free: name=%s size=%zu\n", sect->name, sect->size);
+ if (sdata != NULL)
+ rtems_rtl_bit_alloc_bfree (sdata, sect->base, sect->size);
+ return true;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
@@ -40,35 +161,51 @@ size_t
rtems_rtl_elf_relocate_tramp_max_size (void)
{
/*
- * Disable by returning 0.
+ * We have 4 instructions and each instruction is 32bits.
*/
- return 0;
+ return 4 * 4;
}
-bool
-rtems_rtl_elf_relocate_rela_tramp (rtems_rtl_obj* obj,
- const Elf_Rela* rela,
- const rtems_rtl_obj_sect* sect,
- const char* symname,
- const Elf_Byte syminfo,
- const Elf_Word symvalue)
+static void*
+set_veneer (void* tramopline, Elf_Addr target)
{
- (void) obj;
- (void) rela;
- (void) sect;
- (void) symname;
- (void) syminfo;
- (void) symvalue;
- return true;
+ /*
+ * http://shell-storm.org/online/Online-Assembler-and-Disassembler/
+ *
+ * lis 12,0x1234
+ * ori 12,12,0x5678
+ * mtctr 12
+ * bctr
+ */
+#if COMPILE_ASM
+ asm volatile (" lis 12,0x1234\n" \
+ " ori 12,12,0x5678\n" \
+ " mtctr 12\n" \
+ " bctr\n");
+#endif
+ uint32_t* tramp = (uint32_t*) tramopline;
+ *tramp++ = 0x3d800000 | (target >> 16);
+ *tramp++ = 0x618c0000 | (target & 0xffff);
+ *tramp++ = 0x7d8903a6;
+ *tramp++ = 0x4e800420;
+ return tramp;
}
-bool
-rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
- const Elf_Rela* rela,
- const rtems_rtl_obj_sect* sect,
- const char* symname,
- const Elf_Byte syminfo,
- const Elf_Word symvalue)
+static size_t
+get_veneer_size (int type)
+{
+ (void) type;
+ return rtems_rtl_elf_relocate_tramp_max_size ();
+}
+
+static bool
+rtems_rtl_elf_reloc_rela (rtems_rtl_obj* obj,
+ const Elf_Rela* rela,
+ const rtems_rtl_obj_sect* sect,
+ const char* symname,
+ const Elf_Byte syminfo,
+ const Elf_Word symvalue,
+ const bool parsing)
{
Elf_Addr* where;
Elf_Word tmp;
@@ -84,10 +221,12 @@ rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
/*
* value:1; Field: word32; Expression: S + A
*/
- *where = symvalue + rela->r_addend;
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: ADDR32 %p @ %p in %s\n",
- (void *)*(where), where, rtems_rtl_obj_oname (obj));
+ if (!parsing) {
+ *where = symvalue + rela->r_addend;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: ADDR32 %p @ %p in %s\n",
+ (void *)*(where), where, rtems_rtl_obj_oname (obj));
+ }
break;
case R_TYPE(14):
@@ -107,47 +246,67 @@ rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
}
tmp = (symvalue + rela->r_addend) >> 2;
if (tmp > ((1<<bits) - 1 )) {
- printf("Overflow ADDR14/ADDR24\n");
- return false;
+ Elf_Word tramp_addr;
+ size_t tramp_size = get_veneer_size(ELF_R_TYPE(rela->r_info));
+ if (parsing) {
+ obj->tramp_size += tramp_size;
+ return true;
+ }
+ tramp_addr = (Elf_Addr) obj->tramp_brk;
+ obj->tramp_brk = set_veneer(obj->tramp_brk,
+ symvalue + rela->r_addend);
+ tmp = *where;
+ tmp &= ~mask;
+ tmp |= (tramp_addr + rela->r_addend) & mask;
+ }
+ else {
+ tmp = *where;
+ tmp &= ~mask;
+ tmp |= (symvalue + rela->r_addend) & mask;
+ }
+
+ if (!parsing) {
+ *where = tmp;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: ADDR14/ADDR24 %p @ %p in %s\n",
+ (void *)*where, where, rtems_rtl_obj_oname (obj));
}
- tmp = *where;
- tmp &= ~mask;
- tmp |= (symvalue + rela->r_addend) & mask;
- *where = tmp;
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: ADDR14/ADDR24 %p @ %p in %s\n",
- (void *)*where, where, rtems_rtl_obj_oname (obj));
break;
case R_TYPE(16_HA):
/*
* value:6; Field:half16; Expression: #ha(S+A)
*/
-
- tmp = symvalue + rela->r_addend;
- *(uint16_t *)where = (((tmp >> 16) + ((tmp & 0x8000) ? 1: 0)) & 0xffff);
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: 16_HA %p @ %p in %s\n",
- (void *)*(where), where, rtems_rtl_obj_oname (obj));
+ if (!parsing) {
+ tmp = symvalue + rela->r_addend;
+ *(uint16_t *)where = (((tmp >> 16) + ((tmp & 0x8000) ? 1: 0)) & 0xffff);
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: 16_HA %p @ %p in %s\n",
+ (void *)*(where), where, rtems_rtl_obj_oname (obj));
+ }
break;
case R_TYPE(16_HI):
/*
* value:5; Field:half16; Expression: #hi(S+A)
*/
- *(uint16_t *)where = ((symvalue + rela->r_addend) >> 16) & 0xffff;
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: 16_HI %p @ %p in %s\n",
- (void *)*where, where, rtems_rtl_obj_oname (obj));
+ if (!parsing) {
+ *(uint16_t *)where = ((symvalue + rela->r_addend) >> 16) & 0xffff;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: 16_HI %p @ %p in %s\n",
+ (void *)*where, where, rtems_rtl_obj_oname (obj));
+ }
break;
case R_TYPE(16_LO):
/*
* value:4; Field:half16; Expression: #lo(S+A)
*/
- *(uint16_t *)where = (symvalue + (rela->r_addend)) & 0xffff;
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: 16_LO %p @ %p in %s\n",
- (void *)*where, where, rtems_rtl_obj_oname (obj));
+ if (!parsing) {
+ *(uint16_t *)where = (symvalue + (rela->r_addend)) & 0xffff;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: 16_LO %p @ %p in %s\n",
+ (void *)*where, where, rtems_rtl_obj_oname (obj));
+ }
break;
case R_TYPE(REL14):
@@ -170,27 +329,44 @@ rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
tmp =((int) (symvalue + rela->r_addend - (Elf_Addr)where)) >> 2;
if (((Elf_Sword)tmp > ((1<<(bits-1)) - 1)) ||
((Elf_Sword)tmp < -(1<<(bits-1)))) {
- printf("Overflow REL14/REL24\n");
- return false;
+ Elf_Word tramp_addr;
+ size_t tramp_size = get_veneer_size(ELF_R_TYPE(rela->r_info));
+ if (parsing) {
+ obj->tramp_size += tramp_size;
+ return true;
+ }
+ tramp_addr = (Elf_Addr) obj->tramp_brk;
+ obj->tramp_brk = set_veneer(obj->tramp_brk,
+ symvalue + rela->r_addend);
+ tmp = *where;
+ tmp &= ~mask;
+ tmp |= (tramp_addr + rela->r_addend - (Elf_Addr)where) & mask;
+ }
+ else
+ {
+ tmp = *where;
+ tmp &= ~mask;
+ tmp |= (symvalue + rela->r_addend - (Elf_Addr)where) & mask;
}
- tmp = *where;
- tmp &= ~mask;
- tmp |= (symvalue + rela->r_addend - (Elf_Addr)where) & mask;
- *where = tmp;
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: REL24/REL14 %p @ %p in %s\n",
- (void *)*where, where, rtems_rtl_obj_oname (obj));
+ if (!parsing) {
+ *where = tmp;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: REL24/REL14 %p @ %p in %s\n",
+ (void *)*where, where, rtems_rtl_obj_oname (obj));
+ }
break;
case R_TYPE(REL32):
/*
* value:26; Field:word32*; Expression:S+A-P
*/
- *where = symvalue + rela->r_addend - (Elf_Addr)where;
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: REL32 %p @ %p in %s\n",
- (void *)*where, where, rtems_rtl_obj_oname (obj));
+ if (!parsing) {
+ *where = symvalue + rela->r_addend - (Elf_Addr)where;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: REL32 %p @ %p in %s\n",
+ (void *)*where, where, rtems_rtl_obj_oname (obj));
+ }
break;
case R_TYPE(SDAREL16):
@@ -198,19 +374,22 @@ rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
* A sign-extended 16 bit value relative to _SDA_BASE_, for use with
* small data items.
*/
- mask = 0xffff;
- tmp = *((Elf32_Half*) where);
- tmp &= ~mask;
- tmp |= (symvalue + rela->r_addend - (Elf_Addr)where) & mask;
- *((Elf32_Half*) where) = tmp;
- if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
- printf ("rtl: SDAREL16 %p @ %p in %s\n",
- (void *) (uintptr_t) *((Elf32_Half*) where),
- where, rtems_rtl_obj_oname (obj));
+ if (!parsing) {
+ Elf_Addr sda_base = get_sda_base ();
+ mask = 0xffff;
+ tmp = *((Elf32_Half*) where);
+ tmp &= ~mask;
+ tmp |= (symvalue + rela->r_addend - sda_base) & mask;
+ *((Elf32_Half*) where) = tmp;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))
+ printf ("rtl: SDAREL16 %p @ %p in %s\n",
+ (void *) (uintptr_t) *((Elf32_Half*) where),
+ where, rtems_rtl_obj_oname (obj));
+ }
break;
default:
- printf ("rtl: reloc unknown: sym = %lu, type = %" PRIu32 ", offset = %p, "
+ printf ("rtl: reloc unknown: sym = %" PRIu32 ", type = %" PRIu32 ", offset = %p, "
"contents = %p\n",
ELF_R_SYM(rela->r_info), (uint32_t) ELF_R_TYPE(rela->r_info),
(void *)rela->r_offset, (void *)*where);
@@ -223,6 +402,40 @@ rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
return true;
}
+bool
+rtems_rtl_elf_relocate_rela_tramp (rtems_rtl_obj* obj,
+ const Elf_Rela* rela,
+ const rtems_rtl_obj_sect* sect,
+ const char* symname,
+ const Elf_Byte syminfo,
+ const Elf_Word symvalue)
+{
+ return rtems_rtl_elf_reloc_rela (obj,
+ rela,
+ sect,
+ symname,
+ syminfo,
+ symvalue,
+ true);
+}
+
+bool
+rtems_rtl_elf_relocate_rela (rtems_rtl_obj* obj,
+ const Elf_Rela* rela,
+ const rtems_rtl_obj_sect* sect,
+ const char* symname,
+ const Elf_Byte syminfo,
+ const Elf_Word symvalue)
+{
+ return rtems_rtl_elf_reloc_rela (obj,
+ rela,
+ sect,
+ symname,
+ syminfo,
+ symvalue,
+ false);
+}
+
bool
rtems_rtl_elf_relocate_rel_tramp (rtems_rtl_obj* obj,
const Elf_Rel* rel,
diff --git a/cpukit/libdl/rtl-mdreloc-sparc.c b/cpukit/libdl/rtl-mdreloc-sparc.c
index bc05392659..f76da575e4 100644
--- a/cpukit/libdl/rtl-mdreloc-sparc.c
+++ b/cpukit/libdl/rtl-mdreloc-sparc.c
@@ -138,6 +138,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-mdreloc-v850.c b/cpukit/libdl/rtl-mdreloc-v850.c
index 2aca5e0270..93e531b40e 100644
--- a/cpukit/libdl/rtl-mdreloc-v850.c
+++ b/cpukit/libdl/rtl-mdreloc-v850.c
@@ -20,6 +20,38 @@ rtems_rtl_elf_section_flags (const rtems_rtl_obj* obj,
return 0;
}
+uint32_t
+rtems_rtl_elf_arch_parse_section (const rtems_rtl_obj* obj,
+ int section,
+ const char* name,
+ const Elf_Shdr* shdr,
+ const uint32_t flags)
+{
+ (void) obj;
+ (void) section;
+ (void) name;
+ (void) shdr;
+ return flags;
+}
+
+bool
+rtems_rtl_elf_arch_section_alloc (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
+bool
+rtems_rtl_elf_arch_section_free (const rtems_rtl_obj* obj,
+ rtems_rtl_obj_sect* sect)
+{
+ (void) obj;
+ (void) sect;
+ return false;
+}
+
bool
rtems_rtl_elf_rel_resolve_sym (Elf_Word type)
{
diff --git a/cpukit/libdl/rtl-obj.c b/cpukit/libdl/rtl-obj.c
index 0a7763b3b2..15e5bf1137 100644
--- a/cpukit/libdl/rtl-obj.c
+++ b/cpukit/libdl/rtl-obj.c
@@ -300,11 +300,14 @@ typedef struct
static bool
rtems_rtl_obj_sect_summer (rtems_chain_node* node, void* data)
{
- rtems_rtl_obj_sect* sect = (rtems_rtl_obj_sect*) node;
- rtems_rtl_obj_sect_summer_data* summer = data;
- if ((sect->flags & summer->mask) == summer->mask)
- summer->size =
- rtems_rtl_obj_align (summer->size, sect->alignment) + sect->size;
+ rtems_rtl_obj_sect* sect = (rtems_rtl_obj_sect*) node;
+ if ((sect->flags & RTEMS_RTL_OBJ_SECT_ARCH_ALLOC) == 0)
+ {
+ rtems_rtl_obj_sect_summer_data* summer = data;
+ if ((sect->flags & summer->mask) == summer->mask)
+ summer->size =
+ rtems_rtl_obj_align (summer->size, sect->alignment) + sect->size;
+ }
return true;
}
@@ -821,7 +824,9 @@ rtems_rtl_obj_relocate (rtems_rtl_obj* obj,
const uint32_t flags = (RTEMS_RTL_OBJ_SECT_LOAD |
RTEMS_RTL_OBJ_SECT_REL |
RTEMS_RTL_OBJ_SECT_RELA);
- return rtems_rtl_obj_section_handler (flags, obj, fd, handler, data);
+ bool r = rtems_rtl_obj_section_handler (flags, obj, fd, handler, data);
+ rtems_rtl_obj_update_flags (RTEMS_RTL_OBJ_RELOC_TAG, 0);
+ return r;
}
/**
@@ -993,7 +998,7 @@ rtems_rtl_obj_sections_link_order (uint32_t mask, rtems_rtl_obj* obj)
}
}
-static size_t
+static bool
rtems_rtl_obj_sections_loader (uint32_t mask,
rtems_rtl_obj* obj,
int fd,
@@ -1004,26 +1009,27 @@ rtems_rtl_obj_sections_loader (uint32_t mask,
rtems_chain_control* sections = &obj->sections;
rtems_chain_node* node = rtems_chain_first (sections);
size_t base_offset = 0;
- bool first = true;
int order = 0;
+ if (rtems_rtl_trace (RTEMS_RTL_TRACE_LOAD_SECT))
+ printf ("rtl: loading section: mask:%08" PRIx32 " base:%p\n", mask, base);
+
while (!rtems_chain_is_tail (sections, node))
{
rtems_rtl_obj_sect* sect = (rtems_rtl_obj_sect*) node;
- if ((sect->size != 0) && ((sect->flags & mask) != 0))
+ if ((sect->size != 0) && ((sect->flags & mask) == mask))
{
if (sect->load_order == order)
{
- if (!first)
+ if ((sect->flags & RTEMS_RTL_OBJ_SECT_ARCH_ALLOC) == 0)
+ {
base_offset = rtems_rtl_obj_align (base_offset, sect->alignment);
-
- first = false;
-
- sect->base = base + base_offset;
+ sect->base = base + base_offset;
+ }
if (rtems_rtl_trace (RTEMS_RTL_TRACE_LOAD_SECT))
- printf ("rtl: loading:%2d: %s -> %8p (s:%zi f:%04" PRIx32
+ printf ("rtl: loading:%2d: %s -> %p (s:%zi f:%04" PRIx32
" a:%" PRIu32 " l:%02d)\n",
order, sect->name, sect->base, sect->size,
sect->flags, sect->alignment, sect->link);
@@ -1038,7 +1044,7 @@ rtems_rtl_obj_sections_loader (uint32_t mask,
}
else if ((sect->flags & RTEMS_RTL_OBJ_SECT_ZERO) == RTEMS_RTL_OBJ_SECT_ZERO)
{
- memset (base + base_offset, 0, sect->size);
+ memset (sect->base, 0, sect->size);
}
else
{
@@ -1065,10 +1071,10 @@ rtems_rtl_obj_sections_loader (uint32_t mask,
}
bool
-rtems_rtl_obj_load_sections (rtems_rtl_obj* obj,
- int fd,
- rtems_rtl_obj_sect_handler handler,
- void* data)
+rtems_rtl_obj_alloc_sections (rtems_rtl_obj* obj,
+ int fd,
+ rtems_rtl_obj_sect_handler handler,
+ void* data)
{
size_t text_size;
size_t const_size;
@@ -1091,6 +1097,22 @@ rtems_rtl_obj_load_sections (rtems_rtl_obj* obj,
obj->eh_size = eh_size;
obj->bss_size = bss_size;
+ /*
+ * Perform any specific allocations for sections.
+ */
+ if (handler != NULL)
+ {
+ if (!rtems_rtl_obj_section_handler (RTEMS_RTL_OBJ_SECT_TYPES,
+ obj,
+ fd,
+ handler,
+ data))
+ {
+ obj->exec_size = 0;
+ return false;
+ }
+ }
+
/*
* Let the allocator manage the actual allocation. The user can use the
* standard heap or provide a specific allocator with memory protection.
@@ -1129,10 +1151,21 @@ rtems_rtl_obj_load_sections (rtems_rtl_obj* obj,
rtems_rtl_obj_sections_link_order (RTEMS_RTL_OBJ_SECT_CONST, obj);
rtems_rtl_obj_sections_link_order (RTEMS_RTL_OBJ_SECT_EH, obj);
rtems_rtl_obj_sections_link_order (RTEMS_RTL_OBJ_SECT_DATA, obj);
+ rtems_rtl_obj_sections_link_order (RTEMS_RTL_OBJ_SECT_BSS, obj);
+ return true;
+}
+
+bool
+rtems_rtl_obj_load_sections (rtems_rtl_obj* obj,
+ int fd,
+ rtems_rtl_obj_sect_handler handler,
+ void* data)
+{
/*
- * Load all text then data then bss sections in seperate operations so each
- * type of section is grouped together.
+ * Load all text, data and bsssections in seperate operations so each type of
+ * section is grouped together. Finish by loading any architecure specific
+ * sections.
*/
if (!rtems_rtl_obj_sections_loader (RTEMS_RTL_OBJ_SECT_TEXT,
obj, fd, obj->text_base, handler, data) ||
diff --git a/cpukit/libdl/rtl-shell.c b/cpukit/libdl/rtl-shell.c
index ab5553174b..7458fb5608 100644
--- a/cpukit/libdl/rtl-shell.c
+++ b/cpukit/libdl/rtl-shell.c
@@ -175,7 +175,7 @@ rtems_rtl_dependencies (rtems_rtl_obj* obj,
{
rtems_rtl_dep_data* dd = (rtems_rtl_dep_data*) data;
if (!dd->first)
- printf ("\n%-*c: ", dd->indent, ' ');
+ printf ("\n%-*c: ", (int) dd->indent, ' ');
else
dd->first = false;
printf ("%s", dependent->oname);
diff --git a/cpukit/libdl/rtl-unresolved.c b/cpukit/libdl/rtl-unresolved.c
index 0e70c5dacf..7ee572c351 100644
--- a/cpukit/libdl/rtl-unresolved.c
+++ b/cpukit/libdl/rtl-unresolved.c
@@ -700,7 +700,7 @@ rtems_rtl_unresolved_dump_iterator (rtems_rtl_unresolv_rec* rec,
break;
case rtems_rtl_unresolved_symbol:
++dd->names;
- printf (" %3zu: 1: name: %3d refs:%4d: flags:%04x %s (%d)\n",
+ printf (" %3zu: 1: name: %3zu refs:%4d: flags:%04x %s (%d)\n",
dd->rec, dd->names,
rec->rec.name.refs,
rec->rec.name.flags,
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 <rtems/rtl/rtl-shell.h>
#include <rtems/rtl/rtl-trace.h>
-#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 <rtems/test.h>
-#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 <chrisj at rtems.org>. 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 <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <rtems.h>
+#include <rtems/dumpbuf.h>
+
+#include <rtems/rtl/rtl.h>
+#include <rtems/rtl/rtl-trace.h>
+
+#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 <chrisj at rtems.org>. 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 <unistd.h>
#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 <dlfcn.h>
@@ -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;
}
--
2.19.1
More information about the devel
mailing list