Skip to content

Commit 8334e27

Browse files
author
Clément Chigot
committed
Zend/asm: adjust XCOFF asm files for AIX assembler
AIX assembler is a bit more strict than GNU assembler. Thus, adjust the XCOFF asm files to be able to accept both assembler.
1 parent 89007f6 commit 8334e27

File tree

4 files changed

+143
-123
lines changed

4 files changed

+143
-123
lines changed

‎Zend/asm/jump_ppc32_sysv_xcoff_gas.S

Lines changed: 108 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -68,136 +68,140 @@
6868
* ------------------------------------------------- *
6969
* | 256 | | *
7070
* ------------------------------------------------- *
71-
* | DATA| | *
71+
* | DATA| | *
7272
* ------------------------------------------------- *
7373
* *
7474
*******************************************************/
75-
.globl .jump_fcontext
76-
.globl jump_fcontext[DS]
77-
.align 2
78-
.csect jump_fcontext[DS]
75+
.file "jump_ppc32_sysv_xcoff_gas.S"
76+
.toc
77+
.csect .text[PR]
78+
.align 2
79+
.globl jump_fcontext[DS]
80+
.globl .jump_fcontext
81+
.csect jump_fcontext[DS], 3
7982
jump_fcontext:
80-
.long .jump_fcontext
83+
.long .jump_fcontext[PR], TOC[tc0], 0
84+
.csect .text[PR], 5
8185
.jump_fcontext:
8286
# reserve space on stack
83-
subi r1, r1, 244
87+
subi 1, 1, 244
8488

85-
stfd f14, 0(r1) # save F14
86-
stfd f15, 8(r1) # save F15
87-
stfd f16, 16(r1) # save F16
88-
stfd f17, 24(r1) # save F17
89-
stfd f18, 32(r1) # save F18
90-
stfd f19, 40(r1) # save F19
91-
stfd f20, 48(r1) # save F20
92-
stfd f21, 56(r1) # save F21
93-
stfd f22, 64(r1) # save F22
94-
stfd f23, 72(r1) # save F23
95-
stfd f24, 80(r1) # save F24
96-
stfd f25, 88(r1) # save F25
97-
stfd f26, 96(r1) # save F26
98-
stfd f27, 104(r1) # save F27
99-
stfd f28, 112(r1) # save F28
100-
stfd f29, 120(r1) # save F29
101-
stfd f30, 128(r1) # save F30
102-
stfd f31, 136(r1) # save F31
103-
mffs f0 # load FPSCR
104-
stfd f0, 144(r1) # save FPSCR
89+
stfd 14, 0(1) # save F14
90+
stfd 15, 8(1) # save F15
91+
stfd 16, 16(1) # save F16
92+
stfd 17, 24(1) # save F17
93+
stfd 18, 32(1) # save F18
94+
stfd 19, 40(1) # save F19
95+
stfd 20, 48(1) # save F20
96+
stfd 21, 56(1) # save F21
97+
stfd 22, 64(1) # save F22
98+
stfd 23, 72(1) # save F23
99+
stfd 24, 80(1) # save F24
100+
stfd 25, 88(1) # save F25
101+
stfd 26, 96(1) # save F26
102+
stfd 27, 104(1) # save F27
103+
stfd 28, 112(1) # save F28
104+
stfd 29, 120(1) # save F29
105+
stfd 30, 128(1) # save F30
106+
stfd 31, 136(1) # save F31
107+
mffs 0 # load FPSCR
108+
stfd 0, 144(1) # save FPSCR
105109

106-
stw r13, 152(r1) # save R13
107-
stw r14, 156(r1) # save R14
108-
stw r15, 160(r1) # save R15
109-
stw r16, 164(r1) # save R16
110-
stw r17, 168(r1) # save R17
111-
stw r18, 172(r1) # save R18
112-
stw r19, 176(r1) # save R19
113-
stw r20, 180(r1) # save R20
114-
stw r21, 184(r1) # save R21
115-
stw r22, 188(r1) # save R22
116-
stw r23, 192(r1) # save R23
117-
stw r24, 196(r1) # save R24
118-
stw r25, 200(r1) # save R25
119-
stw r26, 204(r1) # save R26
120-
stw r27, 208(r1) # save R27
121-
stw r28, 212(r1) # save R28
122-
stw r29, 216(r1) # save R29
123-
stw r30, 220(r1) # save R30
124-
stw r31, 224(r1) # save R31
125-
stw r3, 228(r1) # save hidden
110+
stw 13, 152(1) # save R13
111+
stw 14, 156(1) # save R14
112+
stw 15, 160(1) # save R15
113+
stw 16, 164(1) # save R16
114+
stw 17, 168(1) # save R17
115+
stw 18, 172(1) # save R18
116+
stw 19, 176(1) # save R19
117+
stw 20, 180(1) # save R20
118+
stw 21, 184(1) # save R21
119+
stw 22, 188(1) # save R22
120+
stw 23, 192(1) # save R23
121+
stw 24, 196(1) # save R24
122+
stw 25, 200(1) # save R25
123+
stw 26, 204(1) # save R26
124+
stw 27, 208(1) # save R27
125+
stw 28, 212(1) # save R28
126+
stw 29, 216(1) # save R29
127+
stw 30, 220(1) # save R30
128+
stw 31, 224(1) # save R31
129+
stw 3, 228(1) # save hidden
126130

