diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-02-02 12:03:38 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2016-02-18 09:45:39 +0000 |
| commit | f0dd061ae64deb016b5197162de3896155816b41 (patch) | |
| tree | 557697a381aa562ab14c2521db81d00b78008e58 /common | |
| parent | 4a9663062cef254e79189e4fbde85172eb58f9ce (diff) | |
Add support for %p in tf_printf()
This patch adds support for the `%p` format specifier in tf_printf()
following the example of the printf implementation of the stdlib used
in the trusted firmware.
Fixes ARM-software/tf-issues#292
Change-Id: I0b3230c783f735d3e039be25a9405f00023420da
Diffstat (limited to 'common')
| -rw-r--r-- | common/bl_common.c | 15 | ||||
| -rw-r--r-- | common/tf_printf.c | 9 |
2 files changed, 17 insertions, 7 deletions
diff --git a/common/bl_common.c b/common/bl_common.c index 0eeef83f..d5b095aa 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -229,7 +229,8 @@ int load_image(meminfo_t *mem_layout, return io_result; } - INFO("Loading image id=%u at address 0x%lx\n", image_id, image_base); + INFO("Loading image id=%u at address %p\n", image_id, + (void *) image_base); /* Find the size of the image */ io_result = io_size(image_handle, &image_size); @@ -242,8 +243,8 @@ int load_image(meminfo_t *mem_layout, /* Check that the memory where the image will be loaded is free */ if (!is_mem_free(mem_layout->free_base, mem_layout->free_size, image_base, image_size)) { - WARN("Failed to reserve memory: 0x%lx - 0x%lx\n", - image_base, image_base + image_size); + WARN("Failed to reserve memory: %p - %p\n", (void *) image_base, + (void *) (image_base + image_size)); dump_load_info(image_base, image_size, mem_layout); io_result = -ENOMEM; goto exit; @@ -268,8 +269,8 @@ int load_image(meminfo_t *mem_layout, reserve_mem(&mem_layout->free_base, &mem_layout->free_size, image_base, image_size); } else { - INFO("Skip reserving memory: 0x%lx - 0x%lx\n", - image_base, image_base + image_size); + INFO("Skip reserving memory: %p - %p\n", (void *) image_base, + (void *) (image_base + image_size)); } image_data->image_base = image_base; @@ -284,8 +285,8 @@ int load_image(meminfo_t *mem_layout, */ flush_dcache_range(image_base, image_size); - INFO("Image id=%u loaded: 0x%lx - 0x%lx\n", image_id, image_base, - image_base + image_size); + INFO("Image id=%u loaded: %p - %p\n", image_id, (void *) image_base, + (void *) (image_base + image_size)); exit: io_close(image_handle); diff --git a/common/tf_printf.c b/common/tf_printf.c index c68b9904..c1d41889 100644 --- a/common/tf_printf.c +++ b/common/tf_printf.c @@ -68,6 +68,7 @@ static void string_print(const char *str) * %u - unsigned 32 bit decimal format * %ld and %lld - signed 64 bit decimal format * %lu and %llu - unsigned 64 bit decimal format + * %p - pointer format * Exits on all other formats. *******************************************************************/ @@ -107,6 +108,14 @@ loop: str = va_arg(args, char *); string_print(str); break; + case 'p': + unum = (uint64_t)va_arg(args, void *); + + if (unum) + string_print("0x"); + + unsigned_num_print(unum, 16); + break; case 'x': if (bit64) unum = va_arg(args, uint64_t); |