@@ -911,14 +911,9 @@ static ir_ref jit_IP32(zend_jit_ctx *jit)
911
911
return ir_RLOAD_U32(ZREG_IP);
912
912
}
913
913
914
- static void jit_LOAD_IP(zend_jit_ctx *jit, ir_ref ref)
915
- {
916
- jit_STORE_IP(jit, ref);
917
- }
918
-
919
914
static void jit_LOAD_IP_ADDR(zend_jit_ctx *jit, const zend_op *target)
920
915
{
921
- jit_LOAD_IP (jit, ir_CONST_ADDR(target));
916
+ jit_STORE_IP (jit, ir_CONST_ADDR(target));
922
917
}
923
918
924
919
static void zend_jit_track_last_valid_opline(zend_jit_ctx *jit)
@@ -2203,7 +2198,7 @@ static int zend_jit_leave_throw_stub(zend_jit_ctx *jit)
2203
2198
ir_MERGE_WITH_EMPTY_TRUE(if_set);
2204
2199
2205
2200
// JIT: opline = EG(exception_op);
2206
- jit_LOAD_IP (jit, jit_EG(exception_op));
2201
+ jit_STORE_IP (jit, jit_EG(exception_op));
2207
2202
2208
2203
if (GCC_GLOBAL_REGS) {
2209
2204
ir_STORE(jit_EX(opline), jit_IP(jit));
@@ -4163,7 +4158,7 @@ static int zend_jit_handler(zend_jit_ctx *jit, const zend_op *opline, int may_th
4163
4158
ir_CALL(IR_VOID, ir_CONST_FUNC(handler));
4164
4159
} else {
4165
4160
ir_ref ip = ir_CALL_2(IR_ADDR, ir_CONST_FC_FUNC(handler), jit_FP(jit), jit_IP(jit));
4166
- jit_LOAD_IP (jit, ip);
4161
+ jit_STORE_IP (jit, ip);
4167
4162
}
4168
4163
if (may_throw) {
4169
4164
zend_jit_check_exception(jit);
@@ -10282,7 +10277,7 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
10282
10277
if (num_args) {
10283
10278
ip = ir_ADD_OFFSET(ip, num_args * sizeof(zend_op));
10284
10279
}
10285
- jit_LOAD_IP (jit, ip);
10280
+ jit_STORE_IP (jit, ip);
10286
10281
}
10287
10282
10288
10283
if (!trace && op_array == &func->op_array && call_num_args >= op_array->required_num_args) {
@@ -10304,7 +10299,7 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
10304
10299
}
10305
10300
ip = ir_LOAD_A(ir_ADD_OFFSET(func_ref, offsetof(zend_op_array, opcodes)));
10306
10301
}
10307
- jit_LOAD_IP (jit, ip);
10302
+ jit_STORE_IP (jit, ip);
10308
10303
helper = ir_CONST_FC_FUNC(zend_jit_copy_extra_args_helper);
10309
10304
} else {
10310
10305
helper = ir_CONST_FC_FUNC(zend_jit_copy_extra_args_helper_no_skip_recv);
@@ -10328,7 +10323,7 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
10328
10323
}
10329
10324
ip = ir_LOAD_A(ir_ADD_OFFSET(func_ref, offsetof(zend_op_array, opcodes)));
10330
10325
}
10331
- jit_LOAD_IP (jit, ip);
10326
+ jit_STORE_IP (jit, ip);
10332
10327
10333
10328
// JIT: num_args = EX_NUM_ARGS();
10334
10329
ir_ref num_args, first_extra_arg;
@@ -11103,7 +11098,7 @@ static int zend_jit_leave_func(zend_jit_ctx *jit,
11103
11098
ir_GUARD(jit_IP(jit), jit_STUB_ADDR(jit, jit_stub_trace_halt));
11104
11099
} else {
11105
11100
ir_GUARD(ir_NE(ref, ir_CONST_ADDR(ZEND_VM_RETURN_VAL)), jit_STUB_ADDR(jit, jit_stub_trace_halt));
11106
- jit_LOAD_IP (jit, ref);
11101
+ jit_STORE_IP (jit, ref);
11107
11102
}
11108
11103
}
11109
11104
@@ -17078,9 +17073,9 @@ static int zend_jit_trace_handler(zend_jit_ctx *jit, const zend_op_array *op_arr
17078
17073
opline->opcode == ZEND_DO_FCALL ||
17079
17074
opline->opcode == ZEND_GENERATOR_CREATE) {
17080
17075
17081
- jit_LOAD_IP (jit, ir_AND_A(ref, ir_CONST_ADDR(~ZEND_VM_ENTER_BIT)));
17076
+ jit_STORE_IP (jit, ir_AND_A(ref, ir_CONST_ADDR(~ZEND_VM_ENTER_BIT)));
17082
17077
} else {
17083
- jit_LOAD_IP (jit, ref);
17078
+ jit_STORE_IP (jit, ref);
17084
17079
}
17085
17080
}
17086
17081
if (may_throw
0 commit comments