X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fos.h;h=416a401dd1b9e746c3347c32661e06ab31e4960d;hb=c78405727f8c5fcc9d1a8d23d57f16fc4c7dface;hp=31cf1026d77d4076bcdb6716f7afde5202b59016;hpb=2c1e8f6c6a91dc061e093e0e2356c1aa03b83fd6;p=platform%2Fupstream%2Flibvorbis.git diff --git a/lib/os.h b/lib/os.h index 31cf102..416a401 100644 --- a/lib/os.h +++ b/lib/os.h @@ -3,65 +3,59 @@ /******************************************************************** * * * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * - * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY * - * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH * - * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * + * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * + * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * + * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 * - * by the XIPHOPHORUS Company http://www.xiph.org/ * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * + * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os.h,v 1.23 2001/02/19 05:34:59 jsquyres Exp $ ********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include +#include "misc.h" + #ifndef _V_IFDEFJAIL_H_ # define _V_IFDEFJAIL_H_ # ifdef __GNUC__ -# define STIN static inline -# elif _WIN32 +# define STIN static __inline__ +# elif defined(_WIN32) # define STIN static __inline -#else -# define STIN static +# else +# define STIN static +# endif + +#ifdef DJGPP +# define rint(x) (floor((x)+0.5f)) #endif #ifndef M_PI # define M_PI (3.1415926536f) #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__SYMBIAN32__) # include -# define rint(x) (floor((x)+0.5f)) +# define rint(x) (floor((x)+0.5f)) # define NO_FLOAT_MATH_LIB # define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b)) #endif -#ifndef __GNUC__ -# define NO_FLOAT_MATH_LIB -#endif - -#ifdef DARWIN -# define NO_FLOAT_MATH_LIB +#if defined(__SYMBIAN32__) && defined(__WINS__) +void *_alloca(size_t size); +# define alloca _alloca #endif -#ifndef NO_FLOAT_MATH_LIB -# define sqrt sqrtf -# define log logf -# define exp expf -# define pow powf -# define acos acosf -# define atan atanf -# define frexp frexpf -# define rint rintf -#endif - - #ifndef FAST_HYPOT # define FAST_HYPOT hypot #endif @@ -84,6 +78,8 @@ # define max(x,y) ((x)<(y)?(y):(x)) #endif + +/* Special i386 GCC implementation */ #if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__) # define VORBIS_FPU_CONTROL /* both GCC and MSVC are kinda stupid about rounding/casting to int. @@ -99,10 +95,10 @@ static inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ ogg_int16_t ret; ogg_int16_t temp; __asm__ __volatile__("fnstcw %0\n\t" - "movw %0,%%dx\n\t" - "orw $62463,%%dx\n\t" - "movw %%dx,%1\n\t" - "fldcw %1\n\t":"=m"(ret):"m"(temp): "dx"); + "movw %0,%%dx\n\t" + "andw $62463,%%dx\n\t" + "movw %%dx,%1\n\t" + "fldcw %1\n\t":"=m"(ret):"m"(temp): "dx"); *fpu=ret; } @@ -118,44 +114,77 @@ static inline int vorbis_ftoi(double f){ /* yes, double! Otherwise, __asm__("fistl %0": "=m"(i) : "t"(f)); return(i); } -#endif +#endif /* Special i386 GCC implementation */ -#if defined(_WIN32) && !defined(__GNUC__) +/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the + * 64 bit compiler and doesn't work on arm. */ +#if defined(_MSC_VER) && !defined(_WIN64) && \ + !defined(_WIN32_WCE) && !defined(_M_ARM) # define VORBIS_FPU_CONTROL typedef ogg_int16_t vorbis_fpu_control; static __inline int vorbis_ftoi(double f){ - int i; - __asm{ - fld f - fistp i - } - return i; + int i; + __asm{ + fld f + fistp i + } + return i; } static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ + (void)fpu; } static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + (void)fpu; } -#endif +#endif /* Special MSVC 32 bit implementation */ + +/* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be + done safely because all x86_64 CPUs supports SSE2. */ +#if (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__)) +# define VORBIS_FPU_CONTROL + +typedef ogg_int16_t vorbis_fpu_control; + +#include +static __inline int vorbis_ftoi(double f){ + return _mm_cvtsd_si32(_mm_load_sd(&f)); +} +static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ + (void)fpu; +} + +static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + (void)fpu; +} + +#endif /* Special MSVC x64 implementation */ + + +/* If no special implementation was found for the current compiler / platform, + use the default implementation here: */ #ifndef VORBIS_FPU_CONTROL typedef int vorbis_fpu_control; static int vorbis_ftoi(double f){ - return (int)(f+.5); + /* Note: MSVC and GCC (at least on some systems) round towards zero, thus, + the floor() call is required to ensure correct roudning of + negative numbers */ + return (int)floor(f+.5); } /* We don't have special code for this compiler/arch, so do it the slow way */ # define vorbis_fpu_setround(vorbis_fpu_control) {} # define vorbis_fpu_restore(vorbis_fpu_control) {} -#endif +#endif /* default implementation */ #endif /* _OS_H */