archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Convert CRLF line endings to LF (#15767)

Browse source 
This patch simplifies line endings tracked in the Git repository and
syncs them to the LF style instead of the CRLF.

Newline characters:
- LF (\n) (*nix and Mac)
- CRLF (\r\n) (Windows)
- CR (\r) (old Mac, obsolete)

To see which line endings are in the index and in the working copy the
following command can be used:
`git ls-files --eol`

Git also provides `.gitattributes` file to specify files that need
specific line endings in the working directory on all platforms (either
CRLF or LF):

```
file-with-crlf text eol=crlf
```

Changed files shouldn't cause issues on modern Windows platforms because
also Git can do output conversion if core.autocrlf=true is set on
Windows and use CRLF newlines in all files in the working tree.

Unless CRLF files are tracked specifically, Git by default tracks all
files in the index using LF newlines.
This commit is contained in:
Peter Kokot 2024-09-07 11:03:32 +02:00 • committed by GitHub
parent 5ea6b044cd
commit de48b90d61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 239 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

264
Zend/asm/jump_arm64_aapcs_pe_armasm.asm
View file

@ -1,133 +1,133 @@
; Copyright Edward Nevill + Oliver Kowalke 2015 ; Copyright Edward Nevill + Oliver Kowalke 2015
; Distributed under the Boost Software License, Version 1.0. ; Distributed under the Boost Software License, Version 1.0.
; (See accompanying file LICENSE_1_0.txt or copy at ; (See accompanying file LICENSE_1_0.txt or copy at
; http://www.boost.org/LICENSE_1_0.txt) ; http://www.boost.org/LICENSE_1_0.txt)
;******************************************************* ;*******************************************************
;* * ;* *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ;* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| * ;* | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | d8 | d9 | d10 | d11 | * ;* | d8 | d9 | d10 | d11 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ;* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| * ;* | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | d12 | d13 | d14 | d15 | * ;* | d12 | d13 | d14 | d15 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ;* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| * ;* | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | x19 | x20 | x21 | x22 | * ;* | x19 | x20 | x21 | x22 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ;* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| * ;* | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | x23 | x24 | x25 | x26 | * ;* | x23 | x24 | x25 | x26 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * ;* | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| * ;* | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | x27 | x28 | FP | LR | * ;* | x27 | x28 | FP | LR | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | * ;* | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| * ;* | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | fiber data| base | limit | dealloc | * ;* | fiber data| base | limit | dealloc | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 48 | 49 | 50 | 51 | | | * ;* | 48 | 49 | 50 | 51 | | | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0xc0| 0xc4| 0xc8| 0xcc| | | * ;* | 0xc0| 0xc4| 0xc8| 0xcc| | | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | PC | align | | | * ;* | PC | align | | | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* * ;* *
;******************************************************* ;*******************************************************
AREA |.text|, CODE, READONLY, ALIGN=4, CODEALIGN AREA |.text|, CODE, READONLY, ALIGN=4, CODEALIGN
EXPORT jump_fcontext EXPORT jump_fcontext
jump_fcontext proc jump_fcontext proc
; prepare stack for GP + FPU ; prepare stack for GP + FPU
sub sp, sp, #0xd0 sub sp, sp, #0xd0
; save d8 - d15 ; save d8 - d15
stp d8, d9, [sp, #0x00] stp d8, d9, [sp, #0x00]
stp d10, d11, [sp, #0x10] stp d10, d11, [sp, #0x10]
stp d12, d13, [sp, #0x20] stp d12, d13, [sp, #0x20]
stp d14, d15, [sp, #0x30] stp d14, d15, [sp, #0x30]
; save x19-x30 ; save x19-x30
stp x19, x20, [sp, #0x40] stp x19, x20, [sp, #0x40]
stp x21, x22, [sp, #0x50] stp x21, x22, [sp, #0x50]
stp x23, x24, [sp, #0x60] stp x23, x24, [sp, #0x60]
stp x25, x26, [sp, #0x70] stp x25, x26, [sp, #0x70]
stp x27, x28, [sp, #0x80] stp x27, x28, [sp, #0x80]
stp x29, x30, [sp, #0x90] stp x29, x30, [sp, #0x90]
; save LR as PC ; save LR as PC
str x30, [sp, #0xc0] str x30, [sp, #0xc0]
; save current stack base and limit ; save current stack base and limit
ldp x5, x6, [x18, #0x08] ; TeStackBase and TeStackLimit at ksarm64.h ldp x5, x6, [x18, #0x08] ; TeStackBase and TeStackLimit at ksarm64.h
stp x5, x6, [sp, #0xa0] stp x5, x6, [sp, #0xa0]
; save current fiber data and deallocation stack ; save current fiber data and deallocation stack
ldr x5, [x18, #0x1478] ; TeDeallocationStack at ksarm64.h ldr x5, [x18, #0x1478] ; TeDeallocationStack at ksarm64.h
ldr x6, [x18, #0x20] ; TeFiberData at ksarm64.h ldr x6, [x18, #0x20] ; TeFiberData at ksarm64.h
stp x5, x6, [sp, #0xb0] stp x5, x6, [sp, #0xb0]
; store RSP (pointing to context-data) in X0 ; store RSP (pointing to context-data) in X0
mov x4, sp mov x4, sp
; restore RSP (pointing to context-data) from X1 ; restore RSP (pointing to context-data) from X1
mov sp, x0 mov sp, x0
; restore stack base and limit ; restore stack base and limit
ldp x5, x6, [sp, #0xa0] ldp x5, x6, [sp, #0xa0]
stp x5, x6, [x18, #0x08] ; TeStackBase and TeStackLimit at ksarm64.h stp x5, x6, [x18, #0x08] ; TeStackBase and TeStackLimit at ksarm64.h
; restore fiber data and deallocation stack ; restore fiber data and deallocation stack
ldp x5, x6, [sp, #0xb0] ldp x5, x6, [sp, #0xb0]
str x5, [x18, #0x1478] ; TeDeallocationStack at ksarm64.h str x5, [x18, #0x1478] ; TeDeallocationStack at ksarm64.h
str x6, [x18, #0x20] ; TeFiberData at ksarm64.h str x6, [x18, #0x20] ; TeFiberData at ksarm64.h
; load d8 - d15 ; load d8 - d15
ldp d8, d9, [sp, #0x00] ldp d8, d9, [sp, #0x00]
ldp d10, d11, [sp, #0x10] ldp d10, d11, [sp, #0x10]
ldp d12, d13, [sp, #0x20] ldp d12, d13, [sp, #0x20]
ldp d14, d15, [sp, #0x30] ldp d14, d15, [sp, #0x30]
; load x19-x30 ; load x19-x30
ldp x19, x20, [sp, #0x40] ldp x19, x20, [sp, #0x40]
ldp x21, x22, [sp, #0x50] ldp x21, x22, [sp, #0x50]
ldp x23, x24, [sp, #0x60] ldp x23, x24, [sp, #0x60]
ldp x25, x26, [sp, #0x70] ldp x25, x26, [sp, #0x70]
ldp x27, x28, [sp, #0x80] ldp x27, x28, [sp, #0x80]
ldp x29, x30, [sp, #0x90] ldp x29, x30, [sp, #0x90]
; return transfer_t from jump ; return transfer_t from jump
; pass transfer_t as first arg in context function ; pass transfer_t as first arg in context function
; X0 == FCTX, X1 == DATA ; X0 == FCTX, X1 == DATA
mov x0, x4 mov x0, x4
; load pc ; load pc
ldr x4, [sp, #0xc0] ldr x4, [sp, #0xc0]
; restore stack from GP + FPU ; restore stack from GP + FPU
add sp, sp, #0xd0 add sp, sp, #0xd0
ret x4 ret x4
ENDP ENDP
END END

214
Zend/asm/make_arm64_aapcs_pe_armasm.asm
View file

@ -1,107 +1,107 @@
; Copyright Edward Nevill + Oliver Kowalke 2015 ; Copyright Edward Nevill + Oliver Kowalke 2015
; Distributed under the Boost Software License, Version 1.0. ; Distributed under the Boost Software License, Version 1.0.
; (See accompanying file LICENSE_1_0.txt or copy at ; (See accompanying file LICENSE_1_0.txt or copy at
; http://www.boost.org/LICENSE_1_0.txt) ; http://www.boost.org/LICENSE_1_0.txt)
;******************************************************* ;*******************************************************
;* * ;* *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ;* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| * ;* | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | d8 | d9 | d10 | d11 | * ;* | d8 | d9 | d10 | d11 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ;* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| * ;* | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | d12 | d13 | d14 | d15 | * ;* | d12 | d13 | d14 | d15 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ;* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| * ;* | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | x19 | x20 | x21 | x22 | * ;* | x19 | x20 | x21 | x22 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ;* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| * ;* | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | x23 | x24 | x25 | x26 | * ;* | x23 | x24 | x25 | x26 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * ;* | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| * ;* | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | x27 | x28 | FP | LR | * ;* | x27 | x28 | FP | LR | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | * ;* | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| * ;* | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | base | limit | dealloc | fiber data| * ;* | base | limit | dealloc | fiber data| *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 48 | 49 | 50 | 51 | | | * ;* | 48 | 49 | 50 | 51 | | | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | 0xc0| 0xc4| 0xc8| 0xcc| | | * ;* | 0xc0| 0xc4| 0xc8| 0xcc| | | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* | PC | align | | | * ;* | PC | align | | | *
;* ------------------------------------------------- * ;* ------------------------------------------------- *
;* * ;* *
;******************************************************* ;*******************************************************
AREA |.text|, CODE, READONLY, ALIGN=4, CODEALIGN AREA |.text|, CODE, READONLY, ALIGN=4, CODEALIGN
EXPORT make_fcontext EXPORT make_fcontext
IMPORT _exit IMPORT _exit
make_fcontext proc make_fcontext proc
; save stack top address to x3 ; save stack top address to x3
mov x3, x0 mov x3, x0
; shift address in x0 (allocated stack) to lower 16 byte boundary ; shift address in x0 (allocated stack) to lower 16 byte boundary
and x0, x0, ~0xF and x0, x0, ~0xF
; reserve space for context-data on context-stack ; reserve space for context-data on context-stack
sub x0, x0, #0xd0 sub x0, x0, #0xd0
; save top address of context_stack as 'base' ; save top address of context_stack as 'base'
str x3, [x0, #0xa0] str x3, [x0, #0xa0]
; save bottom address of context-stack as 'limit' and 'dealloction stack' ; save bottom address of context-stack as 'limit' and 'dealloction stack'
sub x3, x3, x1 sub x3, x3, x1
stp x3, x3, [x0, #0xa8] stp x3, x3, [x0, #0xa8]
; save 0 as 'fiber data' ; save 0 as 'fiber data'
str xzr, [x0, #0xb8] str xzr, [x0, #0xb8]
; third arg of make_fcontext() == address of context-function ; third arg of make_fcontext() == address of context-function
; store address as x19 for trampoline ; store address as x19 for trampoline
str x2, [x0, #0x40] str x2, [x0, #0x40]
; store trampoline address as pc ; store trampoline address as pc
adr x2, trampoline adr x2, trampoline
str x2, [x0, #0xc0] str x2, [x0, #0xc0]
; save address of finish as return-address for context-function ; save address of finish as return-address for context-function
; will be entered after context-function returns (LR register) ; will be entered after context-function returns (LR register)
adr x1, finish adr x1, finish
str x1, [x0, #0x98] str x1, [x0, #0x98]
ret x30 ; return pointer to context-data (x0) ret x30 ; return pointer to context-data (x0)
trampoline trampoline
stp fp, lr, [sp, #-0x10]! stp fp, lr, [sp, #-0x10]!
mov fp, sp mov fp, sp
blr x19 blr x19
finish finish
; exit code is zero ; exit code is zero
mov x0, #0 mov x0, #0
; exit application ; exit application
bl _exit bl _exit
ENDP ENDP
END END