hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

made oscillator-phase always being positive which allows further optimizations of fraction()-method

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1431 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-08-03 13:19:13 +00:00
parent 632a707e79
commit 6f05b70b5f
3 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-08-03 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/lmms_math.h:
* src/core/oscillator.cpp:
made oscillator-phase always being positive which allows further
optimizations of fraction()-method
2008-08-01 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/visualization_widget.h:

54
include/lmms_math.h
View File

@@ -31,21 +31,67 @@
#include <math.h>
// Equivalent to _x - floorf( _x )
static inline float fraction( const float _x )
static inline float absFraction( const float _x )
{
return( _x - ( _x >= 0.0f ? floorf( _x ) : floorf( _x ) - 1 ) );
}
static inline float fraction( const float _x )
{
return( _x - floorf( _x ) );
}
#else
// Equivalent to _x - floorf( _x )
static inline float fraction( const float _x )
static inline float absFraction( const float _x )
{
return( _x - ( _x >= 0.0f ? static_cast<int>( _x ) :
static_cast<int>( _x ) - 1 ) );
}
static inline float fraction( const float _x )
{
return( _x - static_cast<int>( _x ) );
}
#if 0
// SSE3-version
static inline float absFraction( float _x )
{
unsigned int tmp;
asm(
"fld %%st\n\t"
"fisttp %1\n\t"
"fild %1\n\t"
"ftst\n\t"
"sahf\n\t"
"jae 1f\n\t"
"fld1\n\t"
"fsubrp %%st, %%st(1)\n\t"
"1:\n\t"
"fsubrp %%st, %%st(1)"
: "+t"( _x ), "=m"( tmp )
:
: "st(1)", "cc" );
return( _x );
}
static inline float absFraction( float _x )
{
unsigned int tmp;
asm(
"fld %%st\n\t"
"fisttp %1\n\t"
"fild %1\n\t"
"fsubrp %%st, %%st(1)"
: "+t"( _x ), "=m"( tmp )
:
: "st(1)" );
return( _x );
}
#endif
#endif

3
src/core/oscillator.cpp
View File

@@ -317,7 +317,8 @@ inline void oscillator::recalcPhase( void )
m_phaseOffset = m_ext_phaseOffset;
m_phase += m_phaseOffset;
}
m_phase = fraction( m_phase );
m_phase = absFraction( m_phase )+2; // make sure we're not running
// negative when doing PM
}