]> git.pld-linux.org Git - packages/SDL.git/blame - SDL-gcc4.patch
projects / packages / SDL.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- desriptin merged from ALT Linux
[packages/SDL.git] / SDL-gcc4.patch
CommitLineData
bc32af0a 1--- SDL-1.2.8/src/hermes/HeadMMX.h.orig 2001-04-26 18:45:45.000000000 +0200
4176519f
PS		 2+++ SDL-1.2.8/src/hermes/HeadMMX.h 2005-05-05 22:32:19.000000000 +0200
3@@ -10,24 +10,15 @@
4 #ifndef __HERMES_HEAD_MMX__
5 #define __HERMES_HEAD_MMX__
bc32af0a 6
4176519f
PS		 7-
8 /* If you cannot stand ifdefs, then please do not look into this file, it's
9 going to end your life :) */
10
11-#ifdef X86_ASSEMBLER
12-
13-
14 #ifdef __cplusplus
15 extern "C" {
16 #endif
17
18 void STACKCALL ConvertMMX(HermesConverterInterface *);
19
20-void STACKCALL ClearMMX_32(HermesClearInterface *);
21-void STACKCALL ClearMMX_24(HermesClearInterface *);
22-void STACKCALL ClearMMX_16(HermesClearInterface *);
23-void STACKCALL ClearMMX_8(HermesClearInterface *);
24-
25 void ConvertMMXpII32_24RGB888();
26 void ConvertMMXpII32_16RGB565();
27 void ConvertMMXpII32_16BGR565();
28@@ -41,40 +32,6 @@
29 }
30 #endif
31
32-
33-
34-/* Fix the underscore business with ELF compilers */
35-
36-#if defined(__ELF__) && defined(__GNUC__)
37- #ifdef __cplusplus
38- extern "C" {
39- #endif
40-
bc32af0a
PS		 41- void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX")));
42-#if 0
43- void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32")));
44- void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_24")));
45- void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_16")));
46- void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_8")));
47-
48- void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555")));
49-#endif
50-
51- void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888")));
52- void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565")));
53- void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565")));
54- void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555")));
55- void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555")));
4176519f
PS		 56-
57- #ifdef __cplusplus
58- }
59- #endif
60-
61-#endif /* ELF and GNUC */
62-
63-
64-
65-
66 /* Make it work with Watcom */
67 #ifdef __WATCOMC__
68 #pragma warning 601 9
69@@ -95,7 +52,4 @@
70
71 #endif /* WATCOM */
72
73-#endif /* X86_ASSEMBLER */
74-
75-
76 #endif
bc32af0a 77--- SDL-1.2.8/src/hermes/HeadX86.h.orig 2002-06-08 19:45:39.000000000 +0200
4176519f
PS		 78+++ SDL-1.2.8/src/hermes/HeadX86.h 2005-05-05 22:32:11.000000000 +0200
79@@ -10,9 +10,6 @@
80 #ifndef __HERMES_HEAD_X86__
81 #define __HERMES_HEAD_X86__
bc32af0a 82
4176519f
PS		 83-
84-#ifdef X86_ASSEMBLER
85-
86 /* If you can't stand IFDEFS, then close your eyes now, please :) */
bc32af0a 87
4176519f
PS		 88 /* Ok, we start with normal function definitions */
89@@ -20,12 +17,7 @@
90 extern "C" {
91 #endif
92
93-
94 void STACKCALL ConvertX86(HermesConverterInterface *);
95-void STACKCALL ClearX86_32(HermesClearInterface *);
96-void STACKCALL ClearX86_24(HermesClearInterface *);
97-void STACKCALL ClearX86_16(HermesClearInterface *);
98-void STACKCALL ClearX86_8(HermesClearInterface *);
99
100 int STACKCALL Hermes_X86_CPU();
bc32af0a 101
4176519f
PS		 102@@ -40,104 +32,15 @@
103 void ConvertX86p32_16BGR555();
104 void ConvertX86p32_8RGB332();
105
106-void ConvertX86p16_32RGB888();
107-void ConvertX86p16_32BGR888();
108-void ConvertX86p16_32RGBA888();
109-void ConvertX86p16_32BGRA888();
110-void ConvertX86p16_24RGB888();
111-void ConvertX86p16_24BGR888();
112 void ConvertX86p16_16BGR565();
113 void ConvertX86p16_16RGB555();
114 void ConvertX86p16_16BGR555();
115 void ConvertX86p16_8RGB332();
116
117-void CopyX86p_4byte();
118-void CopyX86p_3byte();
119-void CopyX86p_2byte();
120-void CopyX86p_1byte();
121-
122-void ConvertX86pI8_32();
123-void ConvertX86pI8_24();
124-void ConvertX86pI8_16();
125-
126-extern int ConvertX86p16_32RGB888_LUT_X86[512];
127-extern int ConvertX86p16_32BGR888_LUT_X86[512];
128-extern int ConvertX86p16_32RGBA888_LUT_X86[512];
129-extern int ConvertX86p16_32BGRA888_LUT_X86[512];
130-
131 #ifdef __cplusplus
132 }
133 #endif
134
135-
136-
137-
138-/* Now fix up the ELF underscore problem */
139-
140-#if defined(__ELF__) && defined(__GNUC__)
141- #ifdef __cplusplus
142- extern "C" {
143- #endif
144-
145- int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU")));
146-
147- void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86")));
148-
bc32af0a
PS		 149-#if 0
150- void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32")));
151- void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24")));
152- void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16")));
153- void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8")));
154-#endif
155-
156- void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888")));
157- void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888")));
158- void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888")));
159- void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888")));
160- void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888")));
161- void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565")));
162- void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565")));
163- void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555")));
164- void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555")));
165- void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332")));
166-
167-#if 0
168- void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888")));
169- void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888")));
170- void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888")));
171- void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888")));
172- void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888")));
173- void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888")));
174-#endif
175- void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565")));
176- void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555")));
177- void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555")));
178- void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332")));
179-
180-#if 0
181- void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte")));
182- void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte")));
183- void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte")));
184- void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte")));
185-
186- void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32")));
187- void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
188- void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
189-
190- extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
191- extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
192- extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
193- extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
194-#endif
4176519f
PS		 195-
196- #ifdef __cplusplus
197- }
198- #endif
199-
200-#endif /* ELF & GNU */
201-
202-
203-
204 /* Make it run with WATCOM C */
205 #ifdef __WATCOMC__
206 #pragma warning 601 9
207@@ -188,8 +91,4 @@
208
209 #endif /* __WATCOMC__ */
210
211-
212-#endif /* X86_ASSEMBLER */
213-
214-
215 #endif
216--- SDL-1.2.8/src/hermes/mmx_main.asm.orig 2005-05-05 22:38:42.000000000 +0200
217+++ SDL-1.2.8/src/hermes/mmx_main.asm 2005-05-05 22:38:46.000000000 +0200
218@@ -10,6 +10,7 @@
219 BITS 32
220
221 GLOBAL _ConvertMMX
222+GLOBAL ConvertMMX
223 GLOBAL _mmxreturn
224
225 SECTION .text
226@@ -30,6 +31,7 @@
227 ;; 36: int32 *lookup
228
229 _ConvertMMX:
230+ConvertMMX:
231 push ebp
232 mov ebp,esp
233
234--- SDL-1.2.8/src/hermes/mmxp2_32.asm.orig 2002-06-08 19:45:39.000000000 +0200
235+++ SDL-1.2.8/src/hermes/mmxp2_32.asm 2005-05-05 22:41:00.000000000 +0200
236@@ -26,6 +26,11 @@
237 GLOBAL _ConvertMMXpII32_16BGR565
238 GLOBAL _ConvertMMXpII32_16RGB555
239 GLOBAL _ConvertMMXpII32_16BGR555
240+GLOBAL ConvertMMXpII32_24RGB888
241+GLOBAL ConvertMMXpII32_16RGB565
242+GLOBAL ConvertMMXpII32_16BGR565
243+GLOBAL ConvertMMXpII32_16RGB555
244+GLOBAL ConvertMMXpII32_16BGR555
245
246 EXTERN _mmxreturn
247
248@@ -51,6 +56,7 @@
249 SECTION .text
250
251 _ConvertMMXpII32_24RGB888:
252+ConvertMMXpII32_24RGB888:
253
254 ; set up mm6 as the mask, mm7 as zero
255 movq mm6, qword [mmx32_rgb888_mask]
256@@ -113,6 +119,7 @@
257
258
259 _ConvertMMXpII32_16RGB565:
260+ConvertMMXpII32_16RGB565:
261
262 ; set up masks
263 movq mm5, [mmx32_rgb565_b]
264@@ -180,6 +187,7 @@
265
266
267 _ConvertMMXpII32_16BGR565:
268+ConvertMMXpII32_16BGR565:
269
270 movq mm5, [mmx32_rgb565_r]
271 movq mm6, [mmx32_rgb565_g]
272@@ -248,6 +256,7 @@
273 jmp _mmxreturn
274
275 _ConvertMMXpII32_16BGR555:
276+ConvertMMXpII32_16BGR555:
277
278 ; the 16BGR555 converter is identical to the RGB555 one,
279 ; except it uses a different multiplier for the pmaddwd
280@@ -261,7 +270,9 @@
281 ; would almost certainly be faster, even if only a little.
282 ; I did rename 'mmx32_rgb555_add' to 'mmx32_rgb555_mul', which is
283 ; (I think) a more accurate name..
bc32af0a 284+
4176519f
PS		 285 _ConvertMMXpII32_16RGB555:
286+ConvertMMXpII32_16RGB555:
287
288 movq mm7,qword [mmx32_rgb555_mul]
289 _convert_bgr555_cheat:
290--- SDL-1.2.8/src/hermes/x86_main.asm.orig 2001-04-26 18:45:45.000000000 +0200
291+++ SDL-1.2.8/src/hermes/x86_main.asm 2005-05-05 22:42:06.000000000 +0200
292@@ -12,10 +12,11 @@
293 BITS 32
294
295 GLOBAL _ConvertX86
296+GLOBAL ConvertX86
297 GLOBAL _x86return
298
299 GLOBAL _Hermes_X86_CPU
300-
301+GLOBAL Hermes_X86_CPU
302
303 SECTION .data
304
305@@ -40,6 +41,7 @@
306 ;; 36: int32 *lookup
307
308 _ConvertX86:
309+ConvertX86:
310 push ebp
311 mov ebp,esp
312
313@@ -81,6 +83,7 @@
314 ;; Hermes_X86_CPU returns the CPUID flags in eax
315
316 _Hermes_X86_CPU:
317+Hermes_X86_CPU:
318 pushfd
319 pop eax
320
321--- SDL-1.2.8/src/hermes/x86p_16.asm.orig 2001-04-26 18:45:45.000000000 +0200
322+++ SDL-1.2.8/src/hermes/x86p_16.asm 2005-05-05 22:42:58.000000000 +0200
323@@ -23,6 +23,16 @@
324 GLOBAL _ConvertX86p16_16RGB555
325 GLOBAL _ConvertX86p16_16BGR555
326 GLOBAL _ConvertX86p16_8RGB332
327+GLOBAL ConvertX86p16_32RGB888
328+GLOBAL ConvertX86p16_32BGR888
329+GLOBAL ConvertX86p16_32RGBA888
330+GLOBAL ConvertX86p16_32BGRA888
331+GLOBAL ConvertX86p16_24RGB888
332+GLOBAL ConvertX86p16_24BGR888
333+GLOBAL ConvertX86p16_16BGR565
334+GLOBAL ConvertX86p16_16RGB555
335+GLOBAL ConvertX86p16_16BGR555
336+GLOBAL ConvertX86p16_8RGB332
337
338 EXTERN _ConvertX86
339 EXTERN _x86return
340@@ -33,6 +43,7 @@
341
342
343 _ConvertX86p16_16BGR565:
344+ConvertX86p16_16BGR565:
345
346 ; check short
347 cmp ecx,BYTE 16
348@@ -143,6 +154,7 @@
349
350
351 _ConvertX86p16_16RGB555:
352+ConvertX86p16_16RGB555:
353
354 ; check short
355 cmp ecx,BYTE 32
356@@ -251,6 +263,7 @@
357
358
359 _ConvertX86p16_16BGR555:
360+ConvertX86p16_16BGR555:
361
362 ; check short
363 cmp ecx,BYTE 16
364@@ -369,6 +382,7 @@
365
366
367 _ConvertX86p16_8RGB332:
368+ConvertX86p16_8RGB332:
369
370 ; check short
371 cmp ecx,BYTE 16
372--- SDL-1.2.8/src/hermes/x86p_32.asm.orig 2001-04-26 18:45:45.000000000 +0200
373+++ SDL-1.2.8/src/hermes/x86p_32.asm 2005-05-05 22:44:07.000000000 +0200
374@@ -22,6 +22,16 @@
375 GLOBAL _ConvertX86p32_16RGB555
376 GLOBAL _ConvertX86p32_16BGR555
377 GLOBAL _ConvertX86p32_8RGB332
378+GLOBAL ConvertX86p32_32BGR888
379+GLOBAL ConvertX86p32_32RGBA888
380+GLOBAL ConvertX86p32_32BGRA888
381+GLOBAL ConvertX86p32_24RGB888
382+GLOBAL ConvertX86p32_24BGR888
383+GLOBAL ConvertX86p32_16RGB565
384+GLOBAL ConvertX86p32_16BGR565
385+GLOBAL ConvertX86p32_16RGB555
386+GLOBAL ConvertX86p32_16BGR555
387+GLOBAL ConvertX86p32_8RGB332
388
389 EXTERN _x86return
390
391@@ -38,6 +48,7 @@
392
393
394 _ConvertX86p32_32BGR888:
395+ConvertX86p32_32BGR888:
396
397 ; check short
398 cmp ecx,BYTE 32
399@@ -119,6 +130,7 @@
400
401
402 _ConvertX86p32_32RGBA888:
403+ConvertX86p32_32RGBA888:
404
405 ; check short
406 cmp ecx,BYTE 32
407@@ -190,6 +202,7 @@
408
409
410 _ConvertX86p32_32BGRA888:
411+ConvertX86p32_32BGRA888:
412
413 ; check short
414 cmp ecx,BYTE 32
415@@ -265,6 +278,7 @@
416 ;; 32 bit RGB 888 to 24 BIT RGB 888
417
418 _ConvertX86p32_24RGB888:
419+ConvertX86p32_24RGB888:
420
421 ; check short
422 cmp ecx,BYTE 32
423@@ -362,6 +376,7 @@
424 ;; 32 bit RGB 888 to 24 bit BGR 888
425
426 _ConvertX86p32_24BGR888:
427+ConvertX86p32_24BGR888:
428
429 ; check short
430 cmp ecx,BYTE 32
431@@ -463,6 +478,8 @@
432 ;; 32 bit RGB 888 to 16 BIT RGB 565
433
434 _ConvertX86p32_16RGB565:
435+ConvertX86p32_16RGB565:
436+
437 ; check short
438 cmp ecx,BYTE 16
439 ja .L3
440@@ -578,6 +595,7 @@
441 ;; 32 bit RGB 888 to 16 BIT BGR 565
442
443 _ConvertX86p32_16BGR565:
444+ConvertX86p32_16BGR565:
445
446 ; check short
447 cmp ecx,BYTE 16
448@@ -692,6 +710,7 @@
449 ;; 32 BIT RGB TO 16 BIT RGB 555
450
451 _ConvertX86p32_16RGB555:
452+ConvertX86p32_16RGB555:
453
454 ; check short
455 cmp ecx,BYTE 16
456@@ -803,6 +822,7 @@
457 ;; 32 BIT RGB TO 16 BIT BGR 555
458
459 _ConvertX86p32_16BGR555:
460+ConvertX86p32_16BGR555:
461
462 ; check short
463 cmp ecx,BYTE 16
464@@ -919,8 +939,9 @@
465 ;; FROM 32 BIT RGB to 8 BIT RGB (rrrgggbbb)
466 ;; This routine writes FOUR pixels at once (dword) and then, if they exist
467 ;; the trailing three pixels
468-_ConvertX86p32_8RGB332:
bc32af0a 469
4176519f
PS		 470+_ConvertX86p32_8RGB332:
471+ConvertX86p32_8RGB332:
472
473 .L_ALIGNED
474 push ecx
SDL (Simple DirectMedia Layer) - Game/Multimedia Library
This page took 0.121585 seconds and 4 git commands to generate.