SF.net SVN: gar:[25637] csw/mgar/pkg/libsdl/trunk

jake_goerzen at users.sourceforge.net jake_goerzen at users.sourceforge.net
Wed Mar 30 23:45:39 CEST 2016


Revision: 25637
          http://sourceforge.net/p/gar/code/25637
Author:   jake_goerzen
Date:     2016-03-30 21:45:39 +0000 (Wed, 30 Mar 2016)
Log Message:
-----------
libsdl/trunk: update to 1.2.15; add patch; recipe clean up

Modified Paths:
--------------
    csw/mgar/pkg/libsdl/trunk/Makefile
    csw/mgar/pkg/libsdl/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch
    csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14
    csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15
    csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched

Modified: csw/mgar/pkg/libsdl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsdl/trunk/Makefile	2016-03-29 15:32:17 UTC (rev 25636)
+++ csw/mgar/pkg/libsdl/trunk/Makefile	2016-03-30 21:45:39 UTC (rev 25637)
@@ -1,5 +1,5 @@
 NAME = SDL
-VERSION = 1.2.14
+VERSION = 1.2.15
 GARTYPE = v2
 
 DESCRIPTION = Simple DirectMedia Layer library
@@ -11,7 +11,11 @@
 
 MASTER_SITES = http://www.libsdl.org/release/
 DISTFILES = $(NAME)-$(VERSION).tar.gz
+
+GARCOMPILER = SUN
+
 PATCHFILES = 0001-Fix-nasm-options.patch
+PATCHFILES += 0002-restore-previous-version-assembly-code.patch
 
 VENDOR_URL = http://www.libsdl.org/
 
@@ -23,10 +27,13 @@
 
 PACKAGES += CSWlibsdl-dev
 SPKG_DESC_CSWlibsdl-dev  = Simple DirectMedia Layer library development files for libsdl-1.2.so.0
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS += CSWlibsdl1-2-0
+PKGFILES_CSWlibsdl-dev += /opt/csw/lib/libSDL.so
+PKGFILES_CSWlibsdl-dev += /opt/csw/lib/amd64/libSDL.so
+PKGFILES_CSWlibsdl-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibsdl-dev += CSWlibsdl1-2-0
 
 BUILD64_LIBS_ONLY = 1
+
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 
 TEST_TARGET = test

Modified: csw/mgar/pkg/libsdl/trunk/checksums
===================================================================
--- csw/mgar/pkg/libsdl/trunk/checksums	2016-03-29 15:32:17 UTC (rev 25636)
+++ csw/mgar/pkg/libsdl/trunk/checksums	2016-03-30 21:45:39 UTC (rev 25637)
@@ -1 +1 @@
-e52086d1b508fa0b76c52ee30b55bec4  SDL-1.2.14.tar.gz
+9d96df8417572a2afb781a7c4c811a85  SDL-1.2.15.tar.gz

Added: csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch
===================================================================
--- csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch	                        (rev 0)
+++ csw/mgar/pkg/libsdl/trunk/files/0002-restore-previous-version-assembly-code.patch	2016-03-30 21:45:39 UTC (rev 25637)
@@ -0,0 +1,67 @@
+From 8fd158c7393bed3177965eb330d5aacc3a85676f Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoerzen at opencsw.org>
+Date: Wed, 30 Mar 2016 20:29:06 +0200
+Subject: [PATCH] restore previous version assembly code
+
+---
+ src/cpuinfo/SDL_cpuinfo.c | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
+index 0cd0838..a1e58f7 100644
+--- a/src/cpuinfo/SDL_cpuinfo.c
++++ b/src/cpuinfo/SDL_cpuinfo.c
+@@ -202,23 +202,21 @@ done:
+ 	}
+ #elif defined(__sun) && (defined(__i386) || defined(__amd64))
+ 	    __asm(
++"        movl    %ebx,%edi\n"
+ "        xorl    %eax,%eax         \n"
+-"        pushl   %ebx              \n"
+ "        cpuid                     \n"
+-"        popl    %ebx              \n"
+ "        cmpl    $1,%eax           \n"
+ "        jl      1f                \n"
+ "        xorl    %eax,%eax         \n"
+ "        incl    %eax              \n"
+-"        pushl   %ebx              \n"
+ "        cpuid                     \n"
+-"        popl    %ebx              \n"
+ #ifdef __i386
+ "        movl    %edx,-8(%ebp)     \n"
+ #else
+ "        movl    %edx,-8(%rbp)     \n"
+ #endif
+ "1:                                \n"
++"        movl    %edi,%ebx\n" );
+ #endif
+ 	return features;
+ }
+@@ -279,22 +277,20 @@ done:
+ 	}
+ #elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
+ 	    __asm (
++"        movl    %ebx,%edi\n"
+ "        movl    $0x80000000,%eax \n"
+-"        pushl   %ebx             \n"
+ "        cpuid                    \n"
+-"        popl    %ebx             \n"
+ "        cmpl    $0x80000001,%eax \n"
+ "        jl      1f               \n"
+ "        movl    $0x80000001,%eax \n"
+-"        pushl   %ebx             \n"
+ "        cpuid                    \n"
+-"        popl    %ebx             \n"
+ #ifdef __i386
+ "        movl    %edx,-8(%ebp)   \n"
+ #else
+ "        movl    %edx,-8(%rbp)   \n"
+ #endif
+ "1:                               \n"
++"        movl    %edi,%ebx\n"
+ 	    );
+ #endif
+ 	return features;
+-- 
+2.4.0
+

