Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Differentiate long and long long formats in tf_printf

Browse source 
This patch adds support to differentiate between `long` and `long long`
format specifiers in tf_printf(). In AArch64, they are the same which is
a 64-bit word. But, in AArch32 they are different and tf_printf() needs
to handle these format specifiers separately. This patch also fixes the
type of variables used to generic C types.

Change-Id: If3bbb0245cd0183acbe13bc1fe0d9743f417578f
This commit is contained in:
Soby Mathew 2016-03-22 17:38:00 +00:00
parent 7a0ae2f457
commit f2f5a7bd18
1 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
common/tf_printf.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -34,7 +34,22 @@
/*********************************************************** /***********************************************************
* The tf_printf implementation for all BL stages * The tf_printf implementation for all BL stages
***********************************************************/ ***********************************************************/
static void unsigned_num_print(unsigned long int unum, unsigned int radix)
#define get_num_va_args(args, lcount) \
(((lcount) > 1) ? va_arg(args, long long int) : \
((lcount) ? va_arg(args, long int) : va_arg(args, int)))
#define get_unum_va_args(args, lcount) \
(((lcount) > 1) ? va_arg(args, unsigned long long int) : \
((lcount) ? va_arg(args, unsigned long int) : va_arg(args, unsigned int)))
static void string_print(const char *str)
{
while (*str)
putchar(*str++);
}
static void unsigned_num_print(unsigned long long int unum, unsigned int radix)
{ {
/* Just need enough space to store 64 bit decimal integer */ /* Just need enough space to store 64 bit decimal integer */
unsigned char num_buf[20]; unsigned char num_buf[20];
@ -52,38 +67,34 @@ static void unsigned_num_print(unsigned long int unum, unsigned int radix)
putchar(num_buf[i]); putchar(num_buf[i]);
} }
static void string_print(const char *str)
{
while (*str)
putchar(*str++);
}
/******************************************************************* /*******************************************************************
* Reduced format print for Trusted firmware. * Reduced format print for Trusted firmware.
* The following formats are supported by this print * The following type specifiers are supported by this print
* %x - 32 bit hexadecimal format * %x - hexadecimal format
* %llx and %lx -64 bit hexadecimal format
* %s - string format * %s - string format
* %d or %i - signed 32 bit decimal format * %d or %i - signed decimal format
* %u - unsigned 32 bit decimal format * %u - unsigned decimal format
* %ld and %lld - signed 64 bit decimal format
* %lu and %llu - unsigned 64 bit decimal format
* %p - pointer format * %p - pointer format
* %z - size_t format *
* Exits on all other formats. * The following length specifiers are supported by this print
* %l - long int (64-bit on AArch64)
* %ll - long long int (64-bit on AArch64)
* %z - size_t sized integer formats (64 bit on AArch64)
*
* The print exits on all other formats specifiers other than valid
* combinations of the above specifiers.
*******************************************************************/ *******************************************************************/
void tf_printf(const char *fmt, ...) void tf_printf(const char *fmt, ...)
{ {
va_list args; va_list args;
int bit64; int l_count;
int64_t num; long long int num;
uint64_t unum; unsigned long long int unum;
char *str; char *str;
va_start(args, fmt); va_start(args, fmt);
while (*fmt) { while (*fmt) {
bit64 = 0; l_count = 0;
if (*fmt == '%') { if (*fmt == '%') {
fmt++; fmt++;
@ -92,16 +103,12 @@ loop:
switch (*fmt) { switch (*fmt) {
case 'i': /* Fall through to next one */ case 'i': /* Fall through to next one */
case 'd': case 'd':
if (bit64) num = get_num_va_args(args, l_count);
num = va_arg(args, int64_t);
else
num = va_arg(args, int32_t);
if (num < 0) { if (num < 0) {
putchar('-'); putchar('-');
unum = (unsigned long int)-num; unum = (unsigned long long int)-num;
} else } else
unum = (unsigned long int)num; unum = (unsigned long long int)num;
unsigned_num_print(unum, 10); unsigned_num_print(unum, 10);
break; break;
@ -110,36 +117,28 @@ loop:
string_print(str); string_print(str);
break; break;
case 'p': case 'p':
unum = (uint64_t)va_arg(args, void *); unum = (uintptr_t)va_arg(args, void *);
if (unum) if (unum)
string_print("0x"); string_print("0x");
unsigned_num_print(unum, 16); unsigned_num_print(unum, 16);
break; break;
case 'x': case 'x':
if (bit64) unum = get_unum_va_args(args, l_count);
unum = va_arg(args, uint64_t);
else
unum = va_arg(args, uint32_t);
unsigned_num_print(unum, 16); unsigned_num_print(unum, 16);
break; break;
case 'z': case 'z':
if (sizeof(size_t) == 8) if (sizeof(size_t) == 8)
bit64 = 1; l_count = 2;
fmt++; fmt++;
goto loop; goto loop;
case 'l': case 'l':
bit64 = 1; l_count++;
fmt++; fmt++;
goto loop; goto loop;
case 'u': case 'u':
if (bit64) unum = get_unum_va_args(args, l_count);
unum = va_arg(args, uint64_t);
else
unum = va_arg(args, uint32_t);
unsigned_num_print(unum, 10); unsigned_num_print(unum, 10);
break; break;
default: default: