Mercurial > sdl-ios-xcode
changeset 1413:40edc79b0926
FIXME:
This code needs to be rewritten to reference the static data using relocatable addresses (e.g. http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml or http://nasm.sourceforge.net/doc/html/nasmdoc8.html#section-8.2)
This code currently breaks on systems with readonly text segments (hardened Linux / Intel Mac)
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 21 Feb 2006 22:12:55 +0000 |
| parents | a8181c4040b8 |
| children | 4fe98eace733 |
| files | src/video/SDL_yuv_mmx.c src/video/SDL_yuv_sw.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/SDL_yuv_mmx.c Tue Feb 21 21:45:31 2006 +0000 +++ b/src/video/SDL_yuv_mmx.c Tue Feb 21 22:12:55 2006 +0000 @@ -21,6 +21,7 @@ */ #include "SDL_config.h" +#if 0 /* FIXME: This code needs to be rewritten to reference the static data using relocatable addresses (e.g. http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml or http://nasm.sourceforge.net/doc/html/nasmdoc8.html#section-8.2) This code currently breaks on systems with readonly text segments (hardened Linux / Intel Mac) */ #if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES #include "SDL_stdinc.h" @@ -406,3 +407,4 @@ } #endif /* GCC i386 inline assembly */ +#endif /* 0 */
--- a/src/video/SDL_yuv_sw.c Tue Feb 21 21:45:31 2006 +0000 +++ b/src/video/SDL_yuv_sw.c Tue Feb 21 22:12:55 2006 +0000 @@ -121,6 +121,7 @@ /* The colorspace conversion functions */ +#if 0 /*defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES*/ extern void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix, unsigned char *lum, unsigned char *cr, unsigned char *cb, unsigned char *out, @@ -129,6 +130,7 @@ unsigned char *lum, unsigned char *cr, unsigned char *cb, unsigned char *out, int rows, int cols, int mod ); +#endif static void Color16DitherYV12Mod1X( int *colortab, Uint32 *rgb_2_pix, unsigned char *lum, unsigned char *cr, @@ -1059,7 +1061,7 @@ case SDL_YV12_OVERLAY: case SDL_IYUV_OVERLAY: if ( display->format->BytesPerPixel == 2 ) { -#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES +#if 0 /*defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES*/ /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0xF800) && (Gmask == 0x07E0) && @@ -1081,7 +1083,7 @@ swdata->Display2X = Color24DitherYV12Mod2X; } if ( display->format->BytesPerPixel == 4 ) { -#if defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES +#if 0 /*defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES*/ /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0x00FF0000) && (Gmask == 0x0000FF00) &&