We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] fix missing ); in solaris asm block & split 64 bit off into a separate block

SDL-1.2.15-SDL_cpuinfo-assembly.patch (text/plain), 2.45 KB, created by Tim Mooney on 2012-01-25 10:55:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Mooney

Created: 2012-01-25 10:55:27 UTC

Size: 2.45 KB

patch

obsolete

>diff -ur SDL-1.2.15.orig/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.15/src/cpuinfo/SDL_cpuinfo.c
>--- SDL-1.2.15.orig/src/cpuinfo/SDL_cpuinfo.c	2012-01-19 00:30:06.000000000 -0600
>+++ SDL-1.2.15/src/cpuinfo/SDL_cpuinfo.c	2012-01-24 19:21:00.861940773 -0600
>@@ -200,7 +200,7 @@
>         mov     features, edx
> done:
> 	}
>-#elif defined(__sun) && (defined(__i386) || defined(__amd64))
>+#elif defined(__sun) && defined(__i386)
> 	    __asm(
> "        xorl    %eax,%eax         \n"
> "        pushl   %ebx              \n"
>@@ -213,12 +213,25 @@
> "        pushl   %ebx              \n"
> "        cpuid                     \n"
> "        popl    %ebx              \n"
>-#ifdef __i386
> "        movl    %edx,-8(%ebp)     \n"
>-#else
>+"1:                                \n"
>+	);
>+#elif defined(__sun) && defined(__amd64)
>+	    __asm(
>+"        xorl    %eax,%eax         \n"
>+"        pushq   %rbx              \n"
>+"        cpuid                     \n"
>+"        popq    %rbx              \n"
>+"        cmpl    $1,%eax           \n"
>+"        jl      1f                \n"
>+"        xorl    %eax,%eax         \n"
>+"        incl    %eax              \n"
>+"        pushq   %rbx              \n"
>+"        cpuid                     \n"
>+"        popq    %rbx              \n"
> "        movl    %edx,-8(%rbp)     \n"
>-#endif
> "1:                                \n"
>+	);
> #endif
> 	return features;
> }
>@@ -277,7 +290,7 @@
>         mov     features,edx
> done:
> 	}
>-#elif defined(__sun) && ( defined(__i386) || defined(__amd64) )
>+#elif defined(__sun) && defined(__i386)
> 	    __asm (
> "        movl    $0x80000000,%eax \n"
> "        pushl   %ebx             \n"
>@@ -289,11 +302,22 @@
> "        pushl   %ebx             \n"
> "        cpuid                    \n"
> "        popl    %ebx             \n"
>-#ifdef __i386
>-"        movl    %edx,-8(%ebp)   \n"
>-#else
>-"        movl    %edx,-8(%rbp)   \n"
>-#endif
>+"        movl    %edx,-8(%ebp)    \n"
>+"1:                               \n"
>+	    );
>+#elif defined(__sun) && defined(__amd64)
>+	    __asm (
>+"        movl    $0x80000000,%eax \n"
>+"        pushq   %rbx             \n"
>+"        cpuid                    \n"
>+"        popq    %rbx             \n"
>+"        cmpl    $0x80000001,%eax \n"
>+"        jl      1f               \n"
>+"        movl    $0x80000001,%eax \n"
>+"        pushq   %rbx             \n"
>+"        cpuid                    \n"
>+"        popq    %rbx             \n"
>+"        movl    %edx,-8(%rbp)    \n"
> "1:                               \n"
> 	    );
> #endif

Actions: View | Diff

Attachments on bug 1398: 807

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.