pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Greatly simplified the SDL CPU info code

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40747
This commit is contained in:
Sam Lantinga 2003-11-24 09:22:12 +00:00
parent fb25886c0e
commit 15fabb637b
3 changed files with 5 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/audio/SDL_mixer.c
View file

@ -146,7 +146,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
else else
#endif #endif
#if defined(USE_ASM_MIXER_VC) #if defined(USE_ASM_MIXER_VC)
if (SDL_IsMMX_VC()) if (SDL_HasMMX())
{ {
SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume); SDL_MixAudio_MMX_S8_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
} }
@ -192,7 +192,7 @@ void SDL_MixAudio (Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
} }
else else
#elif defined(USE_ASM_MIXER_VC) #elif defined(USE_ASM_MIXER_VC)
if (SDL_IsMMX_VC()) if (SDL_HasMMX())
{ {
SDL_MixAudio_MMX_S16_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume); SDL_MixAudio_MMX_S16_VC((char*)dst,(char*)src,(unsigned int)len,(int)volume);
} }

54
src/audio/SDL_mixer_MMX_VC.c
View file

@ -1,3 +1,4 @@
#if defined(USE_ASM_MIXER_VC)
// MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
// Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
// Converted to Intel ASM notation by Cth // Converted to Intel ASM notation by Cth
@ -11,7 +12,6 @@
// Mixing for 16 bit signed buffers // Mixing for 16 bit signed buffers
//////////////////////////////////////////////// ////////////////////////////////////////////////
#if defined(USE_ASM_MIXER_VC)
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
@ -152,54 +152,4 @@ endS8:
} }
} }
int _SDL_IsMMX_VC() #endif /* USE_ASM_MIXER_VC */
{
// This bit flag can get set on calling cpuid
// with register eax set to 1
const int _MMX_FEATURE_BIT = 0x00800000;
DWORD dwFeature = 0;
__try {
_asm {
mov eax,1
cpuid
mov dwFeature,edx
}
} __except ( EXCEPTION_EXECUTE_HANDLER) {
return 0;
}
if (dwFeature & _MMX_FEATURE_BIT) {
__try {
__asm {
pxor mm0, mm0
emms
}
} __except (EXCEPTION_EXECUTE_HANDLER) {
return(0);
}
return 1;
}
return 0;
}
static int _notTwice = 2;
int SDL_IsMMX_VC()
{
if (_notTwice > 1)
{
_notTwice = _SDL_IsMMX_VC();
/*
#ifdef _DEBUG
if (_notTwice)
MessageBox( NULL, "Using MMX!!!", "Error", MB_OK | MB_ICONINFORMATION );
else
MessageBox( NULL, "Not sing MMX!!!", "Error", MB_OK | MB_ICONINFORMATION );
#endif
*/
}
return _notTwice;
}
#endif

5
src/audio/SDL_mixer_MMX_VC.h
View file

@ -1,3 +1,4 @@
#if defined(USE_ASM_MIXER_VC)
// headers for MMX assembler version of SDL_MixAudio // headers for MMX assembler version of SDL_MixAudio
// Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
// Converted to Intel ASM notation by Cth // Converted to Intel ASM notation by Cth
@ -6,10 +7,6 @@
// Assumes buffer size in bytes is a multiple of 16 // Assumes buffer size in bytes is a multiple of 16
// Assumes SDL_MIX_MAXVOLUME = 128 // Assumes SDL_MIX_MAXVOLUME = 128
#if defined(USE_ASM_MIXER_VC)
void SDL_MixAudio_MMX_S16_VC(char* ,char* ,unsigned int ,int ); void SDL_MixAudio_MMX_S16_VC(char* ,char* ,unsigned int ,int );
void SDL_MixAudio_MMX_S8_VC(char* ,char* ,unsigned int ,int ); void SDL_MixAudio_MMX_S8_VC(char* ,char* ,unsigned int ,int );
int SDL_IsMMX_VC();
#endif #endif