Skip to content

Commit 3f557eb

Browse files
committed
Revert "JIT: Add IBT support (#8636)"
This reverts commit c1fcd45. Closes GH-8711
1 parent 7451b8b commit 3f557eb

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

ext/opcache/jit/dynasm/dasm_x86.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,8 +1147,6 @@ local map_op = {
11471147
rep_0 = "F3",
11481148
repe_0 = "F3",
11491149
repz_0 = "F3",
1150-
endbr32_0 = "F30F1EFB",
1151-
endbr64_0 = "F30F1EFA",
11521150
-- F4: *hlt
11531151
cmc_0 = "F5",
11541152
-- F6: test... mb,i; div... mb

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,16 +1623,6 @@ static size_t tsrm_tls_offset;
16231623
|| }
16241624
|.endmacro
16251625

1626-
|.macro ENDBR
1627-
||#if defined (__CET__) && (__CET__ & 1) != 0
1628-
| .if X64
1629-
| endbr64
1630-
| .else
1631-
| endbr32
1632-
| .endif
1633-
||#endif
1634-
|.endmacro
1635-
16361626
static bool reuse_ip = 0;
16371627
static bool delayed_call_chain = 0;
16381628
static uint32_t delayed_call_level = 0;
@@ -2302,7 +2292,6 @@ static int zend_jit_hybrid_hot_code_stub(dasm_State **Dst)
23022292
*/
23032293
static int zend_jit_hybrid_hot_counter_stub(dasm_State **Dst, uint32_t cost)
23042294
{
2305-
| ENDBR
23062295
| mov r0, EX->func
23072296
| mov r1, aword [r0 + offsetof(zend_op_array, reserved[zend_func_info_rid])]
23082297
| mov r2, aword [r1 + offsetof(zend_jit_op_array_hot_extension, counter)]
@@ -2373,7 +2362,6 @@ static int zend_jit_hybrid_hot_trace_stub(dasm_State **Dst)
23732362

23742363
static int zend_jit_hybrid_trace_counter_stub(dasm_State **Dst, uint32_t cost)
23752364
{
2376-
| ENDBR
23772365
| mov r0, EX->func
23782366
| mov r1, aword [r0 + offsetof(zend_op_array, reserved[zend_func_info_rid])]
23792367
| mov r1, aword [r1 + offsetof(zend_jit_op_array_trace_extension, offset)]
@@ -3061,7 +3049,6 @@ static int zend_jit_align_func(dasm_State **Dst)
30613049

30623050
static int zend_jit_prologue(dasm_State **Dst)
30633051
{
3064-
| ENDBR
30653052
if (zend_jit_vm_kind == ZEND_VM_KIND_HYBRID) {
30663053
| SUB_HYBRID_SPAD
30673054
} else if (GCC_GLOBAL_REGS) {

0 commit comments

Comments
 (0)