diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opcache/jit/zend_jit_disasm_x86.c | 1 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_trace.c | 2 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 15 |
3 files changed, 4 insertions, 14 deletions
diff --git a/ext/opcache/jit/zend_jit_disasm_x86.c b/ext/opcache/jit/zend_jit_disasm_x86.c index 97937f5afc..f94bf1af3a 100644 --- a/ext/opcache/jit/zend_jit_disasm_x86.c +++ b/ext/opcache/jit/zend_jit_disasm_x86.c @@ -385,6 +385,7 @@ static int zend_jit_disasm_init(void) REGISTER_EG(vm_stack_top); REGISTER_EG(vm_stack_end); REGISTER_EG(symbol_table); + REGISTER_EG(jit_trace_num); #undef REGISTER_EG #endif diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index d438b09bc1..7279e52086 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -4994,7 +4994,7 @@ blacklist: int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf *regs) { - uint32_t trace_num = (uint32_t)(uintptr_t)EG(reserved)[zend_func_info_rid]; + uint32_t trace_num = EG(jit_trace_num); zend_execute_data *execute_data = EG(current_execute_data); const zend_op *orig_opline = EX(opline); const zend_op *opline; diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 0d0ec990b1..867ffbd74b 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -2853,8 +2853,8 @@ static int zend_jit_trace_begin(dasm_State **Dst, uint32_t trace_num) { current_trace_num = trace_num; - | //EG(reserved)[zend_func_info_rid] = trace_num; - | MEM_OP2_1_ZTS mov, aword, executor_globals, reserved[zend_func_info_rid], trace_num, r0 + | // EG(jit_trace_num) = trace_num; + | MEM_OP2_1_ZTS mov, dword, executor_globals, jit_trace_num, trace_num, r0 return 1; } @@ -8588,17 +8588,6 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend | call aword [r0 + offsetof(zend_internal_function, handler)] } - if (trace) { - // TODO: This is a quick dirty fix ?????? - // - // Internal function may call another trace that, - // replaces EG(trace_id) and the following side exit - // from this trace is going to be mad !!!!!! - // - // Lets set EG(trace_id) once again... - zend_jit_trace_begin(Dst, current_trace_num); - } - | // EG(current_execute_data) = execute_data; | MEM_OP2_1_ZTS mov, aword, executor_globals, current_execute_data, FP, r0 |