Fix conflicts

Author: doubaokun

include/swoole_asm_context.h

@@ -29,8 +29,8 @@ SW_EXTERN_C_BEGIN
 
 typedef void *fcontext_t;
 
-intptr_t jump_fcontext(fcontext_t *ofc, fcontext_t nfc, intptr_t vp, bool preserve_fpu = false);
-fcontext_t make_fcontext(void *sp, size_t size, void (*fn)(intptr_t));
+fcontext_t make_fcontext_v1(void *sp, size_t size, void (*fn)(intptr_t));
+intptr_t jump_fcontext_v1(fcontext_t *ofc, fcontext_t nfc, intptr_t vp, bool preserve_fpu = true);
 
 SW_EXTERN_C_END
 

package.xml

@@ -24,8 +24,8 @@
         <email>[email protected]</email>
         <active>yes</active>
     </developer>
-    <date>2021-11-23</date>
-    <time>08:00:00</time>
+    <date>2021-11-27</date>
+    <time>06:00:00</time>
     <version>
         <release>4.8.0</release>
         <api>4.0</api>
@@ -37,11 +37,11 @@
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</license>
     <notes>
         - PHP 8.1 support
-        - Native support for postgres coroutine client, enable --with-postgres[=DIR]
+        - Native support for Postgres coroutine client, enable --with-postgres[=DIR]
         - New HTTP server option: max_request_execution_time
         - Support strict type hinting and fix the type of arguments, return value
         - Bug fixed: data loss bug in Swoole table
-        - Bug fixed: compile issues when enable openssl on MacOS
+        - Bug fixed: compile issues when enabling OpenSSL on macOS
         - Throw \Swoole\Exception when Swoole table is too small to avoid data loss
         - Deprecation warning added: Swoole\Coroutine\Server
         - Deprecation warning added: Swoole\Coroutine\Barrier

src/coroutine/context.cc

@@ -68,7 +68,7 @@ Context::Context(size_t stack_size, const CoroutineFunc &fn, void *private_data)
     ctx_.uc_link = nullptr;
     makecontext(&ctx_, (void (*)(void)) & context_func, 1, this);
 #else
-    ctx_ = make_fcontext(sp, stack_size_, (void (*)(intptr_t)) & context_func);
+    ctx_ = make_fcontext_v1(sp, stack_size_, (void (*)(intptr_t)) & context_func);
     swap_ctx_ = nullptr;
 #endif
 
@@ -123,7 +123,7 @@ bool Context::swap_in() {
 #if USE_UCONTEXT
     return 0 == swapcontext(&swap_ctx_, &ctx_);
 #else
-    jump_fcontext(&swap_ctx_, ctx_, (intptr_t) this, true);
+    jump_fcontext_v1(&swap_ctx_, ctx_, (intptr_t) this, true);
     return true;
 #endif
 }
@@ -132,7 +132,7 @@ bool Context::swap_out() {
 #if USE_UCONTEXT
     return 0 == swapcontext(&ctx_, &swap_ctx_);
 #else
-    jump_fcontext(&ctx_, swap_ctx_, (intptr_t) this, true);
+    jump_fcontext_v1(&ctx_, swap_ctx_, (intptr_t) this, true);
     return true;
 #endif
 }

thirdparty/boost/asm/jump_arm64_aapcs_elf_gas.S

@@ -54,9 +54,9 @@
 .cpu    generic+fp+simd
 .text
 .align  2
-.global jump_fcontext
-.type   jump_fcontext, %function
-jump_fcontext:
+.global jump_fcontext_v1
+.type   jump_fcontext_v1, %function
+jump_fcontext_v1:
     # prepare stack for GP + FPU
     sub  sp, sp, #0xb0
 
@@ -126,7 +126,7 @@ jump_fcontext:
     add  sp, sp, #0xb0
 
     ret x4
-.size   jump_fcontext,.-jump_fcontext
+.size   jump_fcontext_v1,.-jump_fcontext_v1
 #ifndef __NetBSD__
 # Mark that we don't need executable stack.
 .section .note.GNU-stack,"",%progbits

thirdparty/boost/asm/jump_arm64_aapcs_macho_gas.S

@@ -46,9 +46,9 @@
  *******************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _jump_fcontext_v1
 .balign 16
-_jump_fcontext:
+_jump_fcontext_v1:
     ; prepare stack for GP + FPU
     sub  sp, sp, #0xb0
 

thirdparty/boost/asm/jump_arm_aapcs_elf_gas.S

@@ -39,10 +39,10 @@
  *******************************************************/
 
 .text
-.globl jump_fcontext
+.globl jump_fcontext_v1
 .align 2
-.type jump_fcontext,%function
-jump_fcontext:
+.type jump_fcontext_v1,%function
+jump_fcontext_v1:
     @ save LR as PC
     push {lr}
     @ save V1-V8,LR
@@ -87,7 +87,7 @@ jump_fcontext:
     
     @ restore v1-V8,LR,PC
     pop {v1-v8,lr,pc}
