Attachment 3843 Details for Bug 5093 – fix for non-sse capable i386 machines

[patch] fix for non-sse capable i386 machines

xorg-6.8.99.902-detection.patch (text/plain), 7.79 KB, created by Xavier Bachelot on 2005-11-19 01:55:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Bachelot

Created: 2005-11-19 01:55:50 UTC

Size: 7.79 KB

patch

obsolete

>--- xc/programs/Xserver/fb/Imakefile	12 Jul 2005 10:02:10 -0000	1.10
>+++ xc/programs/Xserver/fb/Imakefile	25 Jul 2005 10:42:05 -0000
>@@ -6,12 +6,12 @@ XCOMM Id: Imakefile,v 1.1 1999/11/02 03:
> #if defined(HasGcc34) && HasGcc34
> MMXOPTIONS= -mmmx -msse -Winline --param inline-unit-growth=10000 \
> 	--param large-function-growth=10000 -DUSE_MMX
>-
>+USEMMXOPTIONS= -DUSE_MMX
> #if defined(i386Architecture) || defined(AMD64Architecture)
> SpecialCObjectRule(fbmmx,fbmmx.c,$(MMXOPTIONS))
>-SpecialCObjectRule(fbpict,fbpict.c,$(MMXOPTIONS))
>-SpecialCObjectRule(fbfill,fbfill.c,$(MMXOPTIONS))
>-SpecialCObjectRule(fbcopy,fbcopy.c,$(MMXOPTIONS))
>+SpecialCObjectRule(fbpict,fbpict.c,$(USEMMXOPTIONS))
>+SpecialCObjectRule(fbfill,fbfill.c,$(USEMMXOPTIONS))
>+SpecialCObjectRule(fbcopy,fbcopy.c,$(USEMMXOPTIONS))
> #endif
> 
> #endif
>--- xc/programs/Xserver/fb/fbmmx.c.orig	2005-11-15 01:15:59.000000000 +0100
>+++ xc/programs/Xserver/fb/fbmmx.c	2005-11-15 01:17:03.000000000 +0100
>@@ -2269,116 +2269,7 @@
> 		   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 1\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 2\n"
>-                    "mov $0x80000001, %%eax\n"
>-                    "cpuid\n"
>-                    "2:\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 */
>--- xc/programs/Xserver/fb/fbpict.c.orig	2005-11-15 01:16:18.000000000 +0100
>+++ xc/programs/Xserver/fb/fbpict.c	2005-11-15 01:29:25.000000000 +0100
>@@ -1336,3 +1336,121 @@
> 
>     return TRUE;
> }
>+
>+#ifdef USE_MMX
>+/* 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(__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 1\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 2\n"
>+                    "mov $0x80000001, %%eax\n"
>+                    "cpuid\n"
>+                    "2:\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

Flags:

ajax: 6.9/7.0+

Actions: View | Splinter Review

Attachments on bug 5093: 3843

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.