Make the tables extern instead of using a non-inline function

tstarling · tstarling · commit c00f8657b1ba · 2021-09-23T14:36:40.000+10:00
3.7x faster for a strripos benchmark which does a tight loop of
tolower().
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -54,7 +54,7 @@ static _locale_t current_locale = NULL;
 
 #define TYPE_PAIR(t1,t2) (((t1) << 4) | (t2))
 
-static const unsigned char tolower_map[256] = {
+const unsigned char zend_tolower_map[256] = {
 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
@@ -73,7 +73,7 @@ static const unsigned char tolower_map[256] = {
 0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff
 };
 
-static const unsigned char toupper_map[256] = {
+const unsigned char zend_toupper_map[256] = {
 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
@@ -92,8 +92,6 @@ static const unsigned char toupper_map[256] = {
 0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff	
 };
 
-#define i_zend_tolower_ascii(c) (tolower_map[(unsigned char)(c)])
-#define i_zend_toupper_ascii(c) (toupper_map[(unsigned char)(c)])
 
 /**
  * Functions using locale lowercase:
@@ -2706,7 +2704,7 @@ static zend_always_inline void zend_str_tolower_impl(char *dest, const char *str
 	}
 #endif
 	while (p < end) {
-		*q++ = i_zend_tolower_ascii(*p++);
+		*q++ = zend_tolower_ascii(*p++);
 	}
 }
 /* }}} */
@@ -2734,23 +2732,11 @@ static zend_always_inline void zend_str_toupper_impl(char *dest, const char *str
 	}
 #endif
 	while (p < end) {
-		*q++ = i_zend_toupper_ascii(*p++);
+		*q++ = zend_toupper_ascii(*p++);
 	}
 }
 /* }}} */
 
-ZEND_API int ZEND_FASTCALL zend_tolower_ascii(int c) /* {{{ */
-{
-	return i_zend_tolower_ascii(c);
-}
-/* }}} */
-
-ZEND_API int ZEND_FASTCALL zend_toupper_ascii(int c) /* {{{ */
-{
-	return i_zend_toupper_ascii(c);
-}
-/* }}} */
-
 ZEND_API char* ZEND_FASTCALL zend_str_tolower_copy(char *dest, const char *source, size_t length) /* {{{ */
 {
 	zend_str_tolower_impl(dest, source, length);
@@ -2798,7 +2784,7 @@ ZEND_API char* ZEND_FASTCALL zend_str_tolower_dup_ex(const char *source, size_t
 	const unsigned char *end = p + length;
 
 	while (p < end) {
-		if (*p != i_zend_tolower_ascii(*p)) {
+		if (*p != zend_tolower_ascii(*p)) {
 			char *res = (char*)emalloc(length + 1);
 			unsigned char *r;
 
@@ -2822,7 +2808,7 @@ ZEND_API char* ZEND_FASTCALL zend_str_toupper_dup_ex(const char *source, size_t
 	const unsigned char *end = p + length;
 
 	while (p < end) {
-		if (*p != i_zend_toupper_ascii(*p)) {
+		if (*p != zend_toupper_ascii(*p)) {
 			char *res = (char*)emalloc(length + 1);
 			unsigned char *r;
 
@@ -2876,13 +2862,13 @@ ZEND_API zend_string* ZEND_FASTCALL zend_string_tolower_ex(zend_string *str, boo
 #endif
 
 	while (p < end) {
-		if (*p != i_zend_tolower_ascii(*p)) {
+		if (*p != zend_tolower_ascii(*p)) {
 			zend_string *res = zend_string_alloc(length, persistent);
 			memcpy(ZSTR_VAL(res), ZSTR_VAL(str), p - (unsigned char*) ZSTR_VAL(str));
 
 			unsigned char *q = p + (ZSTR_VAL(res) - ZSTR_VAL(str));
 			while (p < end) {
-				*q++ = i_zend_tolower_ascii(*p++);
+				*q++ = zend_tolower_ascii(*p++);
 			}
 			ZSTR_VAL(res)[length] = '\0';
 			return res;
@@ -2930,13 +2916,13 @@ ZEND_API zend_string* ZEND_FASTCALL zend_string_toupper_ex(zend_string *str, boo
 #endif
 
 	while (p < end) {
-		if (*p != i_zend_toupper_ascii(*p)) {
+		if (*p != zend_toupper_ascii(*p)) {
 			zend_string *res = zend_string_alloc(length, persistent);
 			memcpy(ZSTR_VAL(res), ZSTR_VAL(str), p - (unsigned char*) ZSTR_VAL(str));
 
 			unsigned char *q = p + (ZSTR_VAL(res) - ZSTR_VAL(str));
 			while (p < end) {
-				*q++ = i_zend_toupper_ascii(*p++);
+				*q++ = zend_toupper_ascii(*p++);
 			}
 			ZSTR_VAL(res)[length] = '\0';
 			return res;
@@ -2991,8 +2977,8 @@ ZEND_API int ZEND_FASTCALL zend_binary_strcasecmp(const char *s1, size_t len1, c
 
 	len = MIN(len1, len2);
 	while (len--) {
-		c1 = i_zend_tolower_ascii(*(unsigned char *)s1++);
-		c2 = i_zend_tolower_ascii(*(unsigned char *)s2++);
+		c1 = zend_tolower_ascii(*(unsigned char *)s1++);
+		c2 = zend_tolower_ascii(*(unsigned char *)s2++);
 		if (c1 != c2) {
 			return c1 - c2;
 		}
@@ -3012,8 +2998,8 @@ ZEND_API int ZEND_FASTCALL zend_binary_strncasecmp(const char *s1, size_t len1,
 	}
 	len = MIN(length, MIN(len1, len2));
 	while (len--) {
-		c1 = i_zend_tolower_ascii(*(unsigned char *)s1++);
-		c2 = i_zend_tolower_ascii(*(unsigned char *)s2++);
+		c1 = zend_tolower_ascii(*(unsigned char *)s1++);
+		c2 = zend_tolower_ascii(*(unsigned char *)s2++);
 		if (c1 != c2) {
 			return c1 - c2;
 		}
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -436,6 +436,12 @@ ZEND_API int ZEND_FASTCALL string_locale_compare_function(zval *op1, zval *op2);
 ZEND_API int ZEND_FASTCALL zend_tolower_ascii(int c);
 ZEND_API int ZEND_FASTCALL zend_toupper_ascii(int c);
 
+ZEND_API extern const unsigned char zend_tolower_map[256];
+ZEND_API extern const unsigned char zend_toupper_map[256];
+
+#define zend_tolower_ascii(c) (zend_tolower_map[(unsigned char)(c)])
+#define zend_toupper_ascii(c) (zend_toupper_map[(unsigned char)(c)])
+
 ZEND_API void         ZEND_FASTCALL zend_str_tolower(char *str, size_t length);
 ZEND_API void         ZEND_FASTCALL zend_str_toupper(char *str, size_t length);
 ZEND_API char*        ZEND_FASTCALL zend_str_tolower_copy(char *dest, const char *source, size_t length);
