twose · Jan 4, 2022
diff --git a/Zend/asm/jump_arm64_aapcs_elf_gas.S b/Zend/asm/jump_arm64_aapcs_elf_gas.S
@@ -54,9 +54,9 @@
 .file "jump_arm64_aapcs_elf_gas.S"
 .text
 .align  2
-.global jump_fcontext
-.type   jump_fcontext, %function
-jump_fcontext:
+.global zend_jump_fcontext
+.type   zend_jump_fcontext, %function
+zend_jump_fcontext:
     # prepare stack for GP + FPU
     sub  sp, sp, #0xb0
 
@@ -109,6 +109,6 @@ jump_fcontext:
     add  sp, sp, #0xb0
 
     ret x4
-.size   jump_fcontext,.-jump_fcontext
+.size   zend_jump_fcontext,.-zend_jump_fcontext
 # Mark that we don't need executable stack.
 .section .note.GNU-stack,"",%progbits
diff --git a/Zend/asm/jump_arm64_aapcs_macho_gas.S b/Zend/asm/jump_arm64_aapcs_macho_gas.S
@@ -52,9 +52,9 @@
  *******************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _zend_jump_fcontext
 .balign 16
-_jump_fcontext:
+_zend_jump_fcontext:
     ; prepare stack for GP + FPU
     sub  sp, sp, #0xb0
 

diff --git a/Zend/asm/jump_arm_aapcs_elf_gas.S b/Zend/asm/jump_arm_aapcs_elf_gas.S
@@ -40,11 +40,11 @@
 
 .file "jump_arm_aapcs_elf_gas.S"
 .text
-.globl jump_fcontext
+.globl zend_jump_fcontext
 .align 2
-.type jump_fcontext,%function
+.type zend_jump_fcontext,%function
 .syntax unified
-jump_fcontext:
+zend_jump_fcontext:
     @ save LR as PC
     push {lr}
     @ save hidden,V1-V8,LR
@@ -82,7 +82,7 @@ jump_fcontext:
 
     @ restore PC
     pop {pc}
-.size jump_fcontext,.-jump_fcontext
+.size zend_jump_fcontext,.-zend_jump_fcontext
 
 @ Mark that we don't need executable stack.
 .section .note.GNU-stack,"",%progbits
diff --git a/Zend/asm/jump_arm_aapcs_macho_gas.S b/Zend/asm/jump_arm_aapcs_macho_gas.S
@@ -39,9 +39,9 @@
  *******************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _zend_jump_fcontext
 .align 2
-_jump_fcontext:
+_zend_jump_fcontext:
     @ save LR as PC
     push {lr}
     @ save hidden,V1-V8,LR

diff --git a/Zend/asm/jump_i386_ms_pe_masm.asm b/Zend/asm/jump_i386_ms_pe_masm.asm
@@ -24,7 +24,7 @@
 .model flat, c
 .code
 
-jump_fcontext PROC BOOST_CONTEXT_EXPORT
+zend_jump_fcontext PROC BOOST_CONTEXT_EXPORT
     ; prepare stack
     lea  esp, [esp-02ch]
 
@@ -63,7 +63,7 @@ ENDIF
     ; store ESP (pointing to context-data) in EAX
     mov  eax, esp
 
-    ; firstarg of jump_fcontext() == fcontext to jump to
+    ; firstarg of zend_jump_fcontext() == fcontext to jump to
     mov  ecx, [esp+030h]
 
     ; restore ESP (pointing to context-data) from ECX
@@ -112,5 +112,5 @@ ENDIF
 
     ; jump to context
     jmp ecx
-jump_fcontext ENDP
+zend_jump_fcontext ENDP
 END
diff --git a/Zend/asm/jump_i386_sysv_elf_gas.S b/Zend/asm/jump_i386_sysv_elf_gas.S
@@ -26,10 +26,10 @@
 
 .file "jump_i386_sysv_elf_gas.S"
 .text
-.globl jump_fcontext
+.globl zend_jump_fcontext
 .align 2
