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

Merge branch 'PHP-8.1' into PHP-8.2

Browse source
This commit is contained in:
David Carlier 2022-09-22 11:24:37 +01:00
commit fd55b50833
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -12,6 +12,9 @@ PHP NEWS
. Fixed bug GH-8805 (finfo returns wrong mime type for woff/woff2 files). . Fixed bug GH-8805 (finfo returns wrong mime type for woff/woff2 files).
(Anatol) (Anatol)
- Opcache:
. Added indirect call reduction for jit on x86 architectures. (wxue1)
- Sockets: - Sockets:
. Fixed socket constants regression as of PHP 8.2.0beta3. (Bruce Dou) . Fixed socket constants regression as of PHP 8.2.0beta3. (Bruce Dou)

9
ext/opcache/jit/zend_jit_x86.dasc
View file

@ -152,6 +152,11 @@ static size_t tsrm_tls_offset;
#define IS_SIGNED_32BIT(val) ((((intptr_t)(val)) <= 0x7fffffff) && (((intptr_t)(val)) >= (-2147483647 - 1))) #define IS_SIGNED_32BIT(val) ((((intptr_t)(val)) <= 0x7fffffff) && (((intptr_t)(val)) >= (-2147483647 - 1)))
/* Call range is before or after 2GB */
#define MAY_USE_32BIT_ADDR(addr) \
(IS_SIGNED_32BIT((char*)(addr) - (char*)dasm_buf) && \
IS_SIGNED_32BIT((char*)(addr) - (char*)dasm_end))
#define CAN_USE_AVX() (JIT_G(opt_flags) & allowed_opt_flags & ZEND_JIT_CPU_AVX) #define CAN_USE_AVX() (JIT_G(opt_flags) & allowed_opt_flags & ZEND_JIT_CPU_AVX)
/* Not Implemented Yet */ /* Not Implemented Yet */
@ -353,7 +358,7 @@ static size_t tsrm_tls_offset;
|.macro EXT_CALL, func, tmp_reg |.macro EXT_CALL, func, tmp_reg
| .if X64 | .if X64
|| if (IS_32BIT(dasm_end) && IS_32BIT(func)) { || if (MAY_USE_32BIT_ADDR(func)) {
| call qword &func | call qword &func
|| } else { || } else {
| LOAD_ADDR tmp_reg, func | LOAD_ADDR tmp_reg, func
@ -366,7 +371,7 @@ static size_t tsrm_tls_offset;
|.macro EXT_JMP, func, tmp_reg |.macro EXT_JMP, func, tmp_reg
| .if X64 | .if X64
|| if (IS_32BIT(dasm_end) && IS_32BIT(func)) { || if (MAY_USE_32BIT_ADDR(func)) {
| jmp qword &func | jmp qword &func
|| } else { || } else {
| LOAD_ADDR tmp_reg, func | LOAD_ADDR tmp_reg, func