From: Gé van Geldorp <ge@gse.nl>
Date: Mon, 13 Jun 2005 22:24:28 +0000 (+0000)
Subject: We were changing the edi register, but not informing the compiler about this.
X-Git-Tag: backups/rox-u@36851~2^2~261
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=08d5e5e7e58927859b48e4044f1e163bcbdd42b6

We were changing the edi register, but not informing the compiler about this.
For certain optimization combinations, the compiler would assume edi was
unchanged. Fixed by adding %edi to the clobber list.

svn path=/trunk/; revision=15901
---

diff --git a/reactos/subsys/win32k/dib/dib16bpp.c b/reactos/subsys/win32k/dib/dib16bpp.c
index de0f290684c..9ca8f8d4a26 100644
--- a/reactos/subsys/win32k/dib/dib16bpp.c
+++ b/reactos/subsys/win32k/dib/dib16bpp.c
@@ -17,6 +17,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 /* $Id$ */
+
 #include <w32k.h>
 
 VOID
@@ -53,6 +54,7 @@ DIB_16BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
 "  shl  $16, %%eax\n"
 "  andl $0xffff, %0\n"  /* If the pixel value is "abcd", put "abcdabcd" in %eax */
 "  or   %0, %%eax\n"
+"  mov  %2, %%edi\n"
 "  test $0x03, %%edi\n" /* Align to fullword boundary */
 "  jz   .L1\n"
 "  stosw\n"
@@ -67,8 +69,8 @@ DIB_16BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
 "  stosw\n"
 ".L2:\n"
   : /* no output */
-  : "r"(c), "r"(Count), "D"(addr)
-  : "%eax", "%ecx");
+  : "r"(c), "r"(Count), "m"(addr)
+  : "%eax", "%ecx", "%edi");
 #else /* _M_IX86 */
   LONG cx = x1;
   DWORD cc;
@@ -443,8 +445,8 @@ DIB_16BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
   {   
   __asm__ __volatile__ (
     "  cld\n"
-    "  mov  %0,%%eax\n"
     "  mov  %1,%%ebx\n" 
+    "  mov  %2,%%edi\n" 
     "  test $0x03, %%edi\n" /* Align to fullword boundary */
     "  jz   .FL1\n"
     "  stosw\n"
@@ -458,9 +460,9 @@ DIB_16BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
     "  jz   .FL2\n"
     "  stosw\n"
     ".FL2:\n"
-    : 
-    : "r" (color), "r" (width), "D" (pos)
-    : "%eax", "%ecx","%ebx");
+    :
+    : "a" (color), "r" (width), "m" (pos)
+    : "%ecx", "%ebx", "%edi");
      pos =(PULONG)((ULONG_PTR)pos + delta);	 
   }
 
diff --git a/reactos/subsys/win32k/dib/dib32bpp.c b/reactos/subsys/win32k/dib/dib32bpp.c
index 36cf853215a..00b1ca46711 100644
--- a/reactos/subsys/win32k/dib/dib32bpp.c
+++ b/reactos/subsys/win32k/dib/dib32bpp.c
@@ -52,6 +52,7 @@ DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
     __asm__ __volatile__ (
 "  cld\n"
 "  mov  %0, %%eax\n"
+"  mov  %2, %%edi\n"
 "  test $0x03, %%edi\n" /* Align to fullword boundary */
 "  jnz   .L1\n"
 "  mov  %1,%%ecx\n"     /* Setup count of fullwords to fill */
@@ -67,8 +68,8 @@ DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
 "  stosw\n"
 ".L2:\n"
   : /* no output */
-  : "r"(c), "r"(cx), "D"(addr)
-  : "%eax", "%ecx");
+  : "m"(c), "r"(cx), "m"(addr)
+  : "%eax", "%ecx", "%edi");
 
   
 }