Only compile msvc style asm with 32bit msvc

The 64bit compiler doesn't support __asm.
This commit is contained in:
dhewg 2012-07-06 00:10:13 +02:00 committed by Daniel Gibson
parent 5c483d3349
commit d16d3a5534
12 changed files with 17 additions and 17 deletions

View file

@ -385,7 +385,7 @@ ID_INLINE double idMath::Cos64( float a ) {
}
ID_INLINE void idMath::SinCos( float a, float &s, float &c ) {
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_M_IX86)
_asm {
fld a
fsincos
@ -438,7 +438,7 @@ ID_INLINE void idMath::SinCos16( float a, float &s, float &c ) {
}
ID_INLINE void idMath::SinCos64( float a, double &s, double &c ) {
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_M_IX86)
_asm {
fld a
fsincos
@ -796,7 +796,7 @@ ID_INLINE int idMath::Ftoi( float f ) {
}
ID_INLINE int idMath::FtoiFast( float f ) {
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_M_IX86)
int i;
__asm fld f
__asm fistp i // use default rouding mode (round nearest)
@ -828,7 +828,7 @@ ID_INLINE unsigned int idMath::Ftol( float f ) {
}
ID_INLINE unsigned int idMath::FtolFast( float f ) {
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_M_IX86)
// FIXME: this overflows on 31bits still .. same as FtoiFast
unsigned int i;
__asm fld f

View file

@ -149,7 +149,7 @@ idSIMDProcessor *p_simd;
idSIMDProcessor *p_generic;
int baseClocks = 0;
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_M_IX86)
#define TIME_TYPE int

View file

@ -36,7 +36,7 @@ If you have questions concerning this license or the applicable additional terms
//
//===============================================================
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_M_IX86)
/*
============

View file

@ -40,7 +40,7 @@ If you have questions concerning this license or the applicable additional terms
*/
class idSIMD_3DNow : public idSIMD_MMX {
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_M_IX86)
public:
virtual const char * VPCALL GetName( void ) const;

View file

@ -46,7 +46,7 @@ const char * idSIMD_MMX::GetName( void ) const {
return "MMX";
}
#elif defined(_WIN32)
#elif defined(_MSC_VER) && defined(_M_IX86)
#define EMMS_INSTRUCTION __asm emms
@ -361,4 +361,4 @@ loop2:
}
}
#endif /* _WIN32 */
#endif /* _MSC_VER */

View file

@ -44,7 +44,7 @@ public:
#if defined(__GNUC__) && defined(__MMX__)
virtual const char * VPCALL GetName( void ) const;
#elif defined(_WIN32)
#elif defined(_MSC_VER) && defined(_M_IX86)
virtual const char * VPCALL GetName( void ) const;
virtual void VPCALL Memcpy( void *dst, const void *src, const int count );

View file

@ -617,7 +617,7 @@ void VPCALL idSIMD_SSE::Dot( float *dst, const idVec3 &constant, const idPlane *
*/
}
#elif defined(_WIN32)
#elif defined(_MSC_VER) && defined(_M_IX86)
#include <xmmintrin.h>
@ -18081,4 +18081,4 @@ void VPCALL idSIMD_SSE::MixedSoundToSamples( short *samples, const float *mixBuf
#endif
}
#endif /* _WIN32 */
#endif /* _MSC_VER */

View file

@ -50,7 +50,7 @@ public:
virtual void VPCALL MinMax( idVec3 &min, idVec3 &max, const idDrawVert *src, const int *indexes, const int count );
virtual void VPCALL Dot( float *dst, const idVec3 &constant, const idPlane *src, const int count );
#elif defined(_WIN32)
#elif defined(_MSC_VER) && defined(_M_IX86)
virtual const char * VPCALL GetName( void ) const;
virtual void VPCALL Add( float *dst, const float constant, const float *src, const int count );

View file

@ -239,7 +239,7 @@ void VPCALL idSIMD_SSE2::CmpLT( byte *dst, const byte bitNum, const float *src0,
}
}
#elif defined(_MSC_VER)
#elif defined(_MSC_VER) && defined(_M_IX86)
#include <xmmintrin.h>

View file

@ -47,7 +47,7 @@ public:
virtual const char * VPCALL GetName( void ) const;
virtual void VPCALL CmpLT( byte *dst, const byte bitNum, const float *src0, const float constant, const int count );
#elif defined(_MSC_VER)
#elif defined(_MSC_VER) && defined(_M_IX86)
virtual const char * VPCALL GetName( void ) const;
//virtual void VPCALL MatX_LowerTriangularSolve( const idMatX &L, float *x, const float *b, const int n, int skip = 0 );

View file

@ -47,7 +47,7 @@ const char * idSIMD_SSE3::GetName( void ) const {
return "MMX & SSE & SSE2 & SSE3";
}
#elif defined(_MSC_VER)
#elif defined(_MSC_VER) && defined(_M_IX86)
#include <xmmintrin.h>

View file

@ -44,7 +44,7 @@ public:
#if defined(__GNUC__) && defined(__SSE3__)
virtual const char * VPCALL GetName( void ) const;
#elif defined(_MSC_VER)
#elif defined(_MSC_VER) && defined(_M_IX86)
virtual const char * VPCALL GetName( void ) const;
virtual void VPCALL TransformVerts( idDrawVert *verts, const int numVerts, const idJointMat *joints, const idVec4 *weights, const int *index, const int numWeights );