-.size jump_fcontext,.-jump_fcontext
+.size jump_fcontext_v1,.-jump_fcontext_v1
 
 #ifndef __NetBSD__
 @ Mark that we don't need executable stack.

thirdparty/boost/asm/jump_arm_aapcs_macho_gas.S

@@ -39,9 +39,9 @@
  * *****************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _jump_fcontext_v1
 .align 2
-_jump_fcontext:
+_jump_fcontext_v1:
     @ save LR as PC
     push {lr}
     @ save V1-V8,LR

thirdparty/boost/asm/jump_arm_aapcs_pe_armasm.asm

@@ -40,9 +40,9 @@
 
     AREA |.text|, CODE
     ALIGN 4
-    EXPORT jump_fcontext
+    EXPORT jump_fcontext_v1
 
-jump_fcontext PROC
+jump_fcontext_v1 PROC
     @ save LR as PC
     push {lr}
     @ save V1-V8,LR

thirdparty/boost/asm/jump_i386_ms_pe_gas.asm

@@ -26,10 +26,10 @@
 .file	"jump_i386_ms_pe_gas.asm"
 .text
 .p2align 4,,15
-.globl	_jump_fcontext
-.def	_jump_fcontext;	.scl	2;	.type	32;	.endef
-_jump_fcontext:
-    /* fourth arg of jump_fcontext() == flag indicating preserving FPU */
+.globl	_jump_fcontext_v1
+.def	_jump_fcontext_v1;	.scl	2;	.type	32;	.endef
+_jump_fcontext_v1:
+    /* fourth arg of jump_fcontext_v1() == flag indicating preserving FPU */
     movl  0x10(%esp), %ecx
 
     pushl  %ebp  /* save EBP */
@@ -73,16 +73,16 @@ _jump_fcontext:
     fnstcw  0x04(%esp)
 
 1:
-    /* first arg of jump_fcontext() == context jumping from */
+    /* first arg of jump_fcontext_v1() == context jumping from */
     movl  0x30(%esp), %eax
 
     /* store ESP (pointing to context-data) in EAX */
     movl  %esp, (%eax)
 
-    /* second arg of jump_fcontext() == context jumping to */
+    /* second arg of jump_fcontext_v1() == context jumping to */
     movl  0x34(%esp), %edx
 
-    /* third arg of jump_fcontext() == value to be returned after jump */
+    /* third arg of jump_fcontext_v1() == value to be returned after jump */
     movl  0x38(%esp), %eax
 
     /* restore ESP (pointing to context-data) from EDX */

thirdparty/boost/asm/jump_i386_ms_pe_masm.asm

@@ -24,8 +24,8 @@
 .model flat, c
 .code
 
-jump_fcontext PROC BOOST_CONTEXT_EXPORT
-    ; fourth arg of jump_fcontext() == flag indicating preserving FPU
+jump_fcontext_v1 PROC BOOST_CONTEXT_EXPORT
+    ; fourth arg of jump_fcontext_v1() == flag indicating preserving FPU
     mov  ecx, [esp+010h]
 
     push  ebp  ; save EBP 
@@ -71,16 +71,16 @@ jump_fcontext PROC BOOST_CONTEXT_EXPORT
     fnstcw  [esp+04h]
 
 nxt1:
-    ; first arg of jump_fcontext() == context jumping from
+    ; first arg of jump_fcontext_v1() == context jumping from
     mov  eax, [esp+030h]
 
     ; store ESP (pointing to context-data) in EAX
     mov  [eax], esp
 
-    ; second arg of jump_fcontext() == context jumping to
+    ; second arg of jump_fcontext_v1() == context jumping to
     mov  edx, [esp+034h]
 
-    ; third arg of jump_fcontext() == value to be returned after jump
+    ; third arg of jump_fcontext_v1() == value to be returned after jump
     mov  eax, [esp+038h]
 
     ; restore ESP (pointing to context-data) from EDX
@@ -138,5 +138,5 @@ nxt2:
 
     ; indirect jump to context
     jmp  edx
-jump_fcontext ENDP
+jump_fcontext_v1 ENDP
 END

thirdparty/boost/asm/jump_i386_sysv_elf_gas.S

@@ -18,11 +18,11 @@
  ****************************************************************************************/
 
 .text
-.globl jump_fcontext
+.globl jump_fcontext_v1
 .align 2
-.type jump_fcontext,@function
-jump_fcontext:
-    /* fourth arg of jump_fcontext() == flag indicating preserving FPU */
+.type jump_fcontext_v1,@function
+jump_fcontext_v1:
+    /* fourth arg of jump_fcontext_v1() == flag indicating preserving FPU */
     movl  0x10(%esp), %ecx
 
     pushl  %ebp  /* save EBP */
@@ -43,16 +43,16 @@ jump_fcontext:
     fnstcw  0x4(%esp)
 
 1:
-    /* first arg of jump_fcontext() == context jumping from */
+    /* first arg of jump_fcontext_v1() == context jumping from */
     movl  0x1c(%esp), %eax
 
     /* store ESP (pointing to context-data) in EAX */
     movl  %esp, (%eax)
 
