tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix icu4c calling on x86."

Browse source 
am: 227894a754

Change-Id: I9056c55824c2eeba6ce4cb6119d7c7aaa1973fe3
This commit is contained in:
Elliott Hughes 2016-12-09 02:15:37 +00:00 committed by android-build-merger
commit 5fb3a092d6
3 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libc/bionic/wctype.cpp
View file

@ -36,20 +36,8 @@
#include "private/icu.h" #include "private/icu.h"
static constexpr int UCHAR_ALPHABETIC = 0; static bool __icu_hasBinaryProperty(wint_t wc, UProperty property, int (*fallback)(int)) {
static constexpr int UCHAR_LOWERCASE = 22; typedef UBool (*FnT)(UChar32, UProperty);
static constexpr int UCHAR_POSIX_ALNUM = 44;
static constexpr int UCHAR_POSIX_BLANK = 45;
static constexpr int UCHAR_POSIX_GRAPH = 46;
static constexpr int UCHAR_POSIX_PRINT = 47;
static constexpr int UCHAR_POSIX_XDIGIT = 48;
static constexpr int UCHAR_UPPERCASE = 30;
static constexpr int UCHAR_WHITE_SPACE = 31;
static constexpr int U_CONTROL_CHAR = 15;
static bool __icu_hasBinaryProperty(wint_t wc, int property, int (*fallback)(int)) {
typedef int (*FnT)(wint_t, int);
static auto u_hasBinaryProperty = reinterpret_cast<FnT>(__find_icu_symbol("u_hasBinaryProperty")); static auto u_hasBinaryProperty = reinterpret_cast<FnT>(__find_icu_symbol("u_hasBinaryProperty"));
return u_hasBinaryProperty ? u_hasBinaryProperty(wc, property) : fallback(wc); return u_hasBinaryProperty ? u_hasBinaryProperty(wc, property) : fallback(wc);
} }
@ -65,19 +53,19 @@ int iswupper(wint_t wc) { return __icu_hasBinaryProperty(wc, UCHAR_UPPERCASE, is
int iswxdigit(wint_t wc) { return __icu_hasBinaryProperty(wc, UCHAR_POSIX_XDIGIT, isxdigit); } int iswxdigit(wint_t wc) { return __icu_hasBinaryProperty(wc, UCHAR_POSIX_XDIGIT, isxdigit); }
int iswcntrl(wint_t wc) { int iswcntrl(wint_t wc) {
typedef int (*FnT)(wint_t); typedef int8_t (*FnT)(UChar32);
static auto u_charType = reinterpret_cast<FnT>(__find_icu_symbol("u_charType")); static auto u_charType = reinterpret_cast<FnT>(__find_icu_symbol("u_charType"));
return u_charType ? (u_charType(wc) == U_CONTROL_CHAR) : iscntrl(wc); return u_charType ? (u_charType(wc) == U_CONTROL_CHAR) : iscntrl(wc);
} }
int iswdigit(wint_t wc) { int iswdigit(wint_t wc) {
typedef int (*FnT)(wint_t); typedef UBool (*FnT)(UChar32);
static auto u_isdigit = reinterpret_cast<FnT>(__find_icu_symbol("u_isdigit")); static auto u_isdigit = reinterpret_cast<FnT>(__find_icu_symbol("u_isdigit"));
return u_isdigit ? u_isdigit(wc) : isdigit(wc); return u_isdigit ? u_isdigit(wc) : isdigit(wc);
} }
int iswpunct(wint_t wc) { int iswpunct(wint_t wc) {
typedef int (*FnT)(wint_t); typedef UBool (*FnT)(UChar32);
static auto u_ispunct = reinterpret_cast<FnT>(__find_icu_symbol("u_ispunct")); static auto u_ispunct = reinterpret_cast<FnT>(__find_icu_symbol("u_ispunct"));
return u_ispunct ? u_ispunct(wc) : ispunct(wc); return u_ispunct ? u_ispunct(wc) : ispunct(wc);
} }
@ -118,13 +106,13 @@ int iswctype_l(wint_t wc, wctype_t char_class, locale_t) {
} }
wint_t towlower(wint_t wc) { wint_t towlower(wint_t wc) {
typedef wchar_t (*FnT)(wchar_t); typedef UChar32 (*FnT)(UChar32);
static auto u_tolower = reinterpret_cast<FnT>(__find_icu_symbol("u_tolower")); static auto u_tolower = reinterpret_cast<FnT>(__find_icu_symbol("u_tolower"));
return u_tolower ? u_tolower(wc) : tolower(wc); return u_tolower ? u_tolower(wc) : tolower(wc);
} }
wint_t towupper(wint_t wc) { wint_t towupper(wint_t wc) {
typedef wchar_t (*FnT)(wchar_t); typedef UChar32 (*FnT)(UChar32);
static auto u_toupper = reinterpret_cast<FnT>(__find_icu_symbol("u_toupper")); static auto u_toupper = reinterpret_cast<FnT>(__find_icu_symbol("u_toupper"));
return u_toupper ? u_toupper(wc) : toupper(wc); return u_toupper ? u_toupper(wc) : toupper(wc);
} }

21
libc/private/icu.h
View file

@ -29,6 +29,27 @@
#ifndef _PRIVATE_ICU_H #ifndef _PRIVATE_ICU_H
#define _PRIVATE_ICU_H #define _PRIVATE_ICU_H
#include <stdint.h>
typedef int8_t UBool;
typedef int32_t UChar32;
enum UProperty {
UCHAR_ALPHABETIC = 0,
UCHAR_LOWERCASE = 22,
UCHAR_POSIX_ALNUM = 44,
UCHAR_POSIX_BLANK = 45,
UCHAR_POSIX_GRAPH = 46,
UCHAR_POSIX_PRINT = 47,
UCHAR_POSIX_XDIGIT = 48,
UCHAR_UPPERCASE = 30,
UCHAR_WHITE_SPACE = 31,
};
enum UCharCategory {
U_CONTROL_CHAR = 15,
};
void* __find_icu_symbol(const char* symbol_name); void* __find_icu_symbol(const char* symbol_name);
#endif // _PRIVATE_ICU_H #endif // _PRIVATE_ICU_H

8
tests/inttypes_test.cpp
View file

@ -98,11 +98,15 @@ TEST(inttypes, scanf_macros) {
} }
TEST(inttypes, wcstoimax) { TEST(inttypes, wcstoimax) {
ASSERT_EQ(123, wcstoimax(L"123", NULL, 10)); wchar_t* end = nullptr;
EXPECT_EQ(123, wcstoimax(L" +123x", &end, 10));
EXPECT_EQ(L'x', *end);
} }
TEST(inttypes, wcstoumax) { TEST(inttypes, wcstoumax) {
ASSERT_EQ(123U, wcstoumax(L"123", NULL, 10)); wchar_t* end = nullptr;
EXPECT_EQ(123U, wcstoumax(L" +123x", &end, 10));
EXPECT_EQ(L'x', *end);
} }
TEST(inttypes, strtoimax_EINVAL) { TEST(inttypes, strtoimax_EINVAL) {