We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to use x86 inline asm stuff also on x86_64

SDL-1.2.15_x86_64.patch (text/plain), 4.85 KB, created by Patrice Mandin on 2012-05-30 09:56:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Mandin

Created: 2012-05-30 09:56:51 UTC

Size: 4.85 KB

patch

obsolete

>diff -Naur -x '*generated' -x '*xcodeproj*' SDL-1.2.15/include/SDL_stdinc.h SDL-1.2.15-patched x86_64/include/SDL_stdinc.h
>--- SDL-1.2.15/include/SDL_stdinc.h	2012-01-19 00:30:06.000000000 +0100
>+++ SDL-1.2.15-patched x86_64/include/SDL_stdinc.h	2012-05-20 22:43:59.000000000 +0200
>@@ -258,7 +258,7 @@
> extern DECLSPEC void * SDLCALL SDL_memset(void *dst, int c, size_t len);
> #endif
> 
>-#if defined(__GNUC__) && defined(i386)
>+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
> #define SDL_memset4(dst, val, len)				\
> do {								\
> 	int u0, u1, u2;						\
>@@ -291,7 +291,7 @@
> /* We can count on memcpy existing on Mac OS X and being well-tuned. */
> #if defined(__MACH__) && defined(__APPLE__)
> #define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
>-#elif defined(__GNUC__) && defined(i386)
>+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
> #define SDL_memcpy(dst, src, len)					  \
> do {									  \
> 	int u0, u1, u2;						  	  \
>@@ -323,7 +323,7 @@
> /* We can count on memcpy existing on Mac OS X and being well-tuned. */
> #if defined(__MACH__) && defined(__APPLE__)
> #define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
>-#elif defined(__GNUC__) && defined(i386)
>+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
> #define SDL_memcpy4(dst, src, len)				\
> do {								\
> 	int ecx, edi, esi;					\
>@@ -339,7 +339,7 @@
> #define SDL_memcpy4(dst, src, len)	SDL_memcpy(dst, src, (len) << 2)
> #endif
> 
>-#if defined(__GNUC__) && defined(i386)
>+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
> #define SDL_revcpy(dst, src, len)			\
> do {							\
> 	int u0, u1, u2;					\
>diff -Naur -x '*generated' -x '*xcodeproj*' SDL-1.2.15/src/audio/SDL_mixer_MMX.c SDL-1.2.15-patched x86_64/src/audio/SDL_mixer_MMX.c
>--- SDL-1.2.15/src/audio/SDL_mixer_MMX.c	2012-01-19 00:30:06.000000000 +0100
>+++ SDL-1.2.15-patched x86_64/src/audio/SDL_mixer_MMX.c	2012-05-20 22:43:07.000000000 +0200
>@@ -36,7 +36,7 @@
> ***********************************************/
> 
> #if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
>-#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
>+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && defined(SDL_ASSEMBLY_ROUTINES)
> void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
> {
>     __asm__ __volatile__ (
>diff -Naur -x '*generated' -x '*xcodeproj*' SDL-1.2.15/src/audio/SDL_mixer_MMX.h SDL-1.2.15-patched x86_64/src/audio/SDL_mixer_MMX.h
>--- SDL-1.2.15/src/audio/SDL_mixer_MMX.h	2012-01-19 00:30:06.000000000 +0100
>+++ SDL-1.2.15-patched x86_64/src/audio/SDL_mixer_MMX.h	2012-05-20 22:43:17.000000000 +0200
>@@ -9,7 +9,7 @@
> #include "SDL_config.h"
> 
> #if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
>-#if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
>+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && defined(SDL_ASSEMBLY_ROUTINES)
> void SDL_MixAudio_MMX_S16(char* ,char* ,unsigned int ,int );
> void SDL_MixAudio_MMX_S8(char* ,char* ,unsigned int ,int );
> #endif
>diff -Naur -x '*generated' -x '*xcodeproj*' SDL-1.2.15/src/stdlib/SDL_malloc.c SDL-1.2.15-patched x86_64/src/stdlib/SDL_malloc.c
>--- SDL-1.2.15/src/stdlib/SDL_malloc.c	2012-01-19 00:30:06.000000000 +0100
>+++ SDL-1.2.15-patched x86_64/src/stdlib/SDL_malloc.c	2012-05-20 22:42:21.000000000 +0200
>@@ -2244,7 +2244,7 @@
> #define treebin_at(M,i)     (&((M)->treebins[i]))
> 
> /* assign tree index for size S to variable I */
>-#if defined(__GNUC__) && defined(i386)
>+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
> #define compute_tree_index(S, I)\
> {\
>   size_t X = S >> TREEBIN_SHIFT;\
>@@ -2309,7 +2309,7 @@
> 
> /* index corresponding to given bit */
> 
>-#if defined(__GNUC__) && defined(i386)
>+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
> #define compute_bit2idx(X, I)\
> {\
>   unsigned int J;\
>diff -Naur -x '*generated' -x '*xcodeproj*' SDL-1.2.15/src/video/SDL_stretch.c SDL-1.2.15-patched x86_64/src/video/SDL_stretch.c
>--- SDL-1.2.15/src/video/SDL_stretch.c	2012-01-19 00:30:06.000000000 +0100
>+++ SDL-1.2.15-patched x86_64/src/video/SDL_stretch.c	2012-05-20 22:44:31.000000000 +0200
>@@ -36,7 +36,7 @@
> 
> #if ((defined(_MFC_VER) && defined(_M_IX86)/* && !defined(_WIN32_WCE) still needed? */) || \
>      defined(__WATCOMC__) || \
>-     (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
>+     (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))) && SDL_ASSEMBLY_ROUTINES
> /* There's a bug with gcc 4.4.1 and -O2 where srcp doesn't get the correct
>  * value after the first scanline.  FIXME? */
> /*#define USE_ASM_STRETCH*/
>@@ -54,7 +54,7 @@
> #define PAGE_ALIGNED
> #endif
> 
>-#if defined(_M_IX86) || defined(i386)
>+#if defined(_M_IX86) || (defined(__i386__) || defined(__x86_64__))
> #define PREFIX16	0x66
> #define STORE_BYTE	0xAA
> #define STORE_WORD	0xAB

Actions: View | Diff

Attachments on bug 1509: 863

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.