-.type jump_fcontext,@function
-jump_fcontext:
+.type zend_jump_fcontext,@function
+zend_jump_fcontext:
     leal  -0x18(%esp), %esp  /* prepare stack */
 
 #if !defined(BOOST_USE_TSX)
@@ -45,10 +45,10 @@ jump_fcontext:
     /* store ESP (pointing to context-data) in ECX */
     movl  %esp, %ecx
 
-    /* first arg of jump_fcontext() == fcontext to jump to */
+    /* first arg of zend_jump_fcontext() == fcontext to jump to */
     movl  0x20(%esp), %eax
 
-    /* second arg of jump_fcontext() == data to be transferred */
+    /* second arg of zend_jump_fcontext() == data to be transferred */
     movl  0x24(%esp), %edx
 
     /* restore ESP (pointing to context-data) from EAX */
@@ -77,7 +77,7 @@ jump_fcontext:
 
     /* jump to context */
     jmp *%ecx
-.size jump_fcontext,.-jump_fcontext
+.size zend_jump_fcontext,.-zend_jump_fcontext
 
 /* Mark that we don't need executable stack.  */
 .section .note.GNU-stack,"",%progbits
diff --git a/Zend/asm/jump_i386_sysv_macho_gas.S b/Zend/asm/jump_i386_sysv_macho_gas.S
@@ -25,9 +25,9 @@
  ****************************************************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _zend_jump_fcontext
 .align 2
-_jump_fcontext:
+_zend_jump_fcontext:
     leal  -0x18(%esp), %esp  /* prepare stack */
 
 #if !defined(BOOST_USE_TSX)
@@ -43,10 +43,10 @@ _jump_fcontext:
     /* store ESP (pointing to context-data) in ECX */
     movl  %esp, %ecx
 
-    /* first arg of jump_fcontext() == fcontext to jump to */
+    /* first arg of zend_jump_fcontext() == fcontext to jump to */
     movl  0x1c(%esp), %eax
 
-    /* second arg of jump_fcontext() == data to be transferred */
+    /* second arg of zend_jump_fcontext() == data to be transferred */
     movl  0x20(%esp), %edx
 
     /* restore ESP (pointing to context-data) from EAX */

diff --git a/Zend/asm/jump_mips32_o32_elf_gas.S b/Zend/asm/jump_mips32_o32_elf_gas.S
@@ -40,11 +40,11 @@
 
 .file "jump_mips32_o32_elf_gas.S"
 .text
-.globl jump_fcontext
+.globl zend_jump_fcontext
 .align 2
-.type jump_fcontext,@function
-.ent jump_fcontext
-jump_fcontext:
+.type zend_jump_fcontext,@function
+.ent zend_jump_fcontext
+zend_jump_fcontext:
     # reserve space on stack
     addiu $sp, $sp, -96
 
@@ -112,8 +112,8 @@ jump_fcontext:
 
     # jump to context
     jr  $t9
-.end jump_fcontext
-.size jump_fcontext, .-jump_fcontext
+.end zend_jump_fcontext
+.size zend_jump_fcontext, .-zend_jump_fcontext
 
 /* Mark that we don't need executable stack.  */
 .section .note.GNU-stack,"",%progbits
diff --git a/Zend/asm/jump_mips64_n64_elf_gas.S b/Zend/asm/jump_mips64_n64_elf_gas.S
@@ -47,11 +47,11 @@
 
 .file "jump_mips64_n64_elf_gas.S"
 .text
-.globl jump_fcontext
+.globl zend_jump_fcontext
 .align 3
-.type jump_fcontext,@function
-.ent jump_fcontext
-jump_fcontext:
+.type zend_jump_fcontext,@function
+.ent zend_jump_fcontext
+zend_jump_fcontext:
     # reserve space on stack
     daddiu $sp, $sp, -160
 
@@ -117,8 +117,8 @@ jump_fcontext:
 
     # jump to context
     jr  $t9
