archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Optimize another check out of hot path for UHC decoding

Browse source 
This gives about another 8-9% speed boost to UHC decoding.
This commit is contained in:
Alex Dowad 2023-01-01 21:12:05 +02:00
parent a76658b329
commit e837a8800b
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/mbstring/libmbfl/filters/mbfilter_uhc.c
View file

@ -203,7 +203,7 @@ static size_t mb_uhc_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf,
if (c < 0x80) { if (c < 0x80) {
*out++ = c; *out++ = c;
} else if (c > 0x80 && c < 0xFE && c != 0xC9) { } else if (c > 0x80 && c < 0xFE) {
/* We don't need to check p < e here; it's not possible that this pointer dereference /* We don't need to check p < e here; it's not possible that this pointer dereference
* will be outside the input string, because of e-- above */ * will be outside the input string, because of e-- above */
unsigned char c2 = *p++; unsigned char c2 = *p++;
@ -221,6 +221,15 @@ static size_t mb_uhc_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf,
w = (c - 0xC7)*94 + c2 - 0xA1; w = (c - 0xC7)*94 + c2 - 0xA1;
ZEND_ASSERT(w < uhc3_ucs_table_size); ZEND_ASSERT(w < uhc3_ucs_table_size);
w = uhc3_ucs_table[w]; w = uhc3_ucs_table[w];
if (!w) {
/* If c == 0xC9, we shouldn't have tried to read a 2-byte char at all... but it is faster
* to fix up that rare case here rather than include an extra check in the hot path */
if (c == 0xC9) {
p--;
}
*out++ = MBFL_BAD_INPUT;
continue;
}
} }
if (!w) { if (!w) {
w = MBFL_BAD_INPUT; w = MBFL_BAD_INPUT;