Added: csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14
===================================================================
--- csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14	                        (rev 0)
+++ csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.14	2016-03-30 21:45:39 UTC (rev 25637)
@@ -0,0 +1,479 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken at libsdl.org
+*/
+#include "SDL_config.h"
+
+/* CPU feature detection for SDL */
+
+#include "SDL.h"
+#include "SDL_cpuinfo.h"
+
+#if defined(__MACOSX__) && defined(__ppc__)
+#include <sys/sysctl.h> /* For AltiVec check */
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+#include <signal.h>
+#include <setjmp.h>
+#endif
+
+#define CPU_HAS_RDTSC	0x00000001
+#define CPU_HAS_MMX	0x00000002
+#define CPU_HAS_MMXEXT	0x00000004
+#define CPU_HAS_3DNOW	0x00000010
+#define CPU_HAS_3DNOWEXT 0x00000020
+#define CPU_HAS_SSE	0x00000040
+#define CPU_HAS_SSE2	0x00000080
+#define CPU_HAS_ALTIVEC	0x00000100
+
+#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__
+/* This is the brute force way of detecting instruction sets...
+   the idea is borrowed from the libmpeg2 library - thanks!
+ */
+static jmp_buf jmpbuf;
+static void illegal_instruction(int sig)
+{
+	longjmp(jmpbuf, 1);
+}
+#endif /* HAVE_SETJMP */
+
+static __inline__ int CPU_haveCPUID(void)
+{
+	int has_CPUID = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        pushfl                      # Get original EFLAGS             \n"
+"        popl    %%eax                                                 \n"
+"        movl    %%eax,%%ecx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushl   %%eax               # Save new EFLAGS value on stack  \n"
+"        popfl                       # Replace current EFLAGS value    \n"
+"        pushfl                      # Get new EFLAGS                  \n"
+"        popl    %%eax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+	: "=m" (has_CPUID)
+	:
+	: "%eax", "%ecx"
+	);
+#elif defined(__GNUC__) && defined(__x86_64__)
+/* Technically, if this is being compiled under __x86_64__ then it has 
+CPUid by definition.  But it's nice to be able to prove it.  :)      */
+	__asm__ (
+"        pushfq                      # Get original EFLAGS             \n"
+"        popq    %%rax                                                 \n"
+"        movq    %%rax,%%rcx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushq   %%rax               # Save new EFLAGS value on stack  \n"
+"        popfq                       # Replace current EFLAGS value    \n"
+"        pushfq                      # Get new EFLAGS                  \n"
+"        popq    %%rax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+	: "=m" (has_CPUID)
+	:
+	: "%rax", "%rcx"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        pushfd                      ; Get original EFLAGS
+        pop     eax
+        mov     ecx, eax
+        xor     eax, 200000h        ; Flip ID bit in EFLAGS
+        push    eax                 ; Save new EFLAGS value on stack
+        popfd                       ; Replace current EFLAGS value
+        pushfd                      ; Get new EFLAGS
+        pop     eax                 ; Store new EFLAGS in EAX
+        xor     eax, ecx            ; Can not toggle ID bit,
+        jz      done                ; Processor=80486
+        mov     has_CPUID,1         ; We have CPUID support
+done:
+	}
+#elif defined(__sun) && defined(__i386)
+	__asm (
+"       pushfl                 \n"
+"	popl    %eax           \n"
+"	movl    %eax,%ecx      \n"
+"	xorl    $0x200000,%eax \n"
+"	pushl   %eax           \n"
+"	popfl                  \n"
+"	pushfl                 \n"
+"	popl    %eax           \n"
+"	xorl    %ecx,%eax      \n"
+"	jz      1f             \n"
+"	movl    $1,-8(%ebp)    \n"
+"1:                            \n"
+	);
+#elif defined(__sun) && defined(__amd64)
+	__asm (
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       movq    %rax,%rcx      \n"
+"       xorl    $0x200000,%eax \n"
+"       pushq   %rax           \n"
+"       popfq                  \n"
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       xorl    %ecx,%eax      \n"
+"       jz      1f             \n"
+"       movl    $1,-8(%rbp)    \n"
+"1:                            \n"
+	);
+#endif
+	return has_CPUID;
+}
+
+static __inline__ int CPU_getCPUIDFeatures(void)
+{
+	int features = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        movl    %%ebx,%%edi\n"
+"        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
+"        cpuid                       # Get and save vendor ID          \n"
+"        cmpl    $1,%%eax            # Make sure 1 is valid input for CPUID\n"
+"        jl      1f                  # We dont have the CPUID instruction\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+"        movl    %%edi,%%ebx\n"
+	: "=m" (features)
+	:
+	: "%eax", "%ecx", "%edx", "%edi"
+	);
+#elif defined(__GNUC__) && defined(__x86_64__)
+	__asm__ (
+"        movq    %%rbx,%%rdi\n"
+"        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
+"        cpuid                       # Get and save vendor ID          \n"
+"        cmpl    $1,%%eax            # Make sure 1 is valid input for CPUID\n"
+"        jl      1f                  # We dont have the CPUID instruction\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+"        movq    %%rdi,%%rbx\n"
+	: "=m" (features)
+	:
+	: "%rax", "%rbx", "%rcx", "%rdx", "%rdi"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        xor     eax, eax            ; Set up for CPUID instruction
+        cpuid                       ; Get and save vendor ID
+        cmp     eax, 1              ; Make sure 1 is valid input for CPUID
+        jl      done                ; We dont have the CPUID instruction
+        xor     eax, eax
+        inc     eax
+        cpuid                       ; Get family/model/stepping/features
+        mov     features, edx
+done:
+	}
+#elif defined(__sun) && (defined(__i386) || defined(__amd64))
+	    __asm(
+"        movl    %ebx,%edi\n"
+"        xorl    %eax,%eax         \n"
+"        cpuid                     \n"
+"        cmpl    $1,%eax           \n"
+"        jl      1f                \n"
+"        xorl    %eax,%eax         \n"
+"        incl    %eax              \n"
+"        cpuid                     \n"
+#ifdef __i386
+"        movl    %edx,-8(%ebp)     \n"
+#else
+"        movl    %edx,-8(%rbp)     \n"
+#endif
+"1:                                \n"
+"        movl    %edi,%ebx\n" );
+#endif
+	return features;
+}
+
+static __inline__ int CPU_getCPUIDFeaturesExt(void)
+{
+	int features = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        movl    %%ebx,%%edi\n"
+"        movl    $0x80000000,%%eax   # Query for extended functions    \n"
+"        cpuid                       # Get extended function limit     \n"
+"        cmpl    $0x80000001,%%eax                                     \n"
+"        jl      1f                  # Nope, we dont have function 800000001h\n"
+"        movl    $0x80000001,%%eax   # Setup extended function 800000001h\n"
+"        cpuid                       # and get the information         \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+"        movl    %%edi,%%ebx\n"
+	: "=m" (features)
+	:
+	: "%eax", "%ecx", "%edx", "%edi"
+	);
+#elif defined(__GNUC__) && defined (__x86_64__)
+	__asm__ (
+"        movq    %%rbx,%%rdi\n"
+"        movl    $0x80000000,%%eax   # Query for extended functions    \n"
+"        cpuid                       # Get extended function limit     \n"
+"        cmpl    $0x80000001,%%eax                                     \n"
+"        jl      1f                  # Nope, we dont have function 800000001h\n"
+"        movl    $0x80000001,%%eax   # Setup extended function 800000001h\n"
+"        cpuid                       # and get the information         \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+"        movq    %%rdi,%%rbx\n"
+	: "=m" (features)
+	:
+	: "%rax", "%rbx", "%rcx", "%rdx", "%rdi"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        mov     eax,80000000h       ; Query for extended functions
+        cpuid                       ; Get extended function limit
+        cmp     eax,80000001h
+        jl      done                ; Nope, we dont have function 800000001h
+        mov     eax,80000001h       ; Setup extended function 800000001h
+        cpuid                       ; and get the information
+        mov     features,edx
+done:
+	}
+#elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
+	    __asm (
+"        movl    %ebx,%edi\n"
+"        movl    $0x80000000,%eax \n"
+"        cpuid                    \n"
+"        cmpl    $0x80000001,%eax \n"
+"        jl      1f               \n"
+"        movl    $0x80000001,%eax \n"
+"        cpuid                    \n"
+#ifdef __i386
+"        movl    %edx,-8(%ebp)   \n"
+#else
+"        movl    %edx,-8(%rbp)   \n"
+#endif
+"1:                               \n"
+"        movl    %edi,%ebx\n"
+	    );
+#endif
+	return features;
+}
+
+static __inline__ int CPU_haveRDTSC(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x00000010);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveMMX(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x00800000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveMMXExt(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x00400000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_have3DNow(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x80000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_have3DNowExt(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x40000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveSSE(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x02000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveSSE2(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x04000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveAltiVec(void)
+{
+	volatile int altivec = 0;
+#if defined(__MACOSX__) && defined(__ppc__)
+	int selectors[2] = { CTL_HW, HW_VECTORUNIT }; 
+	int hasVectorUnit = 0; 
+	size_t length = sizeof(hasVectorUnit); 
+	int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); 
+	if( 0 == error )
+		altivec = (hasVectorUnit != 0); 
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+	void (*handler)(int sig);
+	handler = signal(SIGILL, illegal_instruction);
+	if ( setjmp(jmpbuf) == 0 ) {
+		asm volatile ("mtspr 256, %0\n\t"
+			      "vand %%v0, %%v0, %%v0"
+			      :
+			      : "r" (-1));
+		altivec = 1;
+	}
+	signal(SIGILL, handler);
+#endif
+	return altivec; 
+}
+
+static Uint32 SDL_CPUFeatures = 0xFFFFFFFF;
+
+static Uint32 SDL_GetCPUFeatures(void)
+{
+	if ( SDL_CPUFeatures == 0xFFFFFFFF ) {
+		SDL_CPUFeatures = 0;
+		if ( CPU_haveRDTSC() ) {
+			SDL_CPUFeatures |= CPU_HAS_RDTSC;
+		}
+		if ( CPU_haveMMX() ) {
+			SDL_CPUFeatures |= CPU_HAS_MMX;
+		}
+		if ( CPU_haveMMXExt() ) {
+			SDL_CPUFeatures |= CPU_HAS_MMXEXT;
+		}
+		if ( CPU_have3DNow() ) {
+			SDL_CPUFeatures |= CPU_HAS_3DNOW;
+		}
+		if ( CPU_have3DNowExt() ) {
+			SDL_CPUFeatures |= CPU_HAS_3DNOWEXT;
+		}
+		if ( CPU_haveSSE() ) {
+			SDL_CPUFeatures |= CPU_HAS_SSE;
+		}
+		if ( CPU_haveSSE2() ) {
+			SDL_CPUFeatures |= CPU_HAS_SSE2;
+		}
+		if ( CPU_haveAltiVec() ) {
+			SDL_CPUFeatures |= CPU_HAS_ALTIVEC;
+		}
+	}
+	return SDL_CPUFeatures;
+}
+
+SDL_bool SDL_HasRDTSC(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_RDTSC ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasMMX(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_MMX ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasMMXExt(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_MMXEXT ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_Has3DNow(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOW ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_Has3DNowExt(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOWEXT ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasSSE(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_SSE ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasSSE2(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_SSE2 ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasAltiVec(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_ALTIVEC ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+#ifdef TEST_MAIN
+
+#include <stdio.h>
+
+int main()
+{
+	printf("RDTSC: %d\n", SDL_HasRDTSC());
+	printf("MMX: %d\n", SDL_HasMMX());
+	printf("MMXExt: %d\n", SDL_HasMMXExt());
+	printf("3DNow: %d\n", SDL_Has3DNow());
+	printf("3DNowExt: %d\n", SDL_Has3DNowExt());
+	printf("SSE: %d\n", SDL_HasSSE());
+	printf("SSE2: %d\n", SDL_HasSSE2());
+	printf("AltiVec: %d\n", SDL_HasAltiVec());
+	return 0;
+}
+
+#endif /* TEST_MAIN */

Added: csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15
===================================================================
--- csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15	                        (rev 0)
+++ csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.1.2.15	2016-03-30 21:45:39 UTC (rev 25637)
@@ -0,0 +1,499 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2012 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken at libsdl.org
+*/
+#include "SDL_config.h"
+
+/* CPU feature detection for SDL */
+
+#include "SDL.h"
+#include "SDL_cpuinfo.h"
+
+#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
+#include <sys/sysctl.h> /* For AltiVec check */
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+#include <signal.h>
+#include <setjmp.h>
+#endif
+
+#define CPU_HAS_RDTSC	0x00000001
+#define CPU_HAS_MMX	0x00000002
+#define CPU_HAS_MMXEXT	0x00000004
+#define CPU_HAS_3DNOW	0x00000010
+#define CPU_HAS_3DNOWEXT 0x00000020
+#define CPU_HAS_SSE	0x00000040
+#define CPU_HAS_SSE2	0x00000080
+#define CPU_HAS_ALTIVEC	0x00000100
+
+#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__
+/* This is the brute force way of detecting instruction sets...
+   the idea is borrowed from the libmpeg2 library - thanks!
+ */
+static jmp_buf jmpbuf;
+static void illegal_instruction(int sig)
+{
+	longjmp(jmpbuf, 1);
+}
+#endif /* HAVE_SETJMP */
+
+static __inline__ int CPU_haveCPUID(void)
+{
+	int has_CPUID = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        pushfl                      # Get original EFLAGS             \n"
+"        popl    %%eax                                                 \n"
+"        movl    %%eax,%%ecx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushl   %%eax               # Save new EFLAGS value on stack  \n"
+"        popfl                       # Replace current EFLAGS value    \n"
+"        pushfl                      # Get new EFLAGS                  \n"
+"        popl    %%eax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+	: "=m" (has_CPUID)
+	:
+	: "%eax", "%ecx"
+	);
+#elif defined(__GNUC__) && defined(__x86_64__)
+/* Technically, if this is being compiled under __x86_64__ then it has 
+CPUid by definition.  But it's nice to be able to prove it.  :)      */
+	__asm__ (
+"        pushfq                      # Get original EFLAGS             \n"
+"        popq    %%rax                                                 \n"
+"        movq    %%rax,%%rcx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushq   %%rax               # Save new EFLAGS value on stack  \n"
+"        popfq                       # Replace current EFLAGS value    \n"
+"        pushfq                      # Get new EFLAGS                  \n"
+"        popq    %%rax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+	: "=m" (has_CPUID)
+	:
+	: "%rax", "%rcx"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        pushfd                      ; Get original EFLAGS
+        pop     eax
+        mov     ecx, eax
+        xor     eax, 200000h        ; Flip ID bit in EFLAGS
+        push    eax                 ; Save new EFLAGS value on stack
+        popfd                       ; Replace current EFLAGS value
+        pushfd                      ; Get new EFLAGS
+        pop     eax                 ; Store new EFLAGS in EAX
+        xor     eax, ecx            ; Can not toggle ID bit,
+        jz      done                ; Processor=80486
+        mov     has_CPUID,1         ; We have CPUID support
+done:
+	}
+#elif defined(__sun) && defined(__i386)
+	__asm (
+"       pushfl                 \n"
+"	popl    %eax           \n"
+"	movl    %eax,%ecx      \n"
+"	xorl    $0x200000,%eax \n"
+"	pushl   %eax           \n"
+"	popfl                  \n"
+"	pushfl                 \n"
+"	popl    %eax           \n"
+"	xorl    %ecx,%eax      \n"
+"	jz      1f             \n"
+"	movl    $1,-8(%ebp)    \n"
+"1:                            \n"
+	);
+#elif defined(__sun) && defined(__amd64)
+	__asm (
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       movq    %rax,%rcx      \n"
+"       xorl    $0x200000,%eax \n"
+"       pushq   %rax           \n"
+"       popfq                  \n"
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       xorl    %ecx,%eax      \n"
+"       jz      1f             \n"
+"       movl    $1,-8(%rbp)    \n"
+"1:                            \n"
+	);
+#endif
+	return has_CPUID;
+}
+
+static __inline__ int CPU_getCPUIDFeatures(void)
+{
+	int features = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # Get and save vendor ID          \n"
+"        popl    %%ebx                                                 \n"
+"        cmpl    $1,%%eax            # Make sure 1 is valid input for CPUID\n"
+"        jl      1f                  # We dont have the CPUID instruction\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        popl    %%ebx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%eax", "%ecx", "%edx"
+	);
+#elif defined(__GNUC__) && defined(__x86_64__)
+	__asm__ (
+"        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # Get and save vendor ID          \n"
+"        popq    %%rbx                                                 \n"
+"        cmpl    $1,%%eax            # Make sure 1 is valid input for CPUID\n"
+"        jl      1f                  # We dont have the CPUID instruction\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        popq    %%rbx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%rax", "%rcx", "%rdx"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        xor     eax, eax            ; Set up for CPUID instruction
+        push    ebx
+        cpuid                       ; Get and save vendor ID
+        pop     ebx
+        cmp     eax, 1              ; Make sure 1 is valid input for CPUID
+        jl      done                ; We dont have the CPUID instruction
+        xor     eax, eax
+        inc     eax
+        push    ebx
+        cpuid                       ; Get family/model/stepping/features
+        pop     ebx
+        mov     features, edx
+done:
+	}
+#elif defined(__sun) && (defined(__i386) || defined(__amd64))
+	    __asm(
+"        xorl    %eax,%eax         \n"
+"        pushl   %ebx              \n"
+"        cpuid                     \n"
+"        popl    %ebx              \n"
+"        cmpl    $1,%eax           \n"
+"        jl      1f                \n"
+"        xorl    %eax,%eax         \n"
+"        incl    %eax              \n"
+"        pushl   %ebx              \n"
+"        cpuid                     \n"
+"        popl    %ebx              \n"
+#ifdef __i386
+"        movl    %edx,-8(%ebp)     \n"
+#else
+"        movl    %edx,-8(%rbp)     \n"
+#endif
+"1:                                \n"
+#endif
+	return features;
+}
+
+static __inline__ int CPU_getCPUIDFeaturesExt(void)
+{
+	int features = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        movl    $0x80000000,%%eax   # Query for extended functions    \n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # Get extended function limit     \n"
+"        popl    %%ebx                                                 \n"
+"        cmpl    $0x80000001,%%eax                                     \n"
+"        jl      1f                  # Nope, we dont have function 800000001h\n"
+"        movl    $0x80000001,%%eax   # Setup extended function 800000001h\n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # and get the information         \n"
+"        popl    %%ebx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%eax", "%ecx", "%edx"
+	);
+#elif defined(__GNUC__) && defined (__x86_64__)
+	__asm__ (
+"        movl    $0x80000000,%%eax   # Query for extended functions    \n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # Get extended function limit     \n"
+"        popq    %%rbx                                                 \n"
+"        cmpl    $0x80000001,%%eax                                     \n"
+"        jl      1f                  # Nope, we dont have function 800000001h\n"
+"        movl    $0x80000001,%%eax   # Setup extended function 800000001h\n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # and get the information         \n"
+"        popq    %%rbx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%rax", "%rcx", "%rdx"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        mov     eax,80000000h       ; Query for extended functions
+        push    ebx
+        cpuid                       ; Get extended function limit
+        pop     ebx
+        cmp     eax,80000001h
+        jl      done                ; Nope, we dont have function 800000001h
+        mov     eax,80000001h       ; Setup extended function 800000001h
+        push    ebx
+        cpuid                       ; and get the information
+        pop     ebx
+        mov     features,edx
+done:
+	}
+#elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
+	    __asm (
+"        movl    $0x80000000,%eax \n"
+"        pushl   %ebx             \n"
+"        cpuid                    \n"
+"        popl    %ebx             \n"
+"        cmpl    $0x80000001,%eax \n"
+"        jl      1f               \n"
+"        movl    $0x80000001,%eax \n"
+"        pushl   %ebx             \n"
+"        cpuid                    \n"
+"        popl    %ebx             \n"
+#ifdef __i386
+"        movl    %edx,-8(%ebp)   \n"
+#else
+"        movl    %edx,-8(%rbp)   \n"
+#endif
+"1:                               \n"
+	    );
+#endif
+	return features;
+}
+
+static __inline__ int CPU_haveRDTSC(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x00000010);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveMMX(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x00800000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveMMXExt(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x00400000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_have3DNow(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x80000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_have3DNowExt(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x40000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveSSE(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x02000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveSSE2(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x04000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveAltiVec(void)
+{
+	volatile int altivec = 0;
+#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
+	int selectors[2] = { CTL_HW, HW_VECTORUNIT }; 
+	int hasVectorUnit = 0; 
+	size_t length = sizeof(hasVectorUnit); 
+	int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); 
+	if( 0 == error )
+		altivec = (hasVectorUnit != 0); 
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+	void (*handler)(int sig);
+	handler = signal(SIGILL, illegal_instruction);
+	if ( setjmp(jmpbuf) == 0 ) {
+		asm volatile ("mtspr 256, %0\n\t"
+			      "vand %%v0, %%v0, %%v0"
+			      :
+			      : "r" (-1));
+		altivec = 1;
+	}
+	signal(SIGILL, handler);
+#endif
+	return altivec; 
+}
+
+static Uint32 SDL_CPUFeatures = 0xFFFFFFFF;
+
+static Uint32 SDL_GetCPUFeatures(void)
+{
+	if ( SDL_CPUFeatures == 0xFFFFFFFF ) {
+		SDL_CPUFeatures = 0;
+		if ( CPU_haveRDTSC() ) {
+			SDL_CPUFeatures |= CPU_HAS_RDTSC;
+		}
+		if ( CPU_haveMMX() ) {
+			SDL_CPUFeatures |= CPU_HAS_MMX;
+		}
+		if ( CPU_haveMMXExt() ) {
+			SDL_CPUFeatures |= CPU_HAS_MMXEXT;
+		}
+		if ( CPU_have3DNow() ) {
+			SDL_CPUFeatures |= CPU_HAS_3DNOW;
+		}
+		if ( CPU_have3DNowExt() ) {
+			SDL_CPUFeatures |= CPU_HAS_3DNOWEXT;
+		}
+		if ( CPU_haveSSE() ) {
+			SDL_CPUFeatures |= CPU_HAS_SSE;
+		}
+		if ( CPU_haveSSE2() ) {
+			SDL_CPUFeatures |= CPU_HAS_SSE2;
+		}
+		if ( CPU_haveAltiVec() ) {
+			SDL_CPUFeatures |= CPU_HAS_ALTIVEC;
+		}
+	}
+	return SDL_CPUFeatures;
+}
+
+SDL_bool SDL_HasRDTSC(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_RDTSC ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasMMX(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_MMX ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasMMXExt(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_MMXEXT ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_Has3DNow(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOW ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_Has3DNowExt(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOWEXT ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasSSE(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_SSE ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasSSE2(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_SSE2 ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasAltiVec(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_ALTIVEC ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+#ifdef TEST_MAIN
+
+#include <stdio.h>
+
+int main()
+{
+	printf("RDTSC: %d\n", SDL_HasRDTSC());
+	printf("MMX: %d\n", SDL_HasMMX());
+	printf("MMXExt: %d\n", SDL_HasMMXExt());
+	printf("3DNow: %d\n", SDL_Has3DNow());
+	printf("3DNowExt: %d\n", SDL_Has3DNowExt());
+	printf("SSE: %d\n", SDL_HasSSE());
+	printf("SSE2: %d\n", SDL_HasSSE2());
+	printf("AltiVec: %d\n", SDL_HasAltiVec());
+	return 0;
+}
+
+#endif /* TEST_MAIN */

Added: csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched
===================================================================
--- csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched	                        (rev 0)
+++ csw/mgar/pkg/libsdl/trunk/files/SDL_cpuinfo.c.patched	2016-03-30 21:45:39 UTC (rev 25637)
@@ -0,0 +1,495 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2012 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken at libsdl.org
+*/
+#include "SDL_config.h"
+
+/* CPU feature detection for SDL */
+
+#include "SDL.h"
+#include "SDL_cpuinfo.h"
+
+#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
+#include <sys/sysctl.h> /* For AltiVec check */
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+#include <signal.h>
+#include <setjmp.h>
+#endif
+
+#define CPU_HAS_RDTSC	0x00000001
+#define CPU_HAS_MMX	0x00000002
+#define CPU_HAS_MMXEXT	0x00000004
+#define CPU_HAS_3DNOW	0x00000010
+#define CPU_HAS_3DNOWEXT 0x00000020
+#define CPU_HAS_SSE	0x00000040
+#define CPU_HAS_SSE2	0x00000080
+#define CPU_HAS_ALTIVEC	0x00000100
+
+#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__
+/* This is the brute force way of detecting instruction sets...
+   the idea is borrowed from the libmpeg2 library - thanks!
+ */
+static jmp_buf jmpbuf;
+static void illegal_instruction(int sig)
+{
+	longjmp(jmpbuf, 1);
+}
+#endif /* HAVE_SETJMP */
+
+static __inline__ int CPU_haveCPUID(void)
+{
+	int has_CPUID = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        pushfl                      # Get original EFLAGS             \n"
+"        popl    %%eax                                                 \n"
+"        movl    %%eax,%%ecx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushl   %%eax               # Save new EFLAGS value on stack  \n"
+"        popfl                       # Replace current EFLAGS value    \n"
+"        pushfl                      # Get new EFLAGS                  \n"
+"        popl    %%eax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+	: "=m" (has_CPUID)
+	:
+	: "%eax", "%ecx"
+	);
+#elif defined(__GNUC__) && defined(__x86_64__)
+/* Technically, if this is being compiled under __x86_64__ then it has 
+CPUid by definition.  But it's nice to be able to prove it.  :)      */
+	__asm__ (
+"        pushfq                      # Get original EFLAGS             \n"
+"        popq    %%rax                                                 \n"
+"        movq    %%rax,%%rcx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushq   %%rax               # Save new EFLAGS value on stack  \n"
+"        popfq                       # Replace current EFLAGS value    \n"
+"        pushfq                      # Get new EFLAGS                  \n"
+"        popq    %%rax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+	: "=m" (has_CPUID)
+	:
+	: "%rax", "%rcx"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        pushfd                      ; Get original EFLAGS
+        pop     eax
+        mov     ecx, eax
+        xor     eax, 200000h        ; Flip ID bit in EFLAGS
+        push    eax                 ; Save new EFLAGS value on stack
+        popfd                       ; Replace current EFLAGS value
+        pushfd                      ; Get new EFLAGS
+        pop     eax                 ; Store new EFLAGS in EAX
+        xor     eax, ecx            ; Can not toggle ID bit,
+        jz      done                ; Processor=80486
+        mov     has_CPUID,1         ; We have CPUID support
+done:
+	}
+#elif defined(__sun) && defined(__i386)
+	__asm (
+"       pushfl                 \n"
+"	popl    %eax           \n"
+"	movl    %eax,%ecx      \n"
+"	xorl    $0x200000,%eax \n"
+"	pushl   %eax           \n"
+"	popfl                  \n"
+"	pushfl                 \n"
+"	popl    %eax           \n"
+"	xorl    %ecx,%eax      \n"
+"	jz      1f             \n"
+"	movl    $1,-8(%ebp)    \n"
+"1:                            \n"
+	);
+#elif defined(__sun) && defined(__amd64)
+	__asm (
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       movq    %rax,%rcx      \n"
+"       xorl    $0x200000,%eax \n"
+"       pushq   %rax           \n"
+"       popfq                  \n"
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       xorl    %ecx,%eax      \n"
+"       jz      1f             \n"
+"       movl    $1,-8(%rbp)    \n"
+"1:                            \n"
+	);
+#endif
+	return has_CPUID;
+}
+
+static __inline__ int CPU_getCPUIDFeatures(void)
+{
+	int features = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # Get and save vendor ID          \n"
+"        popl    %%ebx                                                 \n"
+"        cmpl    $1,%%eax            # Make sure 1 is valid input for CPUID\n"
+"        jl      1f                  # We dont have the CPUID instruction\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        popl    %%ebx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%eax", "%ecx", "%edx"
+	);
+#elif defined(__GNUC__) && defined(__x86_64__)
+	__asm__ (
+"        xorl    %%eax,%%eax         # Set up for CPUID instruction    \n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # Get and save vendor ID          \n"
+"        popq    %%rbx                                                 \n"
+"        cmpl    $1,%%eax            # Make sure 1 is valid input for CPUID\n"
+"        jl      1f                  # We dont have the CPUID instruction\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        popq    %%rbx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%rax", "%rcx", "%rdx"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        xor     eax, eax            ; Set up for CPUID instruction
+        push    ebx
+        cpuid                       ; Get and save vendor ID
+        pop     ebx
+        cmp     eax, 1              ; Make sure 1 is valid input for CPUID
+        jl      done                ; We dont have the CPUID instruction
+        xor     eax, eax
+        inc     eax
+        push    ebx
+        cpuid                       ; Get family/model/stepping/features
+        pop     ebx
+        mov     features, edx
+done:
+	}
+#elif defined(__sun) && (defined(__i386) || defined(__amd64))
+	    __asm(
+"        movl    %ebx,%edi\n"
+"        xorl    %eax,%eax         \n"
+"        cpuid                     \n"
+"        cmpl    $1,%eax           \n"
+"        jl      1f                \n"
+"        xorl    %eax,%eax         \n"
+"        incl    %eax              \n"
+"        cpuid                     \n"
+#ifdef __i386
+"        movl    %edx,-8(%ebp)     \n"
+#else
+"        movl    %edx,-8(%rbp)     \n"
+#endif
+"1:                                \n"
+"        movl    %edi,%ebx\n" );
+#endif
+	return features;
+}
+
+static __inline__ int CPU_getCPUIDFeaturesExt(void)
+{
+	int features = 0;
+#if defined(__GNUC__) && defined(i386)
+	__asm__ (
+"        movl    $0x80000000,%%eax   # Query for extended functions    \n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # Get extended function limit     \n"
+"        popl    %%ebx                                                 \n"
+"        cmpl    $0x80000001,%%eax                                     \n"
+"        jl      1f                  # Nope, we dont have function 800000001h\n"
+"        movl    $0x80000001,%%eax   # Setup extended function 800000001h\n"
+"        pushl   %%ebx                                                 \n"
+"        cpuid                       # and get the information         \n"
+"        popl    %%ebx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%eax", "%ecx", "%edx"
+	);
+#elif defined(__GNUC__) && defined (__x86_64__)
+	__asm__ (
+"        movl    $0x80000000,%%eax   # Query for extended functions    \n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # Get extended function limit     \n"
+"        popq    %%rbx                                                 \n"
+"        cmpl    $0x80000001,%%eax                                     \n"
+"        jl      1f                  # Nope, we dont have function 800000001h\n"
+"        movl    $0x80000001,%%eax   # Setup extended function 800000001h\n"
+"        pushq   %%rbx                                                 \n"
+"        cpuid                       # and get the information         \n"
+"        popq    %%rbx                                                 \n"
+"        movl    %%edx,%0                                              \n"
+"1:                                                                    \n"
+	: "=m" (features)
+	:
+	: "%rax", "%rcx", "%rdx"
+	);
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+	__asm {
+        mov     eax,80000000h       ; Query for extended functions
+        push    ebx
+        cpuid                       ; Get extended function limit
+        pop     ebx
+        cmp     eax,80000001h
+        jl      done                ; Nope, we dont have function 800000001h
+        mov     eax,80000001h       ; Setup extended function 800000001h
+        push    ebx
+        cpuid                       ; and get the information
+        pop     ebx
+        mov     features,edx
+done:
+	}
+#elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
+	    __asm (
+"        movl    %ebx,%edi\n"
+"        movl    $0x80000000,%eax \n"
+"        cpuid                    \n"
+"        cmpl    $0x80000001,%eax \n"
+"        jl      1f               \n"
+"        movl    $0x80000001,%eax \n"
+"        cpuid                    \n"
+#ifdef __i386
+"        movl    %edx,-8(%ebp)   \n"
+#else
+"        movl    %edx,-8(%rbp)   \n"
+#endif
+"1:                               \n"
+"        movl    %edi,%ebx\n"
+	    );
+#endif
+	return features;
+}
+
+static __inline__ int CPU_haveRDTSC(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x00000010);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveMMX(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x00800000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveMMXExt(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x00400000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_have3DNow(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x80000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_have3DNowExt(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeaturesExt() & 0x40000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveSSE(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x02000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveSSE2(void)
+{
+	if ( CPU_haveCPUID() ) {
+		return (CPU_getCPUIDFeatures() & 0x04000000);
+	}
+	return 0;
+}
+
+static __inline__ int CPU_haveAltiVec(void)
+{
+	volatile int altivec = 0;
+#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
+	int selectors[2] = { CTL_HW, HW_VECTORUNIT }; 
+	int hasVectorUnit = 0; 
+	size_t length = sizeof(hasVectorUnit); 
+	int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0); 
+	if( 0 == error )
+		altivec = (hasVectorUnit != 0); 
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+	void (*handler)(int sig);
+	handler = signal(SIGILL, illegal_instruction);
+	if ( setjmp(jmpbuf) == 0 ) {
+		asm volatile ("mtspr 256, %0\n\t"
+			      "vand %%v0, %%v0, %%v0"
+			      :
+			      : "r" (-1));
+		altivec = 1;
+	}
+	signal(SIGILL, handler);
+#endif
+	return altivec; 
+}
+
+static Uint32 SDL_CPUFeatures = 0xFFFFFFFF;
+
+static Uint32 SDL_GetCPUFeatures(void)
+{
+	if ( SDL_CPUFeatures == 0xFFFFFFFF ) {
+		SDL_CPUFeatures = 0;
+		if ( CPU_haveRDTSC() ) {
+			SDL_CPUFeatures |= CPU_HAS_RDTSC;
+		}
+		if ( CPU_haveMMX() ) {
+			SDL_CPUFeatures |= CPU_HAS_MMX;
+		}
+		if ( CPU_haveMMXExt() ) {
+			SDL_CPUFeatures |= CPU_HAS_MMXEXT;
+		}
+		if ( CPU_have3DNow() ) {
+			SDL_CPUFeatures |= CPU_HAS_3DNOW;
+		}
+		if ( CPU_have3DNowExt() ) {
+			SDL_CPUFeatures |= CPU_HAS_3DNOWEXT;
+		}
+		if ( CPU_haveSSE() ) {
+			SDL_CPUFeatures |= CPU_HAS_SSE;
+		}
+		if ( CPU_haveSSE2() ) {
+			SDL_CPUFeatures |= CPU_HAS_SSE2;
+		}
+		if ( CPU_haveAltiVec() ) {
+			SDL_CPUFeatures |= CPU_HAS_ALTIVEC;
+		}
+	}
+	return SDL_CPUFeatures;
+}
+
+SDL_bool SDL_HasRDTSC(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_RDTSC ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasMMX(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_MMX ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasMMXExt(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_MMXEXT ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_Has3DNow(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOW ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_Has3DNowExt(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_3DNOWEXT ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasSSE(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_SSE ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasSSE2(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_SSE2 ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+SDL_bool SDL_HasAltiVec(void)
+{
+	if ( SDL_GetCPUFeatures() & CPU_HAS_ALTIVEC ) {
+		return SDL_TRUE;
+	}
+	return SDL_FALSE;
+}
+
+#ifdef TEST_MAIN
+
+#include <stdio.h>
+
+int main()
+{
+	printf("RDTSC: %d\n", SDL_HasRDTSC());
+	printf("MMX: %d\n", SDL_HasMMX());
+	printf("MMXExt: %d\n", SDL_HasMMXExt());
+	printf("3DNow: %d\n", SDL_Has3DNow());
+	printf("3DNowExt: %d\n", SDL_Has3DNowExt());
+	printf("SSE: %d\n", SDL_HasSSE());
+	printf("SSE2: %d\n", SDL_HasSSE2());
+	printf("AltiVec: %d\n", SDL_HasAltiVec());
+	return 0;
+}
+
+#endif /* TEST_MAIN */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list