1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
|
commit 972b828530565302ac62a8a8eddde4cf1d13b101
Author: q66 <q66@chimera-linux.org>
Date: Tue Aug 23 14:10:54 2022 +0200
fix xptcall assembly stuff to work with clang ias
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S
index d2cab6c..aa2fd2c 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S
+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S
@@ -2,21 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-.set r0,0; .set r1,1; .set r2,2; .set r3,3; .set r4,4
-.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-.set r30,30; .set r31,31
-.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-.set f30,30; .set f31,31
-
# The ABI defines a fixed stack frame area of 4 doublewords (ELFv2)
# or 6 doublewords (ELFv1); the last of these doublewords is used
# as TOC pointer save area. The fixed area is followed by a parameter
@@ -62,15 +47,15 @@ NS_InvokeByIndex:
.NS_InvokeByIndex:
#endif
mflr 0
- std 0,16(r1)
+ std 0,16(%r1)
- std r29,-24(r1)
- std r30,-16(r1)
- std r31,-8(r1)
+ std %r29,-24(%r1)
+ std %r30,-16(%r1)
+ std %r31,-8(%r1)
- mr r29,r3 # Save 'that' in r29
- mr r30,r4 # Save 'methodIndex' in r30
- mr r31,r1 # Save old frame
+ mr %r29,%r3 # Save 'that' in r29
+ mr %r30,%r4 # Save 'methodIndex' in r30
+ mr %r31,%r1 # Save old frame
# Allocate stack frame with space for params. Since at least the
# first 7 parameters (not including 'that') will be in registers,
@@ -79,13 +64,13 @@ NS_InvokeByIndex:
#
# | (fixed area + | | 7 GP | 13 FP | 3 NV |
# | param. save) |(params)........| regs | regs | regs |
- # (r1)......(+STACK_PARAMS)... (-23*8).(-16*8).(-3*8)..(r31)
+ # (r1)......(+STACK_PARAMS)... (-23*8).(-16*8).(-3*8)..(%r31)
# +stack frame, -unused stack params, +regs storage, +1 for alignment
- addi r7,r5,((STACK_PARAMS/8)-7+7+13+3+1)
- rldicr r7,r7,3,59 # multiply by 8 and mask with ~15
- neg r7,r7
- stdux r1,r1,r7
+ addi %r7,%r5,((STACK_PARAMS/8)-7+7+13+3+1)
+ rldicr %r7,%r7,3,59 # multiply by 8 and mask with ~15
+ neg %r7,%r7
+ stdux %r1,%r1,%r7
# Call invoke_copy_to_stack(uint64_t* gpregs, double* fpregs,
@@ -95,66 +80,66 @@ NS_InvokeByIndex:
# r5, r6 are passed through intact (paramCount, params)
# r7 (d) has to be r1+STACK_PARAMS
# -- where parameters are passed on the stack.
- # r3, r4 are above that, easier to address from r31 than from r1
+ # r3, r4 are above that, easier to address from %r31 than from r1
- subi r3,r31,(23*8) # r3 --> GPRS
- subi r4,r31,(16*8) # r4 --> FPRS
- addi r7,r1,STACK_PARAMS # r7 --> params
+ subi %r3,%r31,(23*8) # r3 --> GPRS
+ subi %r4,%r31,(16*8) # r4 --> FPRS
+ addi %r7,%r1,STACK_PARAMS # r7 --> params
bl invoke_copy_to_stack
nop
# Set up to invoke function
- ld r9,0(r29) # vtable (r29 is 'that')
- mr r3,r29 # self is first arg, obviously
+ ld %r9,0(%r29) # vtable (r29 is 'that')
+ mr %r3,%r29 # self is first arg, obviously
- sldi r30,r30,3 # Find function descriptor
- add r9,r9,r30
- ld r12,0(r9)
+ sldi %r30,%r30,3 # Find function descriptor
+ add %r9,%r9,%r30
+ ld %r12,0(%r9)
- std r2,STACK_TOC(r1) # Save r2 (TOC pointer)
+ std %r2,STACK_TOC(%r1) # Save r2 (TOC pointer)
#if _CALL_ELF == 2
- mtctr r12
+ mtctr %r12
#else
- ld r0,0(r12) # Actual address from fd.
+ ld %r0,0(%r12) # Actual address from fd.
mtctr 0
- ld r11,16(r12) # Environment pointer from fd.
- ld r2,8(r12) # TOC pointer from fd.
+ ld %r11,16(%r12) # Environment pointer from fd.
+ ld %r2,8(%r12) # TOC pointer from fd.
#endif
# Load FP and GP registers as required
- ld r4, -(23*8)(r31)
- ld r5, -(22*8)(r31)
- ld r6, -(21*8)(r31)
- ld r7, -(20*8)(r31)
- ld r8, -(19*8)(r31)
- ld r9, -(18*8)(r31)
- ld r10, -(17*8)(r31)
-
- lfd f1, -(16*8)(r31)
- lfd f2, -(15*8)(r31)
- lfd f3, -(14*8)(r31)
- lfd f4, -(13*8)(r31)
- lfd f5, -(12*8)(r31)
- lfd f6, -(11*8)(r31)
- lfd f7, -(10*8)(r31)
- lfd f8, -(9*8)(r31)
- lfd f9, -(8*8)(r31)
- lfd f10, -(7*8)(r31)
- lfd f11, -(6*8)(r31)
- lfd f12, -(5*8)(r31)
- lfd f13, -(4*8)(r31)
+ ld %r4, -(23*8)(%r31)
+ ld %r5, -(22*8)(%r31)
+ ld %r6, -(21*8)(%r31)
+ ld %r7, -(20*8)(%r31)
+ ld %r8, -(19*8)(%r31)
+ ld %r9, -(18*8)(%r31)
+ ld %r10, -(17*8)(%r31)
+
+ lfd %f1, -(16*8)(%r31)
+ lfd %f2, -(15*8)(%r31)
+ lfd %f3, -(14*8)(%r31)
+ lfd %f4, -(13*8)(%r31)
+ lfd %f5, -(12*8)(%r31)
+ lfd %f6, -(11*8)(%r31)
+ lfd %f7, -(10*8)(%r31)
+ lfd %f8, -(9*8)(%r31)
+ lfd %f9, -(8*8)(%r31)
+ lfd %f10, -(7*8)(%r31)
+ lfd %f11, -(6*8)(%r31)
+ lfd %f12, -(5*8)(%r31)
+ lfd %f13, -(4*8)(%r31)
bctrl # Do it
- ld r2,STACK_TOC(r1) # Load our own TOC pointer
- ld r1,0(r1) # Revert stack frame
- ld 0,16(r1) # Reload lr
+ ld %r2,STACK_TOC(%r1) # Load our own TOC pointer
+ ld %r1,0(%r1) # Revert stack frame
+ ld 0,16(%r1) # Reload lr
mtlr 0
- ld 29,-24(r1) # Restore NVGPRS
- ld 30,-16(r1)
- ld 31,-8(r1)
+ ld 29,-24(%r1) # Restore NVGPRS
+ ld 30,-16(%r1)
+ ld 31,-8(%r1)
blr
#if _CALL_ELF == 2
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S
index 0b884e1..4dddee1 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S
+++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S
@@ -2,21 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-.set r0,0; .set r1,1; .set RTOC,2; .set r3,3; .set r4,4
-.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-.set r30,30; .set r31,31
-.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-.set f30,30; .set f31,31
-
#if _CALL_ELF == 2
#define STACK_PARAMS 96
#else
@@ -56,50 +41,50 @@ SharedStub:
.SharedStub:
#endif
- mflr r0
+ mflr %r0
- std r4, -56(r1) # Save all GPRS
- std r5, -48(r1)
- std r6, -40(r1)
- std r7, -32(r1)
- std r8, -24(r1)
- std r9, -16(r1)
- std r10, -8(r1)
+ std %r4, -56(%r1) # Save all GPRS
+ std %r5, -48(%r1)
+ std %r6, -40(%r1)
+ std %r7, -32(%r1)
+ std %r8, -24(%r1)
+ std %r9, -16(%r1)
+ std %r10, -8(%r1)
- stfd f13, -64(r1) # ... and FPRS
- stfd f12, -72(r1)
- stfd f11, -80(r1)
- stfd f10, -88(r1)
- stfd f9, -96(r1)
- stfd f8, -104(r1)
- stfd f7, -112(r1)
- stfd f6, -120(r1)
- stfd f5, -128(r1)
- stfd f4, -136(r1)
- stfd f3, -144(r1)
- stfd f2, -152(r1)
- stfd f1, -160(r1)
+ stfd %f13, -64(%r1) # ... and FPRS
+ stfd %f12, -72(%r1)
+ stfd %f11, -80(%r1)
+ stfd %f10, -88(%r1)
+ stfd %f9, -96(%r1)
+ stfd %f8, -104(%r1)
+ stfd %f7, -112(%r1)
+ stfd %f6, -120(%r1)
+ stfd %f5, -128(%r1)
+ stfd %f4, -136(%r1)
+ stfd %f3, -144(%r1)
+ stfd %f2, -152(%r1)
+ stfd %f1, -160(%r1)
- subi r6,r1,56 # r6 --> gprData
- subi r7,r1,160 # r7 --> fprData
- addi r5,r1,STACK_PARAMS # r5 --> extra stack args
+ subi %r6,%r1,56 # r6 --> gprData
+ subi %r7,%r1,160 # r7 --> fprData
+ addi %r5,%r1,STACK_PARAMS # r5 --> extra stack args
- std r0, 16(r1)
+ std %r0, 16(%r1)
- stdu r1,-288(r1)
+ stdu %r1,-288(%r1)
# r3 has the 'self' pointer
# already
- mr r4,r11 # r4 is methodIndex selector,
+ mr %r4,%r11 # r4 is methodIndex selector,
# passed via r11 in the
# nsNSStubBase::StubXX() call
bl PrepareAndDispatch
nop
- ld 1,0(r1) # restore stack
- ld r0,16(r1) # restore LR
- mtlr r0
+ ld 1,0(%r1) # restore stack
+ ld %r0,16(%r1) # restore LR
+ mtlr %r0
blr
#if _CALL_ELF == 2
|
