Skip to content

Preallocate space for Win64 shadow args #17095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 12, 2024
Merged

Preallocate space for Win64 shadow args #17095

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2167986
Preallocate space for Win64 shadow args
dstogov Dec 9, 2024
8c69cf0
typo
dstogov Dec 9, 2024
1ed5320
Setup unwinder for JIT functions
dstogov Dec 11, 2024
3dbe5eb
Revert "Dynamically xfail test case which fails on CI"
dstogov Dec 11, 2024
fdb6900
Revert "Dynamically xfail test case which fails on CI"
dstogov Dec 11, 2024
330d639
Revert "Dynamically xfail test cases which fail on CI (GH-15710)"
dstogov Dec 11, 2024
09da31a
Remove XFAIL sections
dstogov Dec 11, 2024
e92cd0d
Add hard-coded SEH unwind data for EXITCALL
dstogov Dec 11, 2024
b9244a0
Fix unwind data
dstogov Dec 12, 2024
3c88fb9
Fix Windows multi-process support
dstogov Dec 12, 2024
3280df4
Typo
dstogov Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
(1<<(16+6)) | (1<<(16+7)) | (1<<(16+8)) | (1<<(16+9)) | (1<<(16+10)) | \
(1<<(16+11)) | (1<<(16+12)) | (1<<(16+13)) | (1<<(16+14)) | (1<<(16+15)))
*/
# define IR_SHADOW_ARGS 32
# else
# define IR_REGSET_PRESERVED ((1<<3) | (1<<5) | (1<<12) | (1<<13) | (1<<14) | (1<<15)) /* all preserved registers */
# endif
Expand Down Expand Up @@ -2709,7 +2710,11 @@ static void zend_jit_init_ctx(zend_jit_ctx *jit, uint32_t flags)
// jit->ctx.fixed_save_regset &= 0xffff; // TODO: don't save FP registers ???
//#endif
}
#ifdef _WIN64
jit->ctx.fixed_call_stack_size = 16 + IR_SHADOW_ARGS;
#else
jit->ctx.fixed_call_stack_size = 16;
#endif
} else {
#ifdef ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE
jit->ctx.fixed_stack_red_zone = ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE;
Expand Down Expand Up @@ -8978,7 +8983,11 @@ static int zend_jit_init_method_call(zend_jit_ctx *jit,
// JIT: alloca(sizeof(void*));
this_ref2 = ir_ALLOCA(ir_CONST_ADDR(0x10));
} else {
#ifdef _WIN64
this_ref2 = ir_HARD_COPY_A(jit_ADD_OFFSET(jit, ir_RLOAD_A(IR_REG_SP), IR_SHADOW_ARGS));
#else
this_ref2 = ir_HARD_COPY_A(ir_RLOAD_A(IR_REG_SP));
#endif
}
ir_STORE(this_ref2, this_ref);

Expand All @@ -8994,10 +9003,17 @@ static int zend_jit_init_method_call(zend_jit_ctx *jit,
this_ref2);
}

this_ref2 = ir_LOAD_A(ir_RLOAD_A(IR_REG_SP));

if (!jit->ctx.fixed_call_stack_size) {
this_ref2 = ir_LOAD_A(ir_RLOAD_A(IR_REG_SP));
// JIT: revert alloca
ir_AFREE(ir_CONST_ADDR(0x10));
} else {
#ifdef _WIN64
this_ref2 = ir_LOAD_A(jit_ADD_OFFSET(jit, ir_RLOAD_A(IR_REG_SP), IR_SHADOW_ARGS));
#else
this_ref2 = ir_LOAD_A(ir_RLOAD_A(IR_REG_SP));
#endif
}

ir_GUARD(ref2, jit_STUB_ADDR(jit, jit_stub_exception_handler));
Expand Down Expand Up @@ -10257,7 +10273,11 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
// JIT: alloca(sizeof(void*));
ptr = ir_ALLOCA(ir_CONST_ADDR(sizeof(zval)));
} else {
#ifdef _WIN64
ptr = ir_HARD_COPY_A(jit_ADD_OFFSET(jit, ir_RLOAD_A(IR_REG_SP), IR_SHADOW_ARGS));
#else
ptr = ir_HARD_COPY_A(ir_RLOAD_A(IR_REG_SP));
#endif
}
res_addr = ZEND_ADDR_REF_ZVAL(ptr);
}
Expand Down Expand Up @@ -10385,7 +10405,16 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
func_info |= MAY_BE_NULL;

if (func_info & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF)) {
ir_ref sp = ir_RLOAD_A(IR_REG_SP);
ir_ref sp;
if (!jit->ctx.fixed_call_stack_size) {
sp = ir_RLOAD_A(IR_REG_SP);
} else {
#ifdef _WIN32
sp = jit_ADD_OFFSET(jit, ir_RLOAD_A(IR_REG_SP), IR_SHADOW_ARGS);
#else
sp = ir_RLOAD_A(IR_REG_SP);
#endif
}
res_addr = ZEND_ADDR_REF_ZVAL(sp);
jit_ZVAL_PTR_DTOR(jit, res_addr, func_info, 1, opline);
}
Expand Down
Loading