Skip to content

Commit 279a297

Browse files
dixyescmb69
dixyes
authored and
cmb69
committed
Windows arm64 build system support
Closes GH-9116.
1 parent 31a9933 commit 279a297

File tree

9 files changed

+368
-57
lines changed

9 files changed

+368
-57
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,9 @@ php
202202
# Generated by x64 compiler, includes Debug, Debug_TS, Release, Release_TS
203203
/x64/
204204

205+
# Generated by arm64 compiler, includes Debug, Debug_TS, Release, Release_TS
206+
/arm64/
207+
205208
# Miscellaneous files generated by Windows build system
206209
/main/config.w32.h
207210
/win32/build/deplister.exe

‎Zend/asm/jump_arm64_aapcs_pe_armasm.asm

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
; Copyright Edward Nevill + Oliver Kowalke 2015
2+
; Distributed under the Boost Software License, Version 1.0.
3+
; (See accompanying file LICENSE_1_0.txt or copy at
4+
; http://www.boost.org/LICENSE_1_0.txt)
5+
6+
;*******************************************************
7+
;* *
8+
;* ------------------------------------------------- *
9+
;* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
10+
;* ------------------------------------------------- *
11+
;* | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| *
12+
;* ------------------------------------------------- *
13+
;* | d8 | d9 | d10 | d11 | *
14+
;* ------------------------------------------------- *
15+
;* ------------------------------------------------- *
16+
;* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
17+
;* ------------------------------------------------- *
18+
;* | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| *
19+
;* ------------------------------------------------- *
20+
;* | d12 | d13 | d14 | d15 | *
21+
;* ------------------------------------------------- *
22+
;* ------------------------------------------------- *
23+
;* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
24+
;* ------------------------------------------------- *
25+
;* | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| *
26+
;* ------------------------------------------------- *
27+
;* | x19 | x20 | x21 | x22 | *
28+
;* ------------------------------------------------- *
29+
;* ------------------------------------------------- *
30+
;* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
31+
;* ------------------------------------------------- *
32+
;* | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| *
33+
;* ------------------------------------------------- *
34+
;* | x23 | x24 | x25 | x26 | *
35+
;* ------------------------------------------------- *
36+
;* ------------------------------------------------- *
37+
;* | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
38+
;* ------------------------------------------------- *
39+
;* | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| *
40+
;* ------------------------------------------------- *
41+
;* | x27 | x28 | FP | LR | *
42+
;* ------------------------------------------------- *
43+
;* ------------------------------------------------- *
44+
;* | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | *
45+
;* ------------------------------------------------- *
46+
;* | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| *
47+
;* ------------------------------------------------- *
48+
;* | fiber data| base | limit | dealloc | *
49+
;* ------------------------------------------------- *
50+
;* ------------------------------------------------- *
51+
;* | 48 | 49 | 50 | 51 | | | *
52+
;* ------------------------------------------------- *
53+
;* | 0xc0| 0xc4| 0xc8| 0xcc| | | *
54+
;* ------------------------------------------------- *
55+
;* | PC | align | | | *
56+
;* ------------------------------------------------- *
57+
;* *
58+
;*******************************************************
59+
60+
AREA |.text|, CODE, READONLY, ALIGN=4, CODEALIGN
61+
EXPORT jump_fcontext
62+
63+
jump_fcontext proc
64+
; prepare stack for GP + FPU
65+
sub sp, sp, #0xd0
66+
67+
; save d8 - d15
68+
stp d8, d9, [sp, #0x00]
69+
stp d10, d11, [sp, #0x10]
70+
stp d12, d13, [sp, #0x20]
71+
stp d14, d15, [sp, #0x30]
72+
73+
; save x19-x30
74+
stp x19, x20, [sp, #0x40]
75+
stp x21, x22, [sp, #0x50]
76+
stp x23, x24, [sp, #0x60]
77+
stp x25, x26, [sp, #0x70]
78+
stp x27, x28, [sp, #0x80]
79+
stp x29, x30, [sp, #0x90]
80+
81+
; save LR as PC
82+
str x30, [sp, #0xc0]
83+
84+
; save current stack base and limit
85+
ldp x5, x6, [x18, #0x08] ; TeStackBase and TeStackLimit at ksarm64.h
86+
stp x5, x6, [sp, #0xa0]
87+
; save current fiber data and deallocation stack
88+
ldr x5, [x18, #0x1478] ; TeDeallocationStack at ksarm64.h
89+
ldr x6, [x18, #0x20] ; TeFiberData at ksarm64.h
90+
stp x5, x6, [sp, #0xb0]
91+
92+
; store RSP (pointing to context-data) in X0
93+
mov x4, sp
94+
95+
; restore RSP (pointing to context-data) from X1
96+
mov sp, x0
97+
98+
; restore stack base and limit
99+
ldp x5, x6, [sp, #0xa0]
100+
stp x5, x6, [x18, #0x08] ; TeStackBase and TeStackLimit at ksarm64.h
101+
; restore fiber data and deallocation stack
102+
ldp x5, x6, [sp, #0xb0]
103+
str x5, [x18, #0x1478] ; TeDeallocationStack at ksarm64.h
104+
str x6, [x18, #0x20] ; TeFiberData at ksarm64.h
105+
106+
; load d8 - d15
107+
ldp d8, d9, [sp, #0x00]
108+
ldp d10, d11, [sp, #0x10]
109+
ldp d12, d13, [sp, #0x20]
110+
ldp d14, d15, [sp, #0x30]
111+
112+
; load x19-x30
113+
ldp x19, x20, [sp, #0x40]
114+
ldp x21, x22, [sp, #0x50]
115+
ldp x23, x24, [sp, #0x60]
116+
ldp x25, x26, [sp, #0x70]
117+
ldp x27, x28, [sp, #0x80]
118+
ldp x29, x30, [sp, #0x90]
119+
120+
; return transfer_t from jump
121+
; pass transfer_t as first arg in context function
122+
; X0 == FCTX, X1 == DATA
123+
mov x0, x4
124+
125+
; load pc
126+
ldr x4, [sp, #0xc0]
127+
128+
; restore stack from GP + FPU
129+
add sp, sp, #0xd0
130+
131+
ret x4
132+
ENDP
133+
END

‎Zend/asm/make_arm64_aapcs_pe_armasm.asm

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
; Copyright Edward Nevill + Oliver Kowalke 2015
2+
; Distributed under the Boost Software License, Version 1.0.
3+
; (See accompanying file LICENSE_1_0.txt or copy at
4+
; http://www.boost.org/LICENSE_1_0.txt)
5+
6+
;*******************************************************
7+
;* *
8+
;* ------------------------------------------------- *
9+
;* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
10+
;* ------------------------------------------------- *
11+
;* | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| *
12+
;* ------------------------------------------------- *
13+
;* | d8 | d9 | d10 | d11 | *
14+
;* ------------------------------------------------- *
15+
;* ------------------------------------------------- *
16+
;* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
17+
;* ------------------------------------------------- *
18+
;* | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| *
19+
;* ------------------------------------------------- *
20+
;* | d12 | d13 | d14 | d15 | *
21+
;* ------------------------------------------------- *
22+
;* ------------------------------------------------- *
23+
;* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
24+
;* ------------------------------------------------- *
25+
;* | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| *
26+
;* ------------------------------------------------- *
27+
;* | x19 | x20 | x21 | x22 | *
28+
;* ------------------------------------------------- *
29+
;* ------------------------------------------------- *
30+
;* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
31+
;* ------------------------------------------------- *
32+
;* | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| *
33+
;* ------------------------------------------------- *
34+
;* | x23 | x24 | x25 | x26 | *
35+
;* ------------------------------------------------- *
36+
;* ------------------------------------------------- *
37+
;* | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
38+
;* ------------------------------------------------- *
39+
;* | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| *
40+
;* ------------------------------------------------- *
41+
;* | x27 | x28 | FP | LR | *
42+
;* ------------------------------------------------- *
43+
;* ------------------------------------------------- *
44+
;* | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | *
45+
;* ------------------------------------------------- *
46+
;* | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| *
47+
;* ------------------------------------------------- *
48+
;* | base | limit | dealloc | fiber data| *
49+
;* ------------------------------------------------- *
50+
;* ------------------------------------------------- *
51+
;* | 48 | 49 | 50 | 51 | | | *
52+
;* ------------------------------------------------- *
53+
;* | 0xc0| 0xc4| 0xc8| 0xcc| | | *
54+
;* ------------------------------------------------- *
55+
;* | PC | align | | | *
56+
;* ------------------------------------------------- *
57+
;* *
58+
;*******************************************************
59+
60+
AREA |.text|, CODE, READONLY, ALIGN=4, CODEALIGN
61+
EXPORT make_fcontext
62+
IMPORT _exit
63+
64+
make_fcontext proc
65+
; save stack top address to x3
66+
mov x3, x0
67+
68+
; shift address in x0 (allocated stack) to lower 16 byte boundary
69+
and x0, x0, ~0xF
70+
71+
; reserve space for context-data on context-stack
72+
sub x0, x0, #0xd0
73+
74+
; save top address of context_stack as 'base'
75+
str x3, [x0, #0xa0]
76+
; save bottom address of context-stack as 'limit' and 'dealloction stack'
77+
sub x3, x3, x1
78+
stp x3, x3, [x0, #0xa8]
79+
; save 0 as 'fiber data'
80+
str xzr, [x0, #0xb8]
81+
82+
; third arg of make_fcontext() == address of context-function
83+
; store address as x19 for trampoline
84+
str x2, [x0, #0x40]
85+
; store trampoline address as pc
86+
adr x2, trampoline
87+
str x2, [x0, #0xc0]
88+
89+
; save address of finish as return-address for context-function
90+
; will be entered after context-function returns (LR register)
91+
adr x1, finish
92+
str x1, [x0, #0x98]
93+
94+
ret x30 ; return pointer to context-data (x0)
95+
96+
trampoline
97+
stp fp, lr, [sp, #-0x10]!
98+
mov fp, sp
99+
blr x19
100+
101+
finish
102+
; exit code is zero
103+
mov x0, #0
104+
; exit application
105+
bl _exit
106+
ENDP
107+
END

‎ext/standard/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ADD_FLAG("LIBS_STANDARD", "iphlpapi.lib");
2525

2626
EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
2727
crc32.c crypt.c crypt_freesec.c crypt_blowfish.c crypt_sha256.c \
28-
crypt_sha512.c php_crypt_r.c crc32_x86.c \
28+
crypt_sha512.c php_crypt_r.c " + (TARGET_ARCH != 'arm64'? " crc32_x86.c" : "") + " \
2929
datetime.c dir.c dl.c dns.c dns_win32.c exec.c \
3030
file.c filestat.c formatted_print.c fsock.c head.c html.c image.c \
3131
info.c iptc.c link.c mail.c math.c md5.c metaphone.c microtime.c \

‎win32/build/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ $(PHPDLL_RES): win32\build\template.rc
130130
/I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \
131131
win32\build\template.rc
132132

133-
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
133+
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(ASM_OBJS) $(MCFILE)
134134
@copy win32\build\default.manifest $(BUILD_DIR)\$(PHPDLL).manifest >nul
135135
# @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP8_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
136-
@"$(LINK)" $(PHP_GLOBAL_OBJS_RESP) $(STATIC_EXT_OBJS_RESP) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP8_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
136+
@"$(LINK)" $(PHP_GLOBAL_OBJS_RESP) $(STATIC_EXT_OBJS_RESP) $(STATIC_EXT_LIBS) $(LIBS) $(ASM_OBJS) $(PHPDLL_RES) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP8_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
137137
-@$(_VC_MANIFEST_EMBED_DLL)
138138

139139
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)

‎win32/build/Makefile.frag.w32

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎win32/build/config.w32

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
1414

1515
toolset_setup_compiler();
1616

17-
// do we use x64 or 80x86 version of compiler?
18-
X64 = toolset_is_64();
17+
HOST_ARCH = toolset_host_arch();
18+
TARGET_ARCH = toolset_target_arch();
19+
// for compatible only
20+
X64 = TARGET_ARCH != 'x86';
1921
toolset_setup_arch();
2022

2123
toolset_setup_linker();
@@ -212,7 +214,7 @@ if (PHP_ANALYZER == "vs") {
212214
pvscfg.WriteLine("exclude-path = " + PROGRAM_FILES + "\\windows kits\\");
213215
}
214216
pvscfg.WriteLine("vcinstalldir = " + VCINSTALLDIR);
215-
pvscfg.WriteLine("platform = " + (X64 ? 'x64' : 'Win32'));
217+
pvscfg.WriteLine("platform = " + (TARGET_ARCH == 'x86' ? 'Win32' : 'x64'));
216218
pvscfg.WriteLine("preprocessor = visualcpp");
217219
pvscfg.WriteLine("language = C");
218220
pvscfg.WriteLine("skip-cl-exe = no");
@@ -241,16 +243,44 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
241243
zend_enum.c zend_fibers.c zend_atomic.c");
242244
ADD_SOURCES("Zend\\Optimizer", "zend_optimizer.c pass1.c pass3.c optimize_func_calls.c block_pass.c optimize_temp_vars_5.c nop_removal.c compact_literals.c zend_cfg.c zend_dfg.c dfa_pass.c zend_ssa.c zend_inference.c zend_func_info.c zend_call_graph.c zend_dump.c escape_analysis.c compact_vars.c dce.c sccp.c scdf.c");
243245

244-
var FIBER_ASSEMBLER = X64 ? PATH_PROG('ML64') : PATH_PROG('ML');
245-
DEFINE('FIBER_ASSEMBLER', FIBER_ASSEMBLER);
246+
var PHP_ASSEMBLER = PATH_PROG({
247+
'x64': 'ML64',
248+
'x86': 'ML',
249+
'arm64': 'armasm64'
250+
}[TARGET_ARCH]);
251+
if (!PHP_ASSEMBLER) {
252+
ERROR("No assembler found, fiber cannot be built");
253+
}
254+
DEFINE('PHP_ASSEMBLER', PHP_ASSEMBLER);
255+
DEFINE('FIBER_ASSEMBLER', PHP_ASSEMBLER);// for compatible
256+
257+
var FIBER_ASM_ARCH = {
258+
'x64': 'x86_64',
259+
'x86': 'i386',
260+
'arm64': 'arm64'
261+
}[TARGET_ARCH];
262+
DEFINE('FIBER_ASM_ARCH', FIBER_ASM_ARCH); // for compatible only
263+
264+
var FIBER_ASM_ABI = {
265+
'x64': 'x86_64_ms_pe_masm',
266+
'x86': 'i386_ms_pe_masm',
267+
'arm64': 'arm64_aapcs_pe_armasm'
268+
}[TARGET_ARCH];
269+
DEFINE('FIBER_ASM_ABI', FIBER_ASM_ABI);
270+
271+
if (TARGET_ARCH == 'arm64') {
272+
DEFINE('FIBER_ASM_FLAGS', '-nologo -machine ARM64 -o');
273+
} else {
274+
DEFINE('FIBER_ASM_FLAGS', '/DBOOST_CONTEXT_EXPORT=EXPORT /nologo /c /Fo');
275+
}
246276

247-
var FIBER_ASM_ARCH = X64 ? 'x86_64' : 'i386';
248-
DEFINE('FIBER_ASM_ARCH', FIBER_ASM_ARCH);
277+
ADD_FLAG('ASM_OBJS', '$(BUILD_DIR)\\Zend\\jump_' + FIBER_ASM_ABI + '.obj $(BUILD_DIR)\\Zend\\make_' + FIBER_ASM_ABI + '.obj');
249278

250-
ADD_FLAG('LDFLAGS', '$(BUILD_DIR)\\Zend\\jump_' + FIBER_ASM_ARCH + '_ms_pe_masm.obj');
251-
ADD_FLAG('LDFLAGS', '$(BUILD_DIR)\\Zend\\make_' + FIBER_ASM_ARCH + '_ms_pe_masm.obj');
279+
MFO.WriteLine('$(BUILD_DIR)\\Zend\\jump_' + FIBER_ASM_ABI + '.obj: Zend\\asm\\jump_' + FIBER_ASM_ABI + '.asm');
280+
MFO.WriteLine('\t$(PHP_ASSEMBLER) $(FIBER_ASM_FLAGS) $(BUILD_DIR)\\Zend\\jump_$(FIBER_ASM_ABI).obj Zend\\asm\\jump_$(FIBER_ASM_ABI).asm');
252281

253-
ADD_MAKEFILE_FRAGMENT('win32/build/Makefile.frag.w32');
282+
MFO.WriteLine('$(BUILD_DIR)\\Zend\\make_' + FIBER_ASM_ABI + '.obj: Zend\\asm\\make_' + FIBER_ASM_ABI + '.asm');
283+
MFO.WriteLine('\t$(PHP_ASSEMBLER) $(FIBER_ASM_FLAGS) $(BUILD_DIR)\\Zend\\make_$(FIBER_ASM_ABI).obj Zend\\asm\\make_$(FIBER_ASM_ABI).asm');
254284

255285
ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
256286
if (VS_TOOLSET && VCVERS >= 1914) {

‎win32/build/config.w32.phpize.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ var PHP_CYGWIN="notset";
1414

1515
toolset_setup_compiler();
1616

17-
// do we use x64 or 80x86 version of compiler?
18-
X64 = toolset_is_64();
17+
HOST_ARCH = toolset_host_arch();
18+
TARGET_ARCH = toolset_target_arch();
19+
// for compatible only
20+
X64 = TARGET_ARCH != 'x86';
1921
toolset_setup_arch();
2022

2123
toolset_setup_linker();

0 commit comments

Comments
 (0)