-    /* second arg of jump_fcontext() == context jumping to */
+    /* second arg of jump_fcontext_v1() == context jumping to */
     movl  0x20(%esp), %edx
 
-    /* third arg of jump_fcontext() == value to be returned after jump */
+    /* third arg of jump_fcontext_v1() == value to be returned after jump */
     movl  0x24(%esp), %eax
 
     /* restore ESP (pointing to context-data) from EDX */
@@ -84,7 +84,7 @@ jump_fcontext:
 
     /* indirect jump to context */
     jmp  *%edx
-.size jump_fcontext,.-jump_fcontext
+.size jump_fcontext_v1,.-jump_fcontext_v1
 
 /* Mark that we don't need executable stack.  */
 .section .note.GNU-stack,"",%progbits

thirdparty/boost/asm/jump_i386_sysv_macho_gas.S

@@ -18,10 +18,10 @@
  ****************************************************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _jump_fcontext_v1
 .align 2
-_jump_fcontext:
-    /* fourth arg of jump_fcontext() == flag indicating preserving FPU */
+_jump_fcontext_v1:
+    /* fourth arg of jump_fcontext_v1() == flag indicating preserving FPU */
     movl  0x10(%esp), %ecx
 
     pushl  %ebp  /* save EBP */
@@ -42,16 +42,16 @@ _jump_fcontext:
     fnstcw  0x4(%esp)
 
 1:
-    /* first arg of jump_fcontext() == context jumping from */
+    /* first arg of jump_fcontext_v1() == context jumping from */
     movl  0x1c(%esp), %eax
 
     /* store ESP (pointing to context-data) in EAX */
     movl  %esp, (%eax)
 
-    /* second arg of jump_fcontext() == context jumping to */
+    /* second arg of jump_fcontext_v1() == context jumping to */
     movl  0x20(%esp), %edx
 
-    /* third arg of jump_fcontext() == value to be returned after jump */
+    /* third arg of jump_fcontext_v1() == value to be returned after jump */
     movl  0x24(%esp), %eax
 
     /* restore ESP (pointing to context-data) from EDX */

thirdparty/boost/asm/jump_mips32_o32_elf_gas.S

@@ -32,11 +32,11 @@
  * *****************************************************/
 
 .text
-.globl jump_fcontext
+.globl jump_fcontext_v1
 .align 2
-.type jump_fcontext,@function
-.ent jump_fcontext
-jump_fcontext:
+.type jump_fcontext_v1,@function
+.ent jump_fcontext_v1
+jump_fcontext_v1:
     # reserve space on stack
     addiu $sp, $sp, -92
 
@@ -111,8 +111,8 @@ jump_fcontext:
 
     # jump to context
     jr  $t9
-.end jump_fcontext
-.size jump_fcontext, .-jump_fcontext
+.end jump_fcontext_v1
+.size jump_fcontext_v1, .-jump_fcontext_v1
 
 /* Mark that we don't need executable stack.  */
 .section .note.GNU-stack,"",%progbits

thirdparty/boost/asm/jump_mips64_n64_elf_gas.S

@@ -50,11 +50,11 @@
  * *****************************************************/
 
 .text
-.globl jump_fcontext
+.globl jump_fcontext_v1
 .align 3
-.type jump_fcontext,@function
-.ent jump_fcontext
-jump_fcontext:
+.type jump_fcontext_v1,@function
+.ent jump_fcontext_v1
+jump_fcontext_v1:
     # reserve space on stack
     daddiu $sp, $sp, -160
 
@@ -131,8 +131,8 @@ jump_fcontext:
 
     # jump to context
     jr  $t9
-.end jump_fcontext
-.size jump_fcontext, .-jump_fcontext
+.end jump_fcontext_v1
+.size jump_fcontext_v1, .-jump_fcontext_v1
 
 /* Mark that we don't need executable stack.  */
 .section .note.GNU-stack,"",%progbits

thirdparty/boost/asm/jump_ppc32_sysv_elf_gas.S

@@ -67,10 +67,10 @@
  *******************************************************/
 
 .text
-.globl jump_fcontext
+.globl jump_fcontext_v1
 .align 2
-.type jump_fcontext,@function
-jump_fcontext:
+.type jump_fcontext_v1,@function
+jump_fcontext_v1:
     # reserve space on stack
     subi  %r1, %r1, 240
 
@@ -202,7 +202,7 @@ jump_fcontext:
 
     # jump to context
     bctr
-.size jump_fcontext, .-jump_fcontext
+.size jump_fcontext_v1, .-jump_fcontext_v1
 
 #ifndef __NetBSD__
 /* Mark that we don't need executable stack.  */

thirdparty/boost/asm/jump_ppc32_sysv_macho_gas.S

@@ -67,9 +67,9 @@
  *******************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _jump_fcontext_v1
 .align 2
-_jump_fcontext:
+_jump_fcontext_v1:
     ; reserve space on stack
     subi  r1, r1, 240