Various speedups: (1) Put actual decoding functions into IRAM on PP5002. (2) Put the insane filter buffer into IRAM on coldfire and PP502x (just for completeness, as long as there's no better use). (3) Use the ARMv6 'ssat' instruction for saturation on Gigabeat S.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18701 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 5 deletions

diff --git a/apps/codecs/demac/libdemac/entropy.c b/apps/codecs/demac/libdemac/entropy.c
index 76d977da82..1ef5bc4dc1 100644
--- a/apps/codecs/demac/libdemac/entropy.c
+++ b/apps/codecs/demac/libdemac/entropy.c
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
 #include "parser.h"
 #include "entropy.h"
 #include "rangecoding.h"   /* Range-coding (static inline) functions */
+#include "demac_iram.h"
 
 #define MODEL_ELEMENTS 64
 
@@ -270,11 +271,11 @@ void init_entropy_decoder(struct ape_ctx_t* ape_ctx,
     *firstbyte = bytebufferoffset;
 }
 
-int entropy_decode(struct ape_ctx_t* ape_ctx,
-                   unsigned char* inbuffer, int* firstbyte,
-                   int* bytesconsumed,
-                   int32_t* decoded0, int32_t* decoded1,
-                   int blockstodecode)
+int ICODE_ATTR_DEMAC entropy_decode(struct ape_ctx_t* ape_ctx,
+                                    unsigned char* inbuffer, int* firstbyte,
+                                    int* bytesconsumed,
+                                    int32_t* decoded0, int32_t* decoded1,
+                                    int blockstodecode)
 {
     bytebuffer = inbuffer;
     bytebufferoffset = *firstbyte;