Skip to content

Commit 8c96f53

Browse files
authored
zend_jit_resolve_tsrm_ls_cache_offsets: clobber volatile registers (#22832)
1 parent 2f37579 commit 8c96f53

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

ext/opcache/jit/tls/zend_jit_tls_aarch64.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
126126
"add %2, x8, x0\n"
127127
: "=r" (thread_pointer), "=r" (insn), "=r" (addr)
128128
:
129-
: "x0", "x1", "x8");
129+
/* Resolver call clobbers only a few registers: https://github.com/ARM-software/abi-aa/blob/ee4b3c12d57c8424ff60c2ae56e10690d0604ab6/sysvabi64/sysvabi64.rst#calling-convention.
130+
* We also clobber x8. */
131+
: "x0", "x1", "x8", "x30", "cc", "memory");
130132

131133
ZEND_ASSERT(addr == &_tsrm_ls_cache);
132134

ext/opcache/jit/tls/zend_jit_tls_x86.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
110110
/* Load thread pointer address */
111111
"movl %%gs:0, %%ebx\n"
112112
: "=a" (t_addr), "=S" (code), "=b" (thread_pointer)
113+
:
114+
/* call may clobber volatile registers */
115+
: "ecx", "edx",
116+
"st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)",
117+
"xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7",
118+
"cc", "memory"
113119
);
114120

115121
ZEND_ASSERT(t_addr == &_tsrm_ls_cache);

ext/opcache/jit/tls/zend_jit_tls_x86_64.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
106106
/* Load thread pointer address */
107107
"movq %%fs:0, %%rsi\n"
108108
: "=a" (addr), "=b" (code), "=S" (thread_pointer)
109+
:
110+
/* call may clobber volatile registers */
111+
: "rcx", "rdx", "rdi",
112+
"r8", "r9", "r10", "r11",
113+
"st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)",
114+
"xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7",
115+
"xmm8", "xmm9", "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15",
116+
"cc", "memory"
109117
);
110118

111119
ZEND_ASSERT(addr == &_tsrm_ls_cache);

0 commit comments

Comments
 (0)