127131
# save CR
128-
mfcr r0
129-
stw r0, 232(r1)
132+
mfcr 0
133+
stw 0, 232(1)
130134
# save LR
131-
mflr r0
132-
stw r0, 236(r1)
135+
mflr 0
136+
stw 0, 236(1)
133137
# save LR as PC
134-
stw r0, 240(r1)
138+
stw 0, 240(1)
135139

136140
# store RSP (pointing to context-data) in R6
137-
mr r6, r1
141+
mr 6, 1
138142

139143
# restore RSP (pointing to context-data) from R4
140-
mr r1, r4
144+
mr 1, 4
141145

142-
lfd f14, 0(r1) # restore F14
143-
lfd f15, 8(r1) # restore F15
144-
lfd f16, 16(r1) # restore F16
145-
lfd f17, 24(r1) # restore F17
146-
lfd f18, 32(r1) # restore F18
147-
lfd f19, 40(r1) # restore F19
148-
lfd f20, 48(r1) # restore F20
149-
lfd f21, 56(r1) # restore F21
150-
lfd f22, 64(r1) # restore F22
151-
lfd f23, 72(r1) # restore F23
152-
lfd f24, 80(r1) # restore F24
153-
lfd f25, 88(r1) # restore F25
154-
lfd f26, 96(r1) # restore F26
155-
lfd f27, 104(r1) # restore F27
156-
lfd f28, 112(r1) # restore F28
157-
lfd f29, 120(r1) # restore F29
158-
lfd f30, 128(r1) # restore F30
159-
lfd f31, 136(r1) # restore F31
160-
lfd f0, 144(r1) # load FPSCR
161-
mtfsf 0xff, f0 # restore FPSCR
146+
lfd 14, 0(1) # restore F14
147+
lfd 15, 8(1) # restore F15
148+
lfd 16, 16(1) # restore F16
149+
lfd 17, 24(1) # restore F17
150+
lfd 18, 32(1) # restore F18
151+
lfd 19, 40(1) # restore F19
152+
lfd 20, 48(1) # restore F20
153+
lfd 21, 56(1) # restore F21
154+
lfd 22, 64(1) # restore F22
155+
lfd 23, 72(1) # restore F23
156+
lfd 24, 80(1) # restore F24
157+
lfd 25, 88(1) # restore F25
158+
lfd 26, 96(1) # restore F26
159+
lfd 27, 104(1) # restore F27
160+
lfd 28, 112(1) # restore F28
161+
lfd 29, 120(1) # restore F29
162+
lfd 30, 128(1) # restore F30
163+
lfd 31, 136(1) # restore F31
164+
lfd 0, 144(1) # load FPSCR
165+
mtfsf 0xff, 0 # restore FPSCR
162166

163-
lwz r13, 152(r1) # restore R13
164-
lwz r14, 156(r1) # restore R14
165-
lwz r15, 160(r1) # restore R15
166-
lwz r16, 164(r1) # restore R16
167-
lwz r17, 168(r1) # restore R17
168-
lwz r18, 172(r1) # restore R18
169-
lwz r19, 176(r1) # restore R19
170-
lwz r20, 180(r1) # restore R20
171-
lwz r21, 184(r1) # restore R21
172-
lwz r22, 188(r1) # restore R22
173-
lwz r23, 192(r1) # restore R23
174-
lwz r24, 196(r1) # restore R24
175-
lwz r25, 200(r1) # restore R25
176-
lwz r26, 204(r1) # restore R26
177-
lwz r27, 208(r1) # restore R27
178-
lwz r28, 212(r1) # restore R28
179-
lwz r29, 216(r1) # restore R29
180-
lwz r30, 220(r1) # restore R30
181-
lwz r31, 224(r1) # restore R31
182-
lwz r3, 228(r1) # restore hidden
167+
lwz 13, 152(1) # restore R13
168+
lwz 14, 156(1) # restore R14
169+
lwz 15, 160(1) # restore R15
170+
lwz 16, 164(1) # restore R16
171+
lwz 17, 168(1) # restore R17
172+
lwz 18, 172(1) # restore R18
173+
lwz 19, 176(1) # restore R19
174+
lwz 20, 180(1) # restore R20
175+
lwz 21, 184(1) # restore R21
176+
lwz 22, 188(1) # restore R22
177+
lwz 23, 192(1) # restore R23
178+
lwz 24, 196(1) # restore R24
179+
lwz 25, 200(1) # restore R25
180+
lwz 26, 204(1) # restore R26
181+
lwz 27, 208(1) # restore R27
182+
lwz 28, 212(1) # restore R28
183+
lwz 29, 216(1) # restore R29
184+
lwz 30, 220(1) # restore R30
185+
lwz 31, 224(1) # restore R31
186+
lwz 3, 228(1) # restore hidden
183187

