Name asm context pointer

Author: trowski

Zend/zend_fibers.c

@@ -66,15 +66,13 @@ static zend_object_handlers zend_fiber_handlers;
 
 static zend_function zend_fiber_function = { ZEND_INTERNAL_FUNCTION };
 
-typedef void *fcontext_t;
+typedef struct _zend_fiber_transfer {
+	zend_fiber_asm_handle handle;
+	zend_fiber_context *previous;
+} zend_fiber_transfer;
 
-typedef struct _transfer_t {
-	fcontext_t context;
-	void *data;
-} transfer_t;
-
-extern fcontext_t make_fcontext(void *sp, size_t size, void (*fn)(transfer_t));
-extern transfer_t jump_fcontext(fcontext_t to, void *vp);
+extern zend_fiber_asm_handle make_fcontext(void *sp, size_t size, void (*fn)(zend_fiber_transfer));
+extern zend_fiber_transfer jump_fcontext(zend_fiber_asm_handle to, zend_fiber_context *previous);
 
 #define ZEND_FIBER_DEFAULT_PAGE_SIZE 4096
 
@@ -181,12 +179,12 @@ static void zend_fiber_stack_free(zend_fiber_stack *stack)
 	stack->pointer = NULL;
 }
 
-static ZEND_NORETURN void zend_fiber_trampoline(transfer_t transfer)
+static ZEND_NORETURN void zend_fiber_trampoline(zend_fiber_transfer transfer)
 {
 	zend_fiber_context *context = EG(current_fiber);
-	zend_fiber_context *from = transfer.data;
+	zend_fiber_context *from = transfer.previous;
 
-	from->handle = transfer.context;
+	from->handle = transfer.handle;
 
 #ifdef __SANITIZE_ADDRESS__
 	__sanitizer_finish_switch_fiber(NULL, &from->stack.prior_pointer, &from->stack.prior_size);
@@ -261,16 +259,16 @@ ZEND_API zend_fiber_context *zend_fiber_switch_context(zend_fiber_context *to)
 		to->stack.prior_size);
 #endif
 
-	transfer_t transfer = jump_fcontext(to->handle, from);
+	zend_fiber_transfer transfer = jump_fcontext(to->handle, from);
 
 #ifdef __SANITIZE_ADDRESS__
 	__sanitizer_finish_switch_fiber(fake_stack, &to->stack.prior_pointer, &to->stack.prior_size);
 #endif
 
 	EG(current_fiber) = from;
 
-	zend_fiber_context *previous = transfer.data;
-	previous->handle = transfer.context;
+	zend_fiber_context *previous = transfer.previous;
+	previous->handle = transfer.handle;
 
 	zend_fiber_restore_vm_state(&state);
 

Zend/zend_fibers.h

@@ -70,9 +70,12 @@ typedef struct _zend_fiber_context zend_fiber_context;
 /* Coroutine functions must return a fiber context to switch to after they are finished. */
 typedef zend_fiber_context *(*zend_fiber_coroutine)(zend_fiber_context *context);
 
+/* Context handle used for asm context jumps. */
+typedef void *zend_fiber_asm_handle;
+
 /* Defined as a macro to allow anonymous embedding. */
 #define ZEND_FIBER_CONTEXT_FIELDS \
-	void *handle; \
+	zend_fiber_asm_handle handle; \
 	zend_fiber_context *caller; \
 	zend_fiber_coroutine function; \
 	zend_fiber_stack stack; \