-.end jump_fcontext
-.size jump_fcontext, .-jump_fcontext
+.end zend_jump_fcontext
+.size zend_jump_fcontext, .-zend_jump_fcontext
 
 /* Mark that we don't need executable stack.  */
 .section .note.GNU-stack,"",%progbits
diff --git a/Zend/asm/jump_ppc32_sysv_elf_gas.S b/Zend/asm/jump_ppc32_sysv_elf_gas.S
@@ -52,12 +52,12 @@
 
 .file "jump_ppc32_sysv_elf_gas.S"
 .text
-.globl jump_fcontext
+.globl zend_jump_fcontext
 .align 2
-.type jump_fcontext,@function
-jump_fcontext:
-    # Linux: jump_fcontext( hidden transfer_t * R3, R4, R5)
-    # Other: transfer_t R3:R4 = jump_fcontext( R3, R4)
+.type zend_jump_fcontext,@function
+zend_jump_fcontext:
+    # Linux: zend_jump_fcontext( hidden transfer_t * R3, R4, R5)
+    # Other: transfer_t R3:R4 = zend_jump_fcontext( R3, R4)
 
     mflr  %r0  # return address from LR
     mffs  %f0  # FPSCR
@@ -195,7 +195,7 @@ jump_fcontext:
 
     # jump to context
     bctr
-.size jump_fcontext, .-jump_fcontext
+.size zend_jump_fcontext, .-zend_jump_fcontext
 
 /* Mark that we don't need executable stack.  */
 .section .note.GNU-stack,"",%progbits
diff --git a/Zend/asm/jump_ppc32_sysv_macho_gas.S b/Zend/asm/jump_ppc32_sysv_macho_gas.S
@@ -74,9 +74,9 @@
  *******************************************************/
 
 .text
-.globl _jump_fcontext
+.globl _zend_jump_fcontext
 .align 2
-_jump_fcontext:
+_zend_jump_fcontext:
     ; reserve space on stack
     subi  r1, r1, 244
 

diff --git a/Zend/asm/jump_ppc32_sysv_xcoff_gas.S b/Zend/asm/jump_ppc32_sysv_xcoff_gas.S
@@ -58,13 +58,13 @@
     .file "jump_ppc32_sysv_xcoff_gas.S"
     .toc
     .csect .text[PR], 5
-    .globl  jump_fcontext[DS]
-    .globl .jump_fcontext
-    .csect  jump_fcontext[DS]
-jump_fcontext:
-    .long .jump_fcontext[PR], TOC[tc0], 0
+    .globl  zend_jump_fcontext[DS]
+    .globl .zend_jump_fcontext
+    .csect  zend_jump_fcontext[DS]
+zend_jump_fcontext:
+    .long .zend_jump_fcontext[PR], TOC[tc0], 0
     .csect .text[PR], 5
-.jump_fcontext:
+.zend_jump_fcontext:
     # reserve space on stack
     subi  1, 1, 256
 

diff --git a/Zend/asm/jump_ppc64_sysv_elf_gas.S b/Zend/asm/jump_ppc64_sysv_elf_gas.S
@@ -67,33 +67,33 @@
  *******************************************************/
 
 .file "jump_ppc64_sysv_elf_gas.S"
-.globl jump_fcontext
+.globl zend_jump_fcontext
 #if _CALL_ELF == 2
 	.text
 	.align 2
-jump_fcontext:
-        addis   %r2, %r12, .TOC.-jump_fcontext@ha
-        addi    %r2, %r2, .TOC.-jump_fcontext@l
-        .localentry jump_fcontext, . - jump_fcontext
+zend_jump_fcontext:
+        addis   %r2, %r12, .TOC.-zend_jump_fcontext@ha
+        addi    %r2, %r2, .TOC.-zend_jump_fcontext@l
+        .localentry zend_jump_fcontext, . - zend_jump_fcontext
 #else
 	.section ".opd","aw"
 	.align 3
-jump_fcontext:
+zend_jump_fcontext:
 # ifdef _CALL_LINUX
