organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

ICU-3006 Allow %p to handle >64-bit pointers.

Browse source 
X-SVN-Rev: 15365
This commit is contained in:
George Rhoten 2004-05-18 05:19:56 +00:00
parent effc7f87fe
commit 8096f83829
3 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
icu4c/source/io/ufmt_cmn.c
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1998-2003, International Business Machines
* Copyright (C) 1998-2004, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -56,8 +56,8 @@ ufmt_isdigit(UChar c,
return (UBool)(digitVal < radix && digitVal >= 0);
}
#define TO_UC_DIGIT(a) a <= 9 ? (0x0030 + a) : (0x0030 + a + 7)
#define TO_LC_DIGIT(a) a <= 9 ? (0x0030 + a) : (0x0030 + a + 39)
#define TO_UC_DIGIT(a) a <= 9 ? (0x0030 + a) : (0x0037 + a)
#define TO_LC_DIGIT(a) a <= 9 ? (0x0030 + a) : (0x0057 + a)
void
ufmt_64tou(UChar *buffer,
@ -96,6 +96,38 @@ ufmt_64tou(UChar *buffer,
*len = length;
}
void
ufmt_ptou(UChar *buffer,
int32_t *len,
void *value,
UBool uselower)
{
int32_t i;
int32_t length = 0;
uint8_t *ptrIdx = (uint8_t *)&value;
#if U_IS_BIG_ENDIAN
for (i = 0; i < (int32_t)sizeof(void *); i++)
#else
for (i = (int32_t)sizeof(void *)-1; i >= 0 ; i--)
#endif
{
uint8_t byteVal = ptrIdx[i];
uint16_t firstNibble = (uint16_t)(byteVal>>4);
uint16_t secondNibble = (uint16_t)(byteVal&0xF);
if (uselower) {
buffer[length++]=TO_LC_DIGIT(firstNibble);
buffer[length++]=TO_LC_DIGIT(secondNibble);
}
else {
buffer[length++]=TO_UC_DIGIT(firstNibble);
buffer[length++]=TO_UC_DIGIT(secondNibble);
}
}
*len = length;
}
int64_t
ufmt_uto64(const UChar *buffer,
int32_t *len,

16
icu4c/source/io/ufmt_cmn.h
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1998-2003, International Business Machines
* Copyright (C) 1998-2004, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -104,6 +104,17 @@ ufmt_64tou(UChar *buffer,
UBool uselower,
int32_t minDigits);
/**
* It's like ufmt_64tou, but with a pointer.
* This functions avoids size constraints of 64-bit types.
* Pointers can be at 32-128 bits in size.
*/
void
ufmt_ptou(UChar *buffer,
int32_t *len,
void *value,
UBool uselower);
/**
* Convert a UChar* in a specified radix to a long.
* @param buffer The target buffer
@ -144,6 +155,3 @@ ufmt_unicodeToDefaultCP(const UChar *s,
#endif

10
icu4c/source/io/uprntf_p.c
View file

@ -551,17 +551,11 @@ u_printf_pointer_handler(const u_printf_stream_handler *handler,
const u_printf_spec_info *info,
const ufmt_args *args)
{
uint64_t num = (uint64_t)args[0].ptrValue;
UChar result[UPRINTF_BUFFER_SIZE];
int32_t len = UPRINTF_BUFFER_SIZE;
if (sizeof(void*)==sizeof(int32_t)) {
num &= UINT32_MAX;
}
int32_t len = UPRINTF_BUFFER_SIZE;
/* format the pointer in hex */
ufmt_64tou(result, &len, num, 16, TRUE, info->fPrecision);
ufmt_ptou(result, &len, args[0].ptrValue, TRUE/*, info->fPrecision*/);
return handler->pad_and_justify(context, info, result, len);
}