]>
Commit | Line | Data |
---|---|---|
ae041f6a JB |
1 | --- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig 2015-05-07 16:14:48.000000000 +0200 |
2 | +++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp 2019-04-18 18:02:28.374555132 +0200 | |
3 | @@ -116,7 +116,7 @@ | |
4 | COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline); | |
5 | COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline); | |
6 | ||
7 | -asm volatile ( | |
8 | +asm ( | |
9 | ".text\n" | |
10 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
11 | HIDE_SYMBOL(ctiTrampoline) "\n" | |
12 | @@ -138,7 +138,7 @@ | |
13 | "ret" "\n" | |
14 | ); | |
15 | ||
16 | -asm volatile ( | |
17 | +asm ( | |
18 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
19 | HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" | |
20 | SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" | |
21 | @@ -154,7 +154,7 @@ | |
22 | "ret" "\n" | |
23 | ); | |
24 | ||
25 | -asm volatile ( | |
26 | +asm ( | |
27 | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | |
28 | HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" | |
29 | SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" | |
30 | @@ -179,7 +179,7 @@ | |
31 | COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline); | |
32 | COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline); | |
33 | ||
34 | -asm volatile ( | |
35 | +asm ( | |
36 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
37 | HIDE_SYMBOL(ctiTrampoline) "\n" | |
38 | SYMBOL_STRING(ctiTrampoline) ":" "\n" | |
39 | @@ -206,7 +206,7 @@ | |
40 | "ret" "\n" | |
41 | ); | |
42 | ||
43 | -asm volatile ( | |
44 | +asm ( | |
45 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
46 | HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" | |
47 | SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" | |
48 | @@ -222,7 +222,7 @@ | |
49 | "ret" "\n" | |
50 | ); | |
51 | ||
52 | -asm volatile ( | |
53 | +asm ( | |
54 | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | |
55 | HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" | |
56 | SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" | |
57 | @@ -242,7 +242,7 @@ | |
58 | #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." | |
59 | #endif | |
60 | ||
61 | -asm volatile ( | |
62 | +asm ( | |
63 | ".text" "\n" | |
64 | ".align 2" "\n" | |
65 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
66 | @@ -269,7 +269,7 @@ | |
67 | "bx lr" "\n" | |
68 | ); | |
69 | ||
70 | -asm volatile ( | |
71 | +asm ( | |
72 | ".text" "\n" | |
73 | ".align 2" "\n" | |
74 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
75 | @@ -287,7 +287,7 @@ | |
76 | "bx lr" "\n" | |
77 | ); | |
78 | ||
79 | -asm volatile ( | |
80 | +asm ( | |
81 | ".text" "\n" | |
82 | ".align 2" "\n" | |
83 | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | |
84 | @@ -305,7 +305,7 @@ | |
85 | ||
86 | #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) | |
87 | ||
88 | -asm volatile ( | |
89 | +asm ( | |
90 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
91 | HIDE_SYMBOL(ctiTrampoline) "\n" | |
92 | SYMBOL_STRING(ctiTrampoline) ":" "\n" | |
93 | @@ -323,7 +323,7 @@ | |
94 | "mov pc, lr" "\n" | |
95 | ); | |
96 | ||
97 | -asm volatile ( | |
98 | +asm ( | |
99 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
100 | HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" | |
101 | SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" | |
102 | @@ -418,7 +418,7 @@ | |
103 | COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline); | |
104 | COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline); | |
105 | ||
106 | -asm volatile ( | |
107 | +asm ( | |
108 | ".text\n" | |
109 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
110 | HIDE_SYMBOL(ctiTrampoline) "\n" | |
111 | @@ -440,7 +440,7 @@ | |
112 | "ret" "\n" | |
113 | ); | |
114 | ||
115 | -asm volatile ( | |
116 | +asm ( | |
117 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
118 | HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" | |
119 | SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" | |
120 | @@ -456,7 +456,7 @@ | |
121 | "ret" "\n" | |
122 | ); | |
123 | ||
124 | -asm volatile ( | |
125 | +asm ( | |
126 | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | |
127 | HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" | |
128 | SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" | |
129 | @@ -480,7 +480,7 @@ | |
130 | COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline); | |
131 | COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline); | |
132 | ||
133 | -asm volatile ( | |
134 | +asm ( | |
135 | ".text\n" | |
136 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
137 | HIDE_SYMBOL(ctiTrampoline) "\n" | |
138 | @@ -515,7 +515,7 @@ | |
139 | "ret" "\n" | |
140 | ); | |
141 | ||
142 | -asm volatile ( | |
143 | +asm ( | |
144 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
145 | HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" | |
146 | SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" | |
147 | @@ -531,7 +531,7 @@ | |
148 | "ret" "\n" | |
149 | ); | |
150 | ||
151 | -asm volatile ( | |
152 | +asm ( | |
153 | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | |
154 | HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" | |
155 | SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" | |
156 | @@ -551,7 +551,7 @@ | |
157 | #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." | |
158 | #endif | |
159 | ||
160 | -asm volatile ( | |
161 | +asm ( | |
162 | ".text" "\n" | |
163 | ".align 2" "\n" | |
164 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
165 | @@ -578,7 +578,7 @@ | |
166 | "bx lr" "\n" | |
167 | ); | |
168 | ||
169 | -asm volatile ( | |
170 | +asm ( | |
171 | ".text" "\n" | |
172 | ".align 2" "\n" | |
173 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
174 | @@ -596,7 +596,7 @@ | |
175 | "bx lr" "\n" | |
176 | ); | |
177 | ||
178 | -asm volatile ( | |
179 | +asm ( | |
180 | ".text" "\n" | |
181 | ".align 2" "\n" | |
182 | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | |
183 | @@ -614,7 +614,7 @@ | |
184 | ||
185 | #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) | |
186 | ||
187 | -asm volatile ( | |
188 | +asm ( | |
189 | ".text\n" | |
190 | ".globl " SYMBOL_STRING(ctiTrampoline) "\n" | |
191 | HIDE_SYMBOL(ctiTrampoline) "\n" | |
192 | @@ -632,7 +632,7 @@ | |
193 | "mov pc, lr" "\n" | |
194 | ); | |
195 | ||
196 | -asm volatile ( | |
197 | +asm ( | |
198 | ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" | |
199 | HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" | |
200 | SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" | |
201 | @@ -1024,7 +1024,7 @@ | |
202 | extern "C" { \ | |
203 | rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ | |
204 | }; \ | |
205 | - asm volatile ( \ | |
206 | + asm ( \ | |
207 | ".text" "\n" \ | |
208 | ".align 2" "\n" \ | |
209 | ".globl " SYMBOL_STRING(cti_##op) "\n" \ | |
210 | @@ -1053,7 +1053,7 @@ | |
211 | extern "C" { \ | |
212 | rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ | |
213 | }; \ | |
214 | - asm volatile ( \ | |
215 | + asm ( \ | |
216 | ".globl " SYMBOL_STRING(cti_##op) "\n" \ | |
217 | HIDE_SYMBOL(cti_##op) "\n" \ | |
218 | SYMBOL_STRING(cti_##op) ":" "\n" \ |