-        .quad   .L.jump_fcontext,.TOC.@tocbase,0
-        .type   jump_fcontext,@function
+        .quad   .L.zend_jump_fcontext,.TOC.@tocbase,0
+        .type   zend_jump_fcontext,@function
         .text
         .align 2
-.L.jump_fcontext:
+.L.zend_jump_fcontext:
 # else
-        .hidden .jump_fcontext
-        .globl  .jump_fcontext
-        .quad   .jump_fcontext,.TOC.@tocbase,0
-        .size   jump_fcontext,24
-        .type   .jump_fcontext,@function
+        .hidden .zend_jump_fcontext
+        .globl  .zend_jump_fcontext
+        .quad   .zend_jump_fcontext,.TOC.@tocbase,0
+        .size   zend_jump_fcontext,24
+        .type   .zend_jump_fcontext,@function
         .text
         .align 2
-.jump_fcontext:
+.zend_jump_fcontext:
 # endif
 #endif
     # reserve space on stack
@@ -189,7 +189,7 @@ jump_fcontext:
 
     # jump to context
     bctr
-	.size jump_fcontext, .-jump_fcontext
+	.size zend_jump_fcontext, .-zend_jump_fcontext
 #else
     # zero in r3 indicates first jump to context-function
     cmpdi %r3, 0
@@ -210,9 +210,9 @@ use_entry_arg:
     # jump to context
     bctr
 # ifdef _CALL_LINUX
-	.size .jump_fcontext, .-.L.jump_fcontext
+	.size .zend_jump_fcontext, .-.L.zend_jump_fcontext
 # else
-	.size .jump_fcontext, .-.jump_fcontext
+	.size .zend_jump_fcontext, .-.zend_jump_fcontext
 # endif
 #endif
 

diff --git a/Zend/asm/jump_ppc64_sysv_macho_gas.S b/Zend/asm/jump_ppc64_sysv_macho_gas.S
@@ -68,9 +68,9 @@
 
 .text
 .align 2
-.globl _jump_fcontext
+.globl _zend_jump_fcontext
 
-_jump_fcontext:
+_zend_jump_fcontext:
     ; reserve space on stack
     subi  r1, r1, 184
 

diff --git a/Zend/asm/jump_ppc64_sysv_xcoff_gas.S b/Zend/asm/jump_ppc64_sysv_xcoff_gas.S
@@ -71,13 +71,13 @@
     .toc
     .csect .text[PR], 5
     .align 2
-    .globl  jump_fcontext[DS]
-    .globl .jump_fcontext
-    .csect  jump_fcontext[DS], 3
-jump_fcontext:
-    .llong .jump_fcontext[PR], TOC[tc0], 0
+    .globl  zend_jump_fcontext[DS]
+    .globl .zend_jump_fcontext
+    .csect  zend_jump_fcontext[DS], 3
+zend_jump_fcontext:
+    .llong .zend_jump_fcontext[PR], TOC[tc0], 0
     .csect .text[PR], 5
-.jump_fcontext:
+.zend_jump_fcontext:
     # reserve space on stack
     subi  1, 1, 184
 

diff --git a/Zend/asm/jump_riscv64_sysv_elf_gas.S b/Zend/asm/jump_riscv64_sysv_elf_gas.S
@@ -60,9 +60,9 @@
 .file "jump_riscv64_sysv_elf_gas.S"
 .text
 .align  1
-.global jump_fcontext
-.type   jump_fcontext, %function
-jump_fcontext:
+.global zend_jump_fcontext
+.type   zend_jump_fcontext, %function
+zend_jump_fcontext:
     # prepare stack for GP + FPU
     addi  sp, sp, -0xd0
 
@@ -145,6 +145,6 @@ jump_fcontext:
     addi  sp, sp, 0xd0
 
     jr a2
-.size   jump_fcontext,.-jump_fcontext
+.size   zend_jump_fcontext,.-zend_jump_fcontext
 # Mark that we don't need executable stack.
 .section .note.GNU-stack,"",%progbits