RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 06:42:03 +00:00
Code Issues Releases Wiki Activity

Simplify cpudetect OS-support detection code, e.g. using one mp_msg to print either yes or no instead of two.

Browse Source 
Should not change code behaviour.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27637 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-09-18 15:30:23 +00:00
parent cec6a449ef
commit f19f762548
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cpudetect.c
View File

@ -382,25 +382,15 @@ static void check_os_katmai_support( void )
mp_msg(MSGT_CPUDETECT,MSGL_V, "Testing OS support for SSE... " ); mp_msg(MSGT_CPUDETECT,MSGL_V, "Testing OS support for SSE... " );
ret = sysctl(mib, 2, &has_sse, &varlen, NULL, 0); ret = sysctl(mib, 2, &has_sse, &varlen, NULL, 0);
if (ret < 0 || !has_sse) { gCpuCaps.hasSSE = ret >= 0 && has_sse;
gCpuCaps.hasSSE=0; mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE ? "yes.\n" : "no!\n" );
mp_msg(MSGT_CPUDETECT,MSGL_V, "no!\n" );
} else {
gCpuCaps.hasSSE=1;
mp_msg(MSGT_CPUDETECT,MSGL_V, "yes!\n" );
}
mib[1] = CPU_SSE2; mib[1] = CPU_SSE2;
varlen = sizeof(has_sse2); varlen = sizeof(has_sse2);
mp_msg(MSGT_CPUDETECT,MSGL_V, "Testing OS support for SSE2... " ); mp_msg(MSGT_CPUDETECT,MSGL_V, "Testing OS support for SSE2... " );
ret = sysctl(mib, 2, &has_sse2, &varlen, NULL, 0); ret = sysctl(mib, 2, &has_sse2, &varlen, NULL, 0);
if (ret < 0 || !has_sse2) { gCpuCaps.hasSSE2 = ret >= 0 && has_sse2;
gCpuCaps.hasSSE2=0; mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE2 ? "yes.\n" : "no!\n" );
mp_msg(MSGT_CPUDETECT,MSGL_V, "no!\n" );
} else {
gCpuCaps.hasSSE2=1;
mp_msg(MSGT_CPUDETECT,MSGL_V, "yes!\n" );
}
#else #else
gCpuCaps.hasSSE = 0; gCpuCaps.hasSSE = 0;
mp_msg(MSGT_CPUDETECT,MSGL_WARN, "No OS support for SSE, disabling to be safe.\n" ); mp_msg(MSGT_CPUDETECT,MSGL_WARN, "No OS support for SSE, disabling to be safe.\n" );
@ -412,8 +402,7 @@ static void check_os_katmai_support( void )
exc_fil = SetUnhandledExceptionFilter(win32_sig_handler_sse); exc_fil = SetUnhandledExceptionFilter(win32_sig_handler_sse);
__asm __volatile ("xorps %xmm0, %xmm0"); __asm __volatile ("xorps %xmm0, %xmm0");
SetUnhandledExceptionFilter(exc_fil); SetUnhandledExceptionFilter(exc_fil);
if ( gCpuCaps.hasSSE ) mp_msg(MSGT_CPUDETECT,MSGL_V, "yes.\n" ); mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE ? "yes.\n" : "no!\n" );
else mp_msg(MSGT_CPUDETECT,MSGL_V, "no!\n" );
} }
#elif defined(__OS2__) #elif defined(__OS2__)
EXCEPTIONREGISTRATIONRECORD RegRec = { 0, &os2_sig_handler_sse }; EXCEPTIONREGISTRATIONRECORD RegRec = { 0, &os2_sig_handler_sse };
@ -422,8 +411,7 @@ static void check_os_katmai_support( void )
DosSetExceptionHandler( &RegRec ); DosSetExceptionHandler( &RegRec );
__asm __volatile ("xorps %xmm0, %xmm0"); __asm __volatile ("xorps %xmm0, %xmm0");
DosUnsetExceptionHandler( &RegRec ); DosUnsetExceptionHandler( &RegRec );
if ( gCpuCaps.hasSSE ) mp_msg(MSGT_CPUDETECT,MSGL_V, "yes.\n" ); mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE ? "yes.\n" : "no!\n" );
else mp_msg(MSGT_CPUDETECT,MSGL_V, "no!\n" );
} }
#elif defined(__linux__) #elif defined(__linux__)
#if defined(_POSIX_SOURCE) #if defined(_POSIX_SOURCE)
@ -447,11 +435,7 @@ static void check_os_katmai_support( void )
// __asm __volatile ("xorps %%xmm0, %%xmm0"); // __asm __volatile ("xorps %%xmm0, %%xmm0");
__asm __volatile ("xorps %xmm0, %xmm0"); __asm __volatile ("xorps %xmm0, %xmm0");
if ( gCpuCaps.hasSSE ) { mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE ? "yes.\n" : "no!\n" );
mp_msg(MSGT_CPUDETECT,MSGL_V, "yes.\n" );
} else {
mp_msg(MSGT_CPUDETECT,MSGL_V, "no!\n" );
}
} }
/* Restore the original signal handlers. /* Restore the original signal handlers.
@ -461,11 +445,7 @@ static void check_os_katmai_support( void )
/* If we've gotten to here and the XMM CPUID bit is still set, we're /* If we've gotten to here and the XMM CPUID bit is still set, we're
* safe to go ahead and hook out the SSE code throughout Mesa. * safe to go ahead and hook out the SSE code throughout Mesa.
*/ */
if ( gCpuCaps.hasSSE ) { mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE %s\n", gCpuCaps.hasSSE ? "passed." : "failed!" );
mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE passed.\n" );
} else {
mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE failed!\n" );
}
#else #else
/* We can't use POSIX signal handling to test the availability of /* We can't use POSIX signal handling to test the availability of
* SSE, so we disable it by default. * SSE, so we disable it by default.