Skip to content

Commit 8e5a4b7

Browse files
committed
Fixed ZTS build
1 parent 5e8c1ff commit 8e5a4b7

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,38 +176,38 @@ static void* dasm_labels[zend_lb_MAX];
176176
| .if X64WIN
177177
| gs
178178
| mov reg, aword [0x58]
179-
| mov reg, aword [reg + tsrm_tls_index]
180-
| mov reg, aword [reg + tsrm_tls_offset]
179+
| mov reg, aword [reg+tsrm_tls_index]
180+
| mov reg, aword [reg+tsrm_tls_offset]
181181
| .elif WIN
182182
| fs
183183
| mov reg, aword [0x2c]
184-
| mov reg, aword [reg + tsrm_tls_index]
185-
| mov reg, aword [reg + tsrm_tls_offset]
184+
| mov reg, aword [reg+tsrm_tls_index]
185+
| mov reg, aword [reg+tsrm_tls_offset]
186186
| .elif X64APPLE
187187
| gs
188188
|| if (tsrm_ls_cache_tcb_offset) {
189189
| mov reg, aword [tsrm_ls_cache_tcb_offset]
190190
|| } else {
191191
| mov reg, aword [tsrm_tls_index]
192-
| mov reg, aword [reg + tsrm_tls_offset]
192+
| mov reg, aword [reg+tsrm_tls_offset]
193193
|| }
194194
| .elif X64
195195
| fs
196196
|| if (tsrm_ls_cache_tcb_offset) {
197197
| mov reg, aword [tsrm_ls_cache_tcb_offset]
198198
|| } else {
199199
| mov reg, [0x8]
200-
| mov reg, aword [reg + tsrm_tls_index]
201-
| mov reg, aword [reg + tsrm_tls_offset]
200+
| mov reg, aword [reg+tsrm_tls_index]
201+
| mov reg, aword [reg+tsrm_tls_offset]
202202
|| }
203203
| .else
204204
| gs
205205
|| if (tsrm_ls_cache_tcb_offset) {
206206
| mov reg, aword [tsrm_ls_cache_tcb_offset]
207207
|| } else {
208208
| mov reg, [0x4]
209-
| mov reg, aword [reg + tsrm_tls_index]
210-
| mov reg, aword [reg + tsrm_tls_offset]
209+
| mov reg, aword [reg+tsrm_tls_index]
210+
| mov reg, aword [reg+tsrm_tls_offset]
211211
|| }
212212
| .endif
213213
|.endmacro
@@ -377,7 +377,7 @@ static void* dasm_labels[zend_lb_MAX];
377377
|.macro MEM_OP2_1_ZTS, mem_ins, prefix, struct, field, op2, tmp_reg
378378
| .if ZTS
379379
| LOAD_TSRM_CACHE tmp_reg
380-
| mem_ins prefix [tmp_reg + (struct.._offset + offsetof(zend_..struct, field))], op2
380+
| mem_ins prefix [tmp_reg+(struct.._offset+offsetof(zend_..struct, field))], op2
381381
| .else
382382
| MEM_OP2_1 mem_ins, prefix, &struct.field, op2, tmp_reg
383383
| .endif
@@ -386,7 +386,7 @@ static void* dasm_labels[zend_lb_MAX];
386386
|.macro MEM_OP2_2_ZTS, mem_ins, op1, prefix, struct, field, tmp_reg
387387
| .if ZTS
388388
| LOAD_TSRM_CACHE tmp_reg
389-
| mem_ins op1, prefix [tmp_reg + (struct.._offset + offsetof(zend_..struct, field))]
389+
| mem_ins op1, prefix [tmp_reg+(struct.._offset+offsetof(zend_..struct, field))]
390390
| .else
391391
| MEM_OP2_2 mem_ins, op1, prefix, &struct.field, tmp_reg
392392
| .endif

0 commit comments

Comments
 (0)