184188
# restore CR
185-
lwz r0, 232(r1)
186-
mtcr r0
189+
lwz 0, 232(1)
190+
mtcr 0
187191
# restore LR
188-
lwz r0, 236(r1)
189-
mtlr r0
192+
lwz 0, 236(1)
193+
mtlr 0
190194
# load PC
191-
lwz r0, 240(r1)
195+
lwz 0, 240(1)
192196
# restore CTR
193-
mtctr r0
197+
mtctr 0
194198

195199
# adjust stack
196-
addi r1, r1, 244
200+
addi 1, 1, 244
197201

198-
# return transfer_t
199-
stw r6, 0(r3)
200-
stw r5, 4(r3)
202+
# return transfer_t
203+
stw 6, 0(3)
204+
stw 5, 4(3)
201205

202206
# jump to context
203207
bctr

‎Zend/asm/jump_ppc64_sysv_xcoff_gas.S

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@
66
http://www.boost.org/LICENSE_1_0.txt)
77
*/
88

9-
.align 2
10-
.globl .jump_fcontext
9+
.file "jump_ppc64_sysv_xcoff_gas.S"
10+
.toc
11+
.csect .text[PR], 5
12+
.align 2
13+
.globl jump_fcontext[DS]
14+
.globl .jump_fcontext
15+
.csect jump_fcontext[DS], 3
16+
jump_fcontext:
17+
.llong .jump_fcontext[PR], TOC[tc0], 0
18+
.csect .text[PR], 5
1119
.jump_fcontext:
1220
# reserve space on stack
1321
subi 1, 1, 184

‎Zend/asm/make_ppc32_sysv_xcoff_gas.S

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,21 @@
6868
* ------------------------------------------------- *
6969
* | 256 | | *
7070
* ------------------------------------------------- *
71-
* | DATA| | *
71+
* | DATA| | *
7272
* ------------------------------------------------- *
7373
* *
7474
*******************************************************/
75-
.globl make_fcontext[DS]
76-
.globl .make_fcontext[PR]
77-
.align 2
78-
.csect make_fcontext[DS]
75+
.file "make_ppc32_sysv_xcoff_gas.S"
76+
.toc
77+
.csect .text[PR]
78+
.align 2
79+
.globl make_fcontext[DS]
80+
.globl .make_fcontext
81+
.csect make_fcontext[DS], 3
7982
make_fcontext:
80-
.long .make_fcontext[PR]
81-
.csect .make_fcontext[PR], 3
82-
#.make_fcontext:
83+
.long .make_fcontext[PR], TOC[tc0], 0
84+
.csect .text[PR], 5
85+
.make_fcontext:
8386
# save return address into R6
8487
mflr 6
8588

@@ -100,8 +103,8 @@ make_fcontext:
100103

101104
# compute address of returned transfer_t
102105
addi 0, 3, 252
103-
mr 4, 0
104-
stw 4, 228(3)
106+
mr 4, 0
107+
stw 4, 228(3)
105108

106109
# load LR
107110
mflr 0
@@ -111,7 +114,7 @@ make_fcontext:
111114
# load LR into R4
112115
mflr 4
113116
# compute abs address of label .L_finish
114-
addi 4, 4, .L_finish - .Label
117+
addi 4, 4, .L_finish - .Label
115118
# restore LR
116119
mtlr 0
117120
# save address of finish as return-address for context-function

‎Zend/asm/make_ppc64_sysv_xcoff_gas.S

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@
44
(See accompanying file LICENSE_1_0.txt or copy at
55
http://www.boost.org/LICENSE_1_0.txt)
66
*/
7-
.globl make_fcontext[DS]
8-
.globl .make_fcontext[PR]
9-
.align 2
10-
.csect .make_fcontext[PR], 3
11-
.globl _make_fcontext
12-
#._make_fcontext:
7+
.file "make_ppc64_sysv_xcoff_gas.S"
8+
.toc
9+
.csect .text[PR], 5
10+
.align 2
11+
.globl make_fcontext[DS]
12+
.globl .make_fcontext
13+
.csect make_fcontext[DS], 3
14+
make_fcontext:
15+
.llong .make_fcontext[PR], TOC[tc0], 0
16+
.csect .text[PR], 5
17+
.make_fcontext:
1318
# save return address into R6
1419
mflr 6
1520

0 commit comments

Comments
 (0)