andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #530 from antonio-nino-diaz-arm/an/p_printf 

Add support for %p in tf_printf()
This commit is contained in:
danh-arm 2016-02-18 18:35:37 +00:00
parent 84d1099f31 f0dd061ae6
commit 879599076e
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bl31/runtime_svc.c
View File

@ -103,8 +103,8 @@ void runtime_svc_init(void)
*/
rc = validate_rt_svc_desc(&rt_svc_descs[index]);
if (rc) {
ERROR("Invalid runtime service descriptor 0x%lx (%s)\n",
(uintptr_t) &rt_svc_descs[index],
ERROR("Invalid runtime service descriptor %p (%s)\n",
(void *) &rt_svc_descs[index],
rt_svc_descs[index].name);
goto error;
}

15
common/bl_common.c
View File

@ -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);

9
common/tf_printf.c
View File

@ -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);

4
drivers/arm/gic/gic_v3.c
View File

@ -60,8 +60,8 @@ uintptr_t gicv3_get_rdist(uintptr_t gicr_base, uint64_t mpidr)
/* Disable this print for now as it appears every time
* when using PSCI CPU_SUSPEND.
* TODO: Print this only the first time for each CPU.
* INFO("GICv3 - Found RDIST for MPIDR(0x%lx) at 0x%lx\n",
* mpidr, addr);
* INFO("GICv3 - Found RDIST for MPIDR(0x%lx) at %p\n",
* mpidr, (void *) addr);
*/
return addr;
}