Skip to content

Sync all boost.context files with release 1.86.0 #20375

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

Closed
wants to merge 1 commit into from
+38 −24
Closed

Sync all boost.context files with release 1.86.0 #20375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions Zend/asm/jump_s390x_sysv_elf_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@
.type jump_fcontext, @function

#define ARG_OFFSET 0
#define GR_OFFSET 16
#define FP_OFFSET 96
#define FPC_OFFSET 160
#define PC_OFFSET 168
#define CONTEXT_SIZE 176
#define GR_OFFSET 16
#define R14_OFFSET 88
#define FP_OFFSET 96
#define FPC_OFFSET 160
#define PC_OFFSET 168
#define CONTEXT_SIZE 176

#define REG_SAVE_AREA_SIZE 160

Expand Down Expand Up @@ -131,11 +132,14 @@ jump_fcontext:
ltg %r2,GR_OFFSET(%r15)
jnz use_return_slot

/* We restore a make_fcontext context. Use the function
argument slot in the context we just saved and allocate the
register save area for the target function. */
la %r2,ARG_OFFSET(%r1)
aghi %r15,-REG_SAVE_AREA_SIZE
/* We're restoring a context created by make_fcontext.
This is going to be the argument of the entry point
of the fiber. We're placing it on top of the ABI
defined register save area of the fiber's own stack. */
la %r2,REG_SAVE_AREA_SIZE(%r15)

/* REG_SAVE_AREA_SIZE + sizeof(transfer_t) */
aghi %r15,-(REG_SAVE_AREA_SIZE+16)

use_return_slot:
/* Save the two fields in transfer_t. When calling a
Expand Down
12 changes: 7 additions & 5 deletions Zend/asm/jump_sparc64_sysv_elf_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
*/

/*
* typedef struct {
* void *handle;
* zend_fiber_transfer *transfer;
* } boost_context_data;
* typedef void* fcontext_t;
*
* boost_context_data jump_fcontext(void *to, zend_fiber_transfer *transfer);
* struct transfer_t {
* fcontext_t fctx;
* void * data;
* };
*
* transfer_t jump_fcontext(fcontext_t const to, void *vp);
*/
#define CC64FSZ 176
#define BIAS 2047
Expand Down
4 changes: 4 additions & 0 deletions Zend/asm/jump_x86_64_ms_pe_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
.file "jump_x86_64_ms_pe_gas.asm"
.text
.p2align 4,,15
.globl jump_fcontext
.def jump_fcontext; .scl 2; .type 32; .endef
.seh_proc jump_fcontext
jump_fcontext:
Expand Down Expand Up @@ -203,3 +204,6 @@ jump_fcontext:
/* indirect jump to context */
jmp *%r10
.seh_endproc

.section .drectve
.ascii " -export:\"jump_fcontext\""
14 changes: 7 additions & 7 deletions Zend/asm/make_s390x_sysv_elf_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
.type make_fcontext, @function

#define ARG_OFFSET 0
#define GR_OFFSET 16
#define R14_OFFSET 88
#define FP_OFFSET 96
#define FPC_OFFSET 160
#define PC_OFFSET 168
#define CONTEXT_SIZE 176
#define GR_OFFSET 16
#define R14_OFFSET 88
#define FP_OFFSET 96
#define FPC_OFFSET 160
#define PC_OFFSET 168
#define CONTEXT_SIZE 176

/*

Expand All @@ -72,7 +72,7 @@ r4 - The address of the context function
make_fcontext:
.machine "z10"
/* Align the stack to an 8 byte boundary. */
nill %r2,0xfff0
nill %r2,0xfff8

/* Allocate stack space for the context. */
aghi %r2,-CONTEXT_SIZE
Expand Down
4 changes: 2 additions & 2 deletions Zend/asm/make_sparc64_sysv_elf_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

/*
* void *make_fcontext(void *sp, size_t size, void (*fn)(boost_context_data));
* fcontext_t *make_fcontext(void *sp, size_t size, void (*fn)(transfer_t));
*/
#define CC64FSZ 176
#define BIAS 2047
Expand Down Expand Up @@ -56,7 +56,7 @@ make_fcontext:
trampoline:
ldx [%sp + BIAS + I7], %l0

# no need to setup boost_context_data, already in %o0 and %o1
# no need to setup transfer_t, already in %o0 and %o1
jmpl %l0, %o7
nop

Expand Down
4 changes: 4 additions & 0 deletions Zend/asm/make_x86_64_ms_pe_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
.file "make_x86_64_ms_pe_gas.asm"
.text
.p2align 4,,15
.globl make_fcontext
.def make_fcontext; .scl 2; .type 32; .endef
.seh_proc make_fcontext
make_fcontext:
Expand Down Expand Up @@ -168,3 +169,6 @@ finish:
.seh_endproc

.def _exit; .scl 2; .type 32; .endef /* standard C library function */

.section .drectve
.ascii " -export:\"make_fcontext\""