Attachment 3291 Details for Bug 4414 – Proposed patch

[patch] Proposed patch

bug4414.diff (text/plain), 8.19 KB, created by Billy Biggs on 2005-09-15 21:07:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Billy Biggs

Created: 2005-09-15 21:07:33 UTC

Size: 8.19 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>RCS file: /cvs/cairo/cairo/pixman/ChangeLog,v
>retrieving revision 1.118
>diff -p -u -r1.118 ChangeLog
>--- ChangeLog	12 Sep 2005 12:55:11 -0000	1.118
>+++ ChangeLog	16 Sep 2005 03:57:14 -0000
>@@ -1,3 +1,14 @@
>+2005-09-15  Billy Biggs  <vektor@dumbterm.net>
>+
>+	Bug #4414.
>+
>+	* src/fbmmx.c: Remove CPU detection code.
>+	* src/fbpict.c (detectCPUFeatures), (fbHaveMMX): Move CPU
>+	detection code out of the MMX file and into the generic code to
>+	avoid compiling it with -mmmx and -msse.  Using these options
>+	causes gcc to use MMX and SSE instructions in the CPU detection
>+	code which causes SIGILLs on older processors.
>+
> 2005-08-28  Owen Taylor  <otaylor@redhat.com>
> 
> 	Bug #4260, Reviewed by B. Biggs
>Index: src/fbmmx.c
>===================================================================
>RCS file: /cvs/cairo/cairo/pixman/src/fbmmx.c,v
>retrieving revision 1.6
>diff -p -u -r1.6 fbmmx.c
>--- src/fbmmx.c	12 Sep 2005 12:55:11 -0000	1.6
>+++ src/fbmmx.c	16 Sep 2005 03:57:14 -0000
>@@ -2471,117 +2471,4 @@ fbCompositeCopyAreammx (pixman_operator_
> 		   width, height);
> }
> 
>-#if !defined(__amd64__) && !defined(__x86_64__)
>-
>-enum CPUFeatures {
>-    NoFeatures = 0,
>-    MMX = 0x1,
>-    MMX_Extensions = 0x2, 
>-    SSE = 0x6,
>-    SSE2 = 0x8,
>-    CMOV = 0x10
>-};
>-
>-static unsigned int detectCPUFeatures(void) {
>-    unsigned int result;
>-    char vendor[13];
>-    vendor[0] = 0;
>-    vendor[12] = 0;
>-    /* see p. 118 of amd64 instruction set manual Vol3 */
>-    /* We need to be careful about the handling of %ebx and
>-     * %esp here. We can't declare either one as clobbered
>-     * since they are special registers (%ebx is the "PIC
>-     * register" holding an offset to global data, %esp the
>-     * stack pointer), so we need to make sure they have their
>-     * original values when we access the output operands.
>-     */
>-    __asm__ ("pushf\n"
>-             "pop %%eax\n"
>-             "mov %%eax, %%ecx\n"
>-             "xor $0x00200000, %%eax\n"
>-             "push %%eax\n"
>-             "popf\n"
>-             "pushf\n"
>-             "pop %%eax\n"
>-             "mov $0x0, %%edx\n"
>-             "xor %%ecx, %%eax\n"
>-             "jz 1f\n"
>-
>-             "mov $0x00000000, %%eax\n"
>-	     "push %%ebx\n"
>-             "cpuid\n"
>-             "mov %%ebx, %%eax\n"
>-	     "pop %%ebx\n"
>-             "mov %%eax, %1\n"
>-             "mov %%edx, %2\n"
>-             "mov %%ecx, %3\n"
>-             "mov $0x00000001, %%eax\n"
>-	     "push %%ebx\n"
>-             "cpuid\n"
>-	     "pop %%ebx\n"
>-             "1:\n"
>-             "mov %%edx, %0\n"
>-             : "=r" (result), 
>-               "=m" (vendor[0]), 
>-               "=m" (vendor[4]), 
>-               "=m" (vendor[8])
>-             :
>-             : "%eax", "%ecx", "%edx"
>-        );
>-
>-    unsigned int features = 0;
>-    if (result) {
>-        /* result now contains the standard feature bits */
>-        if (result & (1 << 15))
>-            features |= CMOV;
>-        if (result & (1 << 23))
>-            features |= MMX;
>-        if (result & (1 << 25))
>-            features |= SSE;
>-        if (result & (1 << 26))
>-            features |= SSE2;
>-        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
>-            /* check for AMD MMX extensions */
>-
>-            unsigned int result;            
>-            __asm__("push %%ebx\n"
>-                    "mov $0x80000000, %%eax\n"
>-                    "cpuid\n"
>-                    "xor %%edx, %%edx\n"
>-                    "cmp $0x1, %%eax\n"
>-                    "jge 1f\n"
>-                    "mov $0x80000001, %%eax\n"
>-                    "cpuid\n"
>-                    "1:\n"
>-                    "pop %%ebx\n"
>-                    "mov %%edx, %0\n"
>-                    : "=r" (result)
>-                    :
>-                    : "%eax", "%ecx", "%edx"
>-                );
>-            if (result & (1<<22))
>-                features |= MMX_Extensions;
>-        }
>-    }
>-    return features;
>-}
>-
>-Bool
>-fbHaveMMX (void)
>-{
>-    static Bool initialized = FALSE;
>-    static Bool mmx_present;
>-
>-    if (!initialized)
>-    {
>-        unsigned int features = detectCPUFeatures();
>-	mmx_present = (features & (MMX|MMX_Extensions)) == (MMX|MMX_Extensions);
>-        initialized = TRUE;
>-    }
>-    
>-    return mmx_present;
>-}
>-#endif /* __amd64__ */
>-
>-
> #endif /* RENDER */
>Index: src/fbpict.c
>===================================================================
>RCS file: /cvs/cairo/cairo/pixman/src/fbpict.c,v
>retrieving revision 1.6
>diff -p -u -r1.6 fbpict.c
>--- src/fbpict.c	12 Sep 2005 12:55:11 -0000	1.6
>+++ src/fbpict.c	16 Sep 2005 03:57:15 -0000
>@@ -1909,4 +1909,121 @@ pixman_composite (pixman_operator_t	op,
>     pixman_region_destroy (region);
> }
> slim_hidden_def(pixman_composite);
>+
>+/* The CPU detection code needs to be in a file not compiled with
>+ * "-mmmx -msse", as gcc would generate CMOV instructions otherwise
>+ * that would lead to SIGILL instructions on old CPUs that don't have
>+ * it.
>+ */
>+#if defined(USE_MMX) && !defined(__amd64__) && !defined(__x86_64__)
>+
>+enum CPUFeatures {
>+    NoFeatures = 0,
>+    MMX = 0x1,
>+    MMX_Extensions = 0x2, 
>+    SSE = 0x6,
>+    SSE2 = 0x8,
>+    CMOV = 0x10
>+};
>+
>+static unsigned int detectCPUFeatures(void) {
>+    unsigned int result;
>+    char vendor[13];
>+    vendor[0] = 0;
>+    vendor[12] = 0;
>+    /* see p. 118 of amd64 instruction set manual Vol3 */
>+    /* We need to be careful about the handling of %ebx and
>+     * %esp here. We can't declare either one as clobbered
>+     * since they are special registers (%ebx is the "PIC
>+     * register" holding an offset to global data, %esp the
>+     * stack pointer), so we need to make sure they have their
>+     * original values when we access the output operands.
>+     */
>+    __asm__ ("pushf\n"
>+             "pop %%eax\n"
>+             "mov %%eax, %%ecx\n"
>+             "xor $0x00200000, %%eax\n"
>+             "push %%eax\n"
>+             "popf\n"
>+             "pushf\n"
>+             "pop %%eax\n"
>+             "mov $0x0, %%edx\n"
>+             "xor %%ecx, %%eax\n"
>+             "jz 1f\n"
>+
>+             "mov $0x00000000, %%eax\n"
>+	     "push %%ebx\n"
>+             "cpuid\n"
>+             "mov %%ebx, %%eax\n"
>+	     "pop %%ebx\n"
>+             "mov %%eax, %1\n"
>+             "mov %%edx, %2\n"
>+             "mov %%ecx, %3\n"
>+             "mov $0x00000001, %%eax\n"
>+	     "push %%ebx\n"
>+             "cpuid\n"
>+	     "pop %%ebx\n"
>+             "1:\n"
>+             "mov %%edx, %0\n"
>+             : "=r" (result), 
>+               "=m" (vendor[0]), 
>+               "=m" (vendor[4]), 
>+               "=m" (vendor[8])
>+             :
>+             : "%eax", "%ecx", "%edx"
>+        );
>+
>+    unsigned int features = 0;
>+    if (result) {
>+        /* result now contains the standard feature bits */
>+        if (result & (1 << 15))
>+            features |= CMOV;
>+        if (result & (1 << 23))
>+            features |= MMX;
>+        if (result & (1 << 25))
>+            features |= SSE;
>+        if (result & (1 << 26))
>+            features |= SSE2;
>+        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
>+            /* check for AMD MMX extensions */
>+
>+            unsigned int result;            
>+            __asm__("push %%ebx\n"
>+                    "mov $0x80000000, %%eax\n"
>+                    "cpuid\n"
>+                    "xor %%edx, %%edx\n"
>+                    "cmp $0x1, %%eax\n"
>+                    "jge 1f\n"
>+                    "mov $0x80000001, %%eax\n"
>+                    "cpuid\n"
>+                    "1:\n"
>+                    "pop %%ebx\n"
>+                    "mov %%edx, %0\n"
>+                    : "=r" (result)
>+                    :
>+                    : "%eax", "%ecx", "%edx"
>+                );
>+            if (result & (1<<22))
>+                features |= MMX_Extensions;
>+        }
>+    }
>+    return features;
>+}
>+
>+Bool
>+fbHaveMMX (void)
>+{
>+    static Bool initialized = FALSE;
>+    static Bool mmx_present;
>+
>+    if (!initialized)
>+    {
>+        unsigned int features = detectCPUFeatures();
>+	mmx_present = (features & (MMX|MMX_Extensions)) == (MMX|MMX_Extensions);
>+        initialized = TRUE;
>+    }
>+    
>+    return mmx_present;
>+}
>+#endif /* USE_MMX && !amd64 */
> #endif /* RENDER */

Actions: View | Splinter Review

Attachments on bug 4414: 3291

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.