diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-01 10:15:06 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-01 10:15:06 +0200 |
| commit | 4a8fe02c7c17d3d4427e9b0097ac72ed6bc163f7 (patch) | |
| tree | 9a85866cdab09e0b1d9fb7fd93d5e3c82c70e262 /ext | |
| parent | b7ed20662e47a16740ce19df68bd3335381a3988 (diff) | |
| download | php-git-4a8fe02c7c17d3d4427e9b0097ac72ed6bc163f7.tar.gz | |
Undef opline result on mod/shift error in jit
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 29cd6e22d3..7a46588e90 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -506,6 +506,16 @@ static void* dasm_labels[zend_lb_MAX]; | mov dword [Ra(Z_REG(addr))+Z_OFFSET(addr)+4], val |.endmacro +|.macro UNDEF_OPLINE_RESULT +| mov r0, EX->opline +|.if X64 + | movsxd r0, dword OP:r0->result.var +|.else + | mov r0, OP:r0->result.var +|.endif +| SET_Z_TYPE_INFO FP + r0, IS_UNDEF +|.endmacro + |.macro FPU_OP, fp_ins, addr || if (Z_MODE(addr) == IS_CONST_ZVAL) { | MEM_OP1 fp_ins, qword, Z_ZV(addr), r0 @@ -2179,6 +2189,7 @@ static int zend_jit_undefined_function_stub(dasm_State **Dst) static int zend_jit_negative_shift_stub(dasm_State **Dst) { |->negative_shift: + | UNDEF_OPLINE_RESULT |.if X64 |.if WIN | LOAD_ADDR CARG1, &zend_ce_arithmetic_error @@ -2207,6 +2218,7 @@ static int zend_jit_negative_shift_stub(dasm_State **Dst) static int zend_jit_mod_by_zero_stub(dasm_State **Dst) { |->mod_by_zero: + | UNDEF_OPLINE_RESULT |.if X64 |.if WIN | LOAD_ADDR CARG1, &zend_ce_division_by_zero_error |