@@ -90,13 +90,13 @@ static size_t dasm_size = 0;
90
90
91
91
static zend_long jit_bisect_pos = 0 ;
92
92
93
- static const void * zend_jit_runtime_jit_handler = NULL ;
94
- static const void * zend_jit_profile_jit_handler = NULL ;
95
- static const void * zend_jit_func_hot_counter_handler = NULL ;
96
- static const void * zend_jit_loop_hot_counter_handler = NULL ;
97
- static const void * zend_jit_func_trace_counter_handler = NULL ;
98
- static const void * zend_jit_ret_trace_counter_handler = NULL ;
99
- static const void * zend_jit_loop_trace_counter_handler = NULL ;
93
+ static zend_vm_opcode_handler_t zend_jit_runtime_jit_handler = NULL ;
94
+ static zend_vm_opcode_handler_t zend_jit_profile_jit_handler = NULL ;
95
+ static zend_vm_opcode_handler_t zend_jit_func_hot_counter_handler = NULL ;
96
+ static zend_vm_opcode_handler_t zend_jit_loop_hot_counter_handler = NULL ;
97
+ static zend_vm_opcode_handler_t zend_jit_func_trace_counter_handler = NULL ;
98
+ static zend_vm_opcode_handler_t zend_jit_ret_trace_counter_handler = NULL ;
99
+ static zend_vm_opcode_handler_t zend_jit_loop_trace_counter_handler = NULL ;
100
100
101
101
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_runtime_jit (ZEND_OPCODE_HANDLER_ARGS );
102
102
@@ -1417,7 +1417,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
1417
1417
zend_jit_ctx ctx ;
1418
1418
zend_jit_ctx * jit = & ctx ;
1419
1419
zend_jit_reg_var * ra = NULL ;
1420
- void * handler ;
1420
+ zend_vm_opcode_handler_t handler ;
1421
1421
int call_level = 0 ;
1422
1422
void * checkpoint = NULL ;
1423
1423
bool recv_emitted = 0 ; /* emitted at least one RECV opcode */
@@ -3213,7 +3213,7 @@ static void zend_jit_setup_hot_counters_ex(zend_op_array *op_array, zend_cfg *cf
3213
3213
}
3214
3214
}
3215
3215
3216
- opline -> handler = ( const void * ) zend_jit_func_hot_counter_handler ;
3216
+ opline -> handler = zend_jit_func_hot_counter_handler ;
3217
3217
}
3218
3218
3219
3219
if (JIT_G (hot_loop )) {
@@ -3223,7 +3223,7 @@ static void zend_jit_setup_hot_counters_ex(zend_op_array *op_array, zend_cfg *cf
3223
3223
if ((cfg -> blocks [i ].flags & ZEND_BB_REACHABLE ) &&
3224
3224
(cfg -> blocks [i ].flags & ZEND_BB_LOOP_HEADER )) {
3225
3225
op_array -> opcodes [cfg -> blocks [i ].start ].handler =
3226
- ( const void * ) zend_jit_loop_hot_counter_handler ;
3226
+ zend_jit_loop_hot_counter_handler ;
3227
3227
}
3228
3228
}
3229
3229
}
@@ -3316,7 +3316,7 @@ int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
3316
3316
jit_extension -> op_array = op_array ;
3317
3317
jit_extension -> orig_handler = (void * )opline -> handler ;
3318
3318
ZEND_SET_FUNC_INFO (op_array , (void * )jit_extension );
3319
- opline -> handler = ( const void * ) zend_jit_runtime_jit_handler ;
3319
+ opline -> handler = zend_jit_runtime_jit_handler ;
3320
3320
zend_shared_alloc_register_xlat_entry (op_array -> opcodes , jit_extension );
3321
3321
3322
3322
return SUCCESS ;
@@ -3346,7 +3346,7 @@ int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
3346
3346
jit_extension -> op_array = op_array ;
3347
3347
jit_extension -> orig_handler = (void * )opline -> handler ;
3348
3348
ZEND_SET_FUNC_INFO (op_array , (void * )jit_extension );
3349
- opline -> handler = ( const void * ) zend_jit_profile_jit_handler ;
3349
+ opline -> handler = zend_jit_profile_jit_handler ;
3350
3350
zend_shared_alloc_register_xlat_entry (op_array -> opcodes , jit_extension );
3351
3351
}
3352
3352
@@ -3566,23 +3566,23 @@ void zend_jit_protect(void)
3566
3566
3567
3567
static void zend_jit_init_handlers (void )
3568
3568
{
3569
- if ( zend_jit_vm_kind == ZEND_VM_KIND_HYBRID ) {
3570
- zend_jit_runtime_jit_handler = zend_jit_stub_handlers [jit_stub_hybrid_runtime_jit ];
3571
- zend_jit_profile_jit_handler = zend_jit_stub_handlers [jit_stub_hybrid_profile_jit ];
3572
- zend_jit_func_hot_counter_handler = zend_jit_stub_handlers [jit_stub_hybrid_func_hot_counter ];
3573
- zend_jit_loop_hot_counter_handler = zend_jit_stub_handlers [jit_stub_hybrid_loop_hot_counter ];
3574
- zend_jit_func_trace_counter_handler = zend_jit_stub_handlers [jit_stub_hybrid_func_trace_counter ];
3575
- zend_jit_ret_trace_counter_handler = zend_jit_stub_handlers [jit_stub_hybrid_ret_trace_counter ];
3576
- zend_jit_loop_trace_counter_handler = zend_jit_stub_handlers [jit_stub_hybrid_loop_trace_counter ];
3577
- } else {
3578
- zend_jit_runtime_jit_handler = ( const void * ) zend_runtime_jit ;
3579
- zend_jit_profile_jit_handler = ( const void * ) zend_jit_profile_helper ;
3580
- zend_jit_func_hot_counter_handler = ( const void * ) zend_jit_func_counter_helper ;
3581
- zend_jit_loop_hot_counter_handler = ( const void * ) zend_jit_loop_counter_helper ;
3582
- zend_jit_func_trace_counter_handler = ( const void * ) zend_jit_func_trace_helper ;
3583
- zend_jit_ret_trace_counter_handler = ( const void * ) zend_jit_ret_trace_helper ;
3584
- zend_jit_loop_trace_counter_handler = ( const void * ) zend_jit_loop_trace_helper ;
3585
- }
3569
+ # if ZEND_VM_KIND == ZEND_VM_KIND_HYBRID
3570
+ zend_jit_runtime_jit_handler = ( zend_vm_opcode_handler_t ) zend_jit_stub_handlers [jit_stub_hybrid_runtime_jit ];
3571
+ zend_jit_profile_jit_handler = ( zend_vm_opcode_handler_t ) zend_jit_stub_handlers [jit_stub_hybrid_profile_jit ];
3572
+ zend_jit_func_hot_counter_handler = ( zend_vm_opcode_handler_t ) zend_jit_stub_handlers [jit_stub_hybrid_func_hot_counter ];
3573
+ zend_jit_loop_hot_counter_handler = ( zend_vm_opcode_handler_t ) zend_jit_stub_handlers [jit_stub_hybrid_loop_hot_counter ];
3574
+ zend_jit_func_trace_counter_handler = ( zend_vm_opcode_handler_t ) zend_jit_stub_handlers [jit_stub_hybrid_func_trace_counter ];
3575
+ zend_jit_ret_trace_counter_handler = ( zend_vm_opcode_handler_t ) zend_jit_stub_handlers [jit_stub_hybrid_ret_trace_counter ];
3576
+ zend_jit_loop_trace_counter_handler = ( zend_vm_opcode_handler_t ) zend_jit_stub_handlers [jit_stub_hybrid_loop_trace_counter ];
3577
+ # else
3578
+ zend_jit_runtime_jit_handler = zend_runtime_jit ;
3579
+ zend_jit_profile_jit_handler = zend_jit_profile_helper ;
3580
+ zend_jit_func_hot_counter_handler = zend_jit_func_counter_helper ;
3581
+ zend_jit_loop_hot_counter_handler = zend_jit_loop_counter_helper ;
3582
+ zend_jit_func_trace_counter_handler = zend_jit_func_trace_helper ;
3583
+ zend_jit_ret_trace_counter_handler = zend_jit_ret_trace_helper ;
3584
+ zend_jit_loop_trace_counter_handler = zend_jit_loop_trace_helper ;
3585
+ #endif
3586
3586
}
3587
3587
3588
3588
static void zend_jit_globals_ctor (zend_jit_globals * jit_globals )
@@ -3945,9 +3945,9 @@ static void zend_jit_restart_preloaded_op_array(zend_op_array *op_array)
3945
3945
}
3946
3946
}
3947
3947
if (func_info -> flags & ZEND_FUNC_JIT_ON_FIRST_EXEC ) {
3948
- opline -> handler = ( const void * ) zend_jit_runtime_jit_handler ;
3948
+ opline -> handler = zend_jit_runtime_jit_handler ;
3949
3949
} else {
3950
- opline -> handler = ( const void * ) zend_jit_profile_jit_handler ;
3950
+ opline -> handler = zend_jit_profile_jit_handler ;
3951
3951
}
3952
3952
#endif
3953
3953
}
0 commit comments