BlitRGBtoRGBPixelAlphaMMX() is putting the wrong value into a register. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Wed, 04 Apr 2007 09:32:29 +0000
branchSDL-1.2
changeset 3931 d65b4a73c991
parent 3930 79a4c9017550
child 3932 cd5b5c52a37e
BlitRGBtoRGBPixelAlphaMMX() is putting the wrong value into a register. Thanks to Alex Volkov for following up on this. Fixes Bugzilla #390.
src/video/SDL_blit_A.c
--- a/src/video/SDL_blit_A.c	Wed Apr 04 09:15:39 2007 +0000
+++ b/src/video/SDL_blit_A.c	Wed Apr 04 09:32:29 2007 +0000
@@ -369,7 +369,9 @@
 	packsswb_r2r(mm6, mm3); /* 0000FFFF -> mm3 */
 	pxor_r2r(mm0, mm3); /* 0000F000 -> mm3 (~channel mask) */
 	/* get alpha channel shift */
-	movd_m2r(sf->Ashift, mm5); /* Ashift -> mm5 */
+	__asm__ __volatile__ (
+		"movd %0, %%mm5"
+		: : "rm" ((Uint32) sf->Ashift) ); /* Ashift -> mm5 */
 
 	while(height--) {
 	    DUFFS_LOOP4({
@@ -1566,7 +1568,6 @@
 	int dstskip = info->d_skip >> 2;
 	SDL_PixelFormat* sf = info->src;
 	Uint32 amask = sf->Amask;
-	Uint32 ashift = sf->Ashift;
 
 	__asm__ (
 	/* make mm6 all zeros. */
@@ -1588,7 +1589,7 @@
 	/* get alpha channel shift */
 	"movd      %1, %%mm5\n\t" /* Ashift -> mm5 */
 
-	  : /* nothing */ : "m" (amask), "m" (ashift) );
+	  : /* nothing */ : "rm" (amask), "rm" ((Uint32) sf->Ashift) );
 
 	while(height--) {