Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ext/opcache/jit/tls/zend_jit_tls_aarch64.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
"add %2, x8, x0\n"
: "=r" (thread_pointer), "=r" (insn), "=r" (addr)
:
: "x0", "x1", "x8");
/* Resolver call clobbers only a few registers: https://github.com/ARM-software/abi-aa/blob/ee4b3c12d57c8424ff60c2ae56e10690d0604ab6/sysvabi64/sysvabi64.rst#calling-convention.
* We also clobber x8. */
: "x0", "x1", "x8", "x30", "cc", "memory");

ZEND_ASSERT(addr == &_tsrm_ls_cache);

Expand Down
6 changes: 6 additions & 0 deletions ext/opcache/jit/tls/zend_jit_tls_x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
/* Load thread pointer address */
"movl %%gs:0, %%ebx\n"
: "=a" (t_addr), "=S" (code), "=b" (thread_pointer)
:
/* call may clobber volatile registers */
: "ecx", "edx",
"st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)",
"xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7",
"cc", "memory"
);

ZEND_ASSERT(t_addr == &_tsrm_ls_cache);
Expand Down
8 changes: 8 additions & 0 deletions ext/opcache/jit/tls/zend_jit_tls_x86_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
/* Load thread pointer address */
"movq %%fs:0, %%rsi\n"
: "=a" (addr), "=b" (code), "=S" (thread_pointer)
:
/* call may clobber volatile registers */
: "rcx", "rdx", "rdi",
Comment thread
arnaud-lb marked this conversation as resolved.
"r8", "r9", "r10", "r11",
"st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)",
"xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7",
"xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15",
"cc", "memory"
);

ZEND_ASSERT(addr == &_tsrm_ls_cache);
Expand Down
Loading