From 34bc26edd28cf2ab9798a1399c4aa4ee59270310 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 4 Apr 2007 09:32:29 +0000
Subject: [PATCH] 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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index 5b10ab397..9319d1e3c 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -369,7 +369,9 @@ static void BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo *info)
 	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 @@ static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info)
 	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 @@ static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info)
 	/* 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--) {