diff --git a/pce_fast/cdrom/SimpleFIFO.h b/pce_fast/cdrom/SimpleFIFO.h index a1a43fb..083cd95 100644 --- a/pce_fast/cdrom/SimpleFIFO.h +++ b/pce_fast/cdrom/SimpleFIFO.h @@ -3,8 +3,6 @@ #include -#include "math_ops.h" - template class SimpleFIFO { diff --git a/pce_fast/mednafen/math_ops.h b/pce_fast/mednafen/math_ops.h deleted file mode 100644 index 85e4e58..0000000 --- a/pce_fast/mednafen/math_ops.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef __MDFN_MATH_OPS_H -#define __MDFN_MATH_OPS_H -#include "mednafen.h" - -static INLINE uint32 uilog2(uint32 v) -{ - // http://graphics.stanford.edu/~seander/bithacks.html#IntegerLogDeBruijn - - static const uint32 MultiplyDeBruijnBitPosition[32] = - { - 0, 9, 1, 10, 13, 21, 2, 29, 11, 14, 16, 18, 22, 25, 3, 30, - 8, 12, 20, 28, 15, 17, 24, 7, 19, 27, 23, 6, 26, 5, 4, 31 - }; - - v |= v >> 1; // first round down to one less than a power of 2 - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - - return MultiplyDeBruijnBitPosition[(uint32_t)(v * 0x07C4ACDDU) >> 27]; -} - -// Some compilers' optimizers and some platforms might fubar the generated code from these macros, -// so some tests are run in...tests.cpp -#define sign_8_to_s16(_value) ((int16)(int8)(_value)) -#define sign_9_to_s16(_value) (((int16)((unsigned int)(_value) << 7)) >> 7) -#define sign_10_to_s16(_value) (((int16)((uint32)(_value) << 6)) >> 6) -#define sign_11_to_s16(_value) (((int16)((uint32)(_value) << 5)) >> 5) -#define sign_12_to_s16(_value) (((int16)((uint32)(_value) << 4)) >> 4) -#define sign_13_to_s16(_value) (((int16)((uint32)(_value) << 3)) >> 3) -#define sign_14_to_s16(_value) (((int16)((uint32)(_value) << 2)) >> 2) -#define sign_15_to_s16(_value) (((int16)((uint32)(_value) << 1)) >> 1) - -// This obviously won't convert higher-than-32 bit numbers to signed 32-bit ;) -// Also, this shouldn't be used for 8-bit and 16-bit signed numbers, since you can -// convert those faster with typecasts... -#define sign_x_to_s32(_bits, _value) (((int32)((uint32)(_value) << (32 - _bits))) >> (32 - _bits)) - -#endif diff --git a/pce_fast/mednafen/mednafen.h b/pce_fast/mednafen/mednafen.h index 41a2f1c..728adfd 100644 --- a/pce_fast/mednafen/mednafen.h +++ b/pce_fast/mednafen/mednafen.h @@ -6,7 +6,6 @@ #include #include #include "mednafen-types.h" -#include "math_ops.h" #include "settings.h" #include "git.h" extern MDFNGI MDFNGameInfo;