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

Merge "Optimize the mbs fast path slightly."

Browse source
This commit is contained in:
Elliott Hughes 2021-11-16 22:13:01 +00:00 committed by Gerrit Code Review
commit afd8fc3f35
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/c16rtomb.cpp
View file

@ -43,7 +43,7 @@ static inline constexpr bool is_low_surrogate(char16_t c16) {
size_t c16rtomb(char* s, char16_t c16, mbstate_t* ps) {
static mbstate_t __private_state;
mbstate_t* state = (ps == nullptr) ? &__private_state : ps;
if (mbsinit(state)) {
if (mbstate_is_initial(state)) {
if (is_high_surrogate(c16)) {
char32_t c32 = (c16 & ~0xd800) << 10;
mbstate_set_byte(state, 3, (c32 & 0xff0000) >> 16);

2
libc/bionic/c32rtomb.cpp
View file

@ -50,7 +50,7 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps) {
return mbstate_reset_and_return(1, state);
}
if (!mbsinit(state)) {
if (!mbstate_is_initial(state)) {
return mbstate_reset_and_return_illegal(EILSEQ, state);
}

4
libc/bionic/mbrtoc32.cpp
View file

@ -55,7 +55,7 @@ size_t mbrtoc32(char32_t* pc32, const char* s, size_t n, mbstate_t* ps) {
}
uint8_t ch;
if (mbsinit(state) && (((ch = static_cast<uint8_t>(*s)) & ~0x7f) == 0)) {
if (mbstate_is_initial(state) && (((ch = static_cast<uint8_t>(*s)) & ~0x7f) == 0)) {
// Fast path for plain ASCII characters.
if (pc32 != nullptr) {
*pc32 = ch;
@ -105,7 +105,7 @@ size_t mbrtoc32(char32_t* pc32, const char* s, size_t n, mbstate_t* ps) {
size_t bytes_wanted = length - bytes_so_far;
size_t i;
for (i = 0; i < MIN(bytes_wanted, n); i++) {
if (!mbsinit(state) && ((*s & 0xc0) != 0x80)) {
if (!mbstate_is_initial(state) && ((*s & 0xc0) != 0x80)) {
// Malformed input; bad characters in the middle of a character.
return mbstate_reset_and_return_illegal(EILSEQ, state);
}

4
libc/bionic/wchar.cpp
View file

@ -54,7 +54,7 @@
//
int mbsinit(const mbstate_t* ps) {
return (ps == nullptr || (*(reinterpret_cast<const uint32_t*>(ps->__seq)) == 0));
return ps == nullptr || mbstate_is_initial(ps);
}
size_t mbrtowc(wchar_t* pwc, const char* s, size_t n, mbstate_t* ps) {
@ -148,7 +148,7 @@ size_t wcsnrtombs(char* dst, const wchar_t** src, size_t nwc, size_t len, mbstat
static mbstate_t __private_state;
mbstate_t* state = (ps == nullptr) ? &__private_state : ps;
if (!mbsinit(state)) {
if (!mbstate_is_initial(state)) {
return mbstate_reset_and_return_illegal(EILSEQ, state);
}

4
libc/private/bionic_mbstate.h
View file

@ -44,6 +44,10 @@ __BEGIN_DECLS
#define __MB_IS_ERR(rv) (rv == __MB_ERR_ILLEGAL_SEQUENCE || \
rv == __MB_ERR_INCOMPLETE_SEQUENCE)
static inline __wur bool mbstate_is_initial(const mbstate_t* ps) {
return *(reinterpret_cast<const uint32_t*>(ps->__seq)) == 0;
}
static inline __wur size_t mbstate_bytes_so_far(const mbstate_t* ps) {
return
(ps->__seq[2] != 0) ? 3 :