diff options
author | Nils Wallménius <nils@rockbox.org> | 2011-06-05 13:12:51 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2011-06-05 13:12:51 +0000 |
commit | 965113ed5051d3e9e4b563b8da1f5523c5470a76 (patch) | |
tree | ea3f7922e5075a96e21fa44e4c78f8a0df56c378 /apps/codecs/lib/codeclib_misc.h | |
parent | 9f65f2b6adc24964ac3fe03a75616fab96769bb7 (diff) | |
download | rockbox-965113ed5051d3e9e4b563b8da1f5523c5470a76.tar.gz rockbox-965113ed5051d3e9e4b563b8da1f5523c5470a76.zip |
FS#12146: Fix libcook bugs introduced in r22055 by Sean Bartell.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29973 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/lib/codeclib_misc.h')
-rw-r--r-- | apps/codecs/lib/codeclib_misc.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/codecs/lib/codeclib_misc.h b/apps/codecs/lib/codeclib_misc.h index f3ec209e78..f3b1805e26 100644 --- a/apps/codecs/lib/codeclib_misc.h +++ b/apps/codecs/lib/codeclib_misc.h | |||
@@ -65,6 +65,7 @@ static inline int32_t MULT32(int32_t x, int32_t y) { | |||
65 | magic.whole = (int64_t)x * y; | 65 | magic.whole = (int64_t)x * y; |
66 | return magic.halves.hi; | 66 | return magic.halves.hi; |
67 | } | 67 | } |
68 | |||
68 | static inline int32_t MULT31(int32_t x, int32_t y) { | 69 | static inline int32_t MULT31(int32_t x, int32_t y) { |
69 | return MULT32(x,y)<<1; | 70 | return MULT32(x,y)<<1; |
70 | } | 71 | } |
@@ -75,6 +76,12 @@ static inline int32_t MULT31_SHIFT15(int32_t x, int32_t y) { | |||
75 | return ((uint32_t)(magic.halves.lo)>>15) | ((magic.halves.hi)<<17); | 76 | return ((uint32_t)(magic.halves.lo)>>15) | ((magic.halves.hi)<<17); |
76 | } | 77 | } |
77 | 78 | ||
79 | static inline int32_t MULT31_SHIFT16(int32_t x, int32_t y) { | ||
80 | union magic magic; | ||
81 | magic.whole = (int64_t)x * y; | ||
82 | return ((uint32_t)(magic.halves.lo)>>16) | ((magic.halves.hi)<<16); | ||
83 | } | ||
84 | |||
78 | #else | 85 | #else |
79 | /* 32 bit multiply, more portable but less accurate */ | 86 | /* 32 bit multiply, more portable but less accurate */ |
80 | 87 | ||