diff options
-rw-r--r-- | apps/codecs/codec.h | 9 | ||||
-rw-r--r-- | apps/codecs/lib/codeclib.h | 6 | ||||
-rw-r--r-- | apps/codecs/lib/xxx2wav.c | 2 | ||||
-rw-r--r-- | apps/codecs/lib/xxx2wav.h | 6 |
4 files changed, 19 insertions, 4 deletions
diff --git a/apps/codecs/codec.h b/apps/codecs/codec.h index 0da653cf04..f954d1bc4d 100644 --- a/apps/codecs/codec.h +++ b/apps/codecs/codec.h | |||
@@ -29,16 +29,21 @@ | |||
29 | * be implemented elsewhere */ | 29 | * be implemented elsewhere */ |
30 | #define malloc(x) codec_malloc(x) | 30 | #define malloc(x) codec_malloc(x) |
31 | #define calloc(x,y) codec_calloc(x,y) | 31 | #define calloc(x,y) codec_calloc(x,y) |
32 | #define alloca(x) codec_alloca(x) | ||
33 | #define realloc(x,y) codec_realloc(x,y) | 32 | #define realloc(x,y) codec_realloc(x,y) |
34 | #define free(x) codec_free(x) | 33 | #define free(x) codec_free(x) |
35 | 34 | ||
36 | void* codec_malloc(size_t size); | 35 | void* codec_malloc(size_t size); |
37 | void* codec_calloc(size_t nmemb, size_t size); | 36 | void* codec_calloc(size_t nmemb, size_t size); |
38 | void* codec_alloca(size_t size); | ||
39 | void* codec_realloc(void* ptr, size_t size); | 37 | void* codec_realloc(void* ptr, size_t size); |
40 | void codec_free(void* ptr); | 38 | void codec_free(void* ptr); |
41 | 39 | ||
40 | #if !defined(SIMULATOR) | ||
41 | #define alloca __builtin_alloca | ||
42 | #else | ||
43 | #define alloca(x) codec_alloca(x) | ||
44 | void* codec_alloca(size_t size); | ||
45 | #endif | ||
46 | |||
42 | #define abs(x) ((x)>0?(x):-(x)) | 47 | #define abs(x) ((x)>0?(x):-(x)) |
43 | #define labs(x) abs(x) | 48 | #define labs(x) abs(x) |
44 | 49 | ||
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 3fc03bd122..d6bbfd3888 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h | |||
@@ -28,9 +28,13 @@ extern unsigned char* mallocbuf; /* 512K from the start of MP3 buffer */ | |||
28 | 28 | ||
29 | void* codec_malloc(size_t size); | 29 | void* codec_malloc(size_t size); |
30 | void* codec_calloc(size_t nmemb, size_t size); | 30 | void* codec_calloc(size_t nmemb, size_t size); |
31 | void* codec_alloca(size_t size); | ||
32 | void* codec_realloc(void* ptr, size_t size); | 31 | void* codec_realloc(void* ptr, size_t size); |
33 | void codec_free(void* ptr); | 32 | void codec_free(void* ptr); |
33 | |||
34 | #if defined(SIMULATOR) | ||
35 | void* codec_alloca(size_t size); | ||
36 | #endif | ||
37 | |||
34 | void *memcpy(void *dest, const void *src, size_t n); | 38 | void *memcpy(void *dest, const void *src, size_t n); |
35 | void *memset(void *s, int c, size_t n); | 39 | void *memset(void *s, int c, size_t n); |
36 | int memcmp(const void *s1, const void *s2, size_t n); | 40 | int memcmp(const void *s1, const void *s2, size_t n); |
diff --git a/apps/codecs/lib/xxx2wav.c b/apps/codecs/lib/xxx2wav.c index cd09d32450..776b29acfd 100644 --- a/apps/codecs/lib/xxx2wav.c +++ b/apps/codecs/lib/xxx2wav.c | |||
@@ -56,12 +56,14 @@ void* codec_calloc(size_t nmemb, size_t size) | |||
56 | return(x); | 56 | return(x); |
57 | } | 57 | } |
58 | 58 | ||
59 | #if defined(SIMULATOR) | ||
59 | void* codec_alloca(size_t size) | 60 | void* codec_alloca(size_t size) |
60 | { | 61 | { |
61 | void* x; | 62 | void* x; |
62 | x = codec_malloc(size); | 63 | x = codec_malloc(size); |
63 | return(x); | 64 | return(x); |
64 | } | 65 | } |
66 | #endif | ||
65 | 67 | ||
66 | void codec_free(void* ptr) { | 68 | void codec_free(void* ptr) { |
67 | (void)ptr; | 69 | (void)ptr; |
diff --git a/apps/codecs/lib/xxx2wav.h b/apps/codecs/lib/xxx2wav.h index 2c9a73729c..e1e76078f2 100644 --- a/apps/codecs/lib/xxx2wav.h +++ b/apps/codecs/lib/xxx2wav.h | |||
@@ -46,9 +46,13 @@ extern unsigned char* filebuf; // The rest of the MP3 buffer | |||
46 | 46 | ||
47 | void* codec_malloc(size_t size); | 47 | void* codec_malloc(size_t size); |
48 | void* codec_calloc(size_t nmemb, size_t size); | 48 | void* codec_calloc(size_t nmemb, size_t size); |
49 | void* codec_alloca(size_t size); | ||
50 | void* codec_realloc(void* ptr, size_t size); | 49 | void* codec_realloc(void* ptr, size_t size); |
51 | void codec_free(void* ptr); | 50 | void codec_free(void* ptr); |
51 | |||
52 | #if defined(SIMULATOR) | ||
53 | void* codec_alloca(size_t size); | ||
54 | #endif | ||
55 | |||
52 | size_t strlen(const char *s); | 56 | size_t strlen(const char *s); |
53 | char *strcpy(char *dest, const char *src); | 57 | char *strcpy(char *dest, const char *src); |
54 | char *strcat(char *dest, const char *src); | 58 | char *strcat(char *dest, const char *src); |