summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2005-10-27 11:39:01 +0000
committerThom Johansen <thomj@rockbox.org>2005-10-27 11:39:01 +0000
commit292e4e90d7e272f3bf6f5f8912c25114a7157aea (patch)
tree451ad19e9b27542b12afe1b4cf7a98c8439acf41
parente6021381efa735fb583e0a1a8afd7957f70eff79 (diff)
downloadrockbox-292e4e90d7e272f3bf6f5f8912c25114a7157aea.tar.gz
rockbox-292e4e90d7e272f3bf6f5f8912c25114a7157aea.tar.bz2
rockbox-292e4e90d7e272f3bf6f5f8912c25114a7157aea.zip
Introduced usage of IBSS_ATTR and ICONST_ATTR in codec libraries.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7660 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/Tremor/bitwise.c2
-rw-r--r--apps/codecs/Tremor/mdct.c2
-rw-r--r--apps/codecs/Tremor/mdct_lookup.h4
-rw-r--r--apps/codecs/Tremor/synthesis.c4
-rw-r--r--apps/codecs/Tremor/window_lookup.h4
-rw-r--r--apps/codecs/libalac/alac.c10
-rw-r--r--apps/codecs/libmad/layer12.c4
-rw-r--r--apps/codecs/libmad/layer3.c6
-rw-r--r--apps/codecs/libmad/synth.c2
-rw-r--r--apps/codecs/libmusepack/synth_filter.c4
-rw-r--r--apps/codecs/libwavpack/wputils.c2
11 files changed, 22 insertions, 22 deletions
diff --git a/apps/codecs/Tremor/bitwise.c b/apps/codecs/Tremor/bitwise.c
index ac2e6e6d76..d0f2c8c255 100644
--- a/apps/codecs/Tremor/bitwise.c
+++ b/apps/codecs/Tremor/bitwise.c
@@ -22,7 +22,7 @@
#include <string.h>
#include "ogg.h"
-static const unsigned long mask[] IDATA_ATTR =
+static const unsigned long mask[] ICONST_ATTR =
{0x00000000,0x00000001,0x00000003,0x00000007,0x0000000f,
0x0000001f,0x0000003f,0x0000007f,0x000000ff,0x000001ff,
0x000003ff,0x000007ff,0x00000fff,0x00001fff,0x00003fff,
diff --git a/apps/codecs/Tremor/mdct.c b/apps/codecs/Tremor/mdct.c
index f16a536dc7..f040eea3da 100644
--- a/apps/codecs/Tremor/mdct.c
+++ b/apps/codecs/Tremor/mdct.c
@@ -239,7 +239,7 @@ STIN void mdct_butterflies(DATA_TYPE *x,int points,int shift) {
}
-static const unsigned char bitrev[16] IDATA_ATTR =
+static const unsigned char bitrev[16] ICONST_ATTR =
{0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15};
STIN int bitrev12(int x){
diff --git a/apps/codecs/Tremor/mdct_lookup.h b/apps/codecs/Tremor/mdct_lookup.h
index 3913a8b976..704829008a 100644
--- a/apps/codecs/Tremor/mdct_lookup.h
+++ b/apps/codecs/Tremor/mdct_lookup.h
@@ -21,7 +21,7 @@
unfortunately, we don't have the space for both tables */
/* {sin(2*i*PI/4096), cos(2*i*PI/4096)}, with i = 0 to 512 */
-static LOOKUP_T sincos_lookup0[1026] IDATA_ATTR = {
+static LOOKUP_T sincos_lookup0[1026] ICONST_ATTR = {
X(0x00000000), X(0x7fffffff), X(0x003243f5), X(0x7ffff621),
X(0x006487e3), X(0x7fffd886), X(0x0096cbc1), X(0x7fffa72c),
X(0x00c90f88), X(0x7fff6216), X(0x00fb5330), X(0x7fff0943),
@@ -282,7 +282,7 @@ static LOOKUP_T sincos_lookup0[1026] IDATA_ATTR = {
};
/* {sin((2*i+1)*PI/4096), cos((2*i+1)*PI/4096)}, with i = 0 to 511 */
-static LOOKUP_T sincos_lookup1[1024] IDATA_ATTR = {
+static LOOKUP_T sincos_lookup1[1024] ICONST_ATTR = {
X(0x001921fb), X(0x7ffffd88), X(0x004b65ee), X(0x7fffe9cb),
X(0x007da9d4), X(0x7fffc251), X(0x00afeda8), X(0x7fff8719),
X(0x00e23160), X(0x7fff3824), X(0x011474f6), X(0x7ffed572),
diff --git a/apps/codecs/Tremor/synthesis.c b/apps/codecs/Tremor/synthesis.c
index d01a7aaa64..081ac9adcd 100644
--- a/apps/codecs/Tremor/synthesis.c
+++ b/apps/codecs/Tremor/synthesis.c
@@ -32,8 +32,8 @@
#define IRAM_PCM_END 2048
#define CHANNELS 2
-static ogg_int32_t *ipcm_vect[CHANNELS] IDATA_ATTR;
-static ogg_int32_t ipcm_buff[CHANNELS*IRAM_PCM_END] IDATA_ATTR LINE_ATTR;
+static ogg_int32_t *ipcm_vect[CHANNELS] IBSS_ATTR;
+static ogg_int32_t ipcm_buff[CHANNELS*IRAM_PCM_END] IBSS_ATTR LINE_ATTR;
int vorbis_synthesis(vorbis_block *vb,ogg_packet *op,int decodep){
vorbis_dsp_state *vd=vb->vd;
diff --git a/apps/codecs/Tremor/window_lookup.h b/apps/codecs/Tremor/window_lookup.h
index 37a8bccb2b..9fbb98fb75 100644
--- a/apps/codecs/Tremor/window_lookup.h
+++ b/apps/codecs/Tremor/window_lookup.h
@@ -51,7 +51,7 @@ static LOOKUP_T vwin128[64] = {
X(0x7ffdcf39), X(0x7fff6dac), X(0x7fffed01), X(0x7fffffc4),
};
-static LOOKUP_T vwin256[128] IDATA_ATTR = {
+static LOOKUP_T vwin256[128] ICONST_ATTR = {
X(0x0001f018), X(0x00117066), X(0x00306e9e), X(0x005ee5f1),
X(0x009ccf26), X(0x00ea208b), X(0x0146cdea), X(0x01b2c87f),
X(0x022dfedf), X(0x02b85ced), X(0x0351cbbd), X(0x03fa317f),
@@ -284,7 +284,7 @@ static LOOKUP_T vwin1024[512] = {
X(0x7fffffdd), X(0x7ffffff7), X(0x7fffffff), X(0x7fffffff),
};
-static LOOKUP_T vwin2048[1024] IDATA_ATTR = {
+static LOOKUP_T vwin2048[1024] ICONST_ATTR = {
X(0x000007c0), X(0x000045c4), X(0x0000c1ca), X(0x00017bd3),
X(0x000273de), X(0x0003a9eb), X(0x00051df9), X(0x0006d007),
X(0x0008c014), X(0x000aee1e), X(0x000d5a25), X(0x00100428),
diff --git a/apps/codecs/libalac/alac.c b/apps/codecs/libalac/alac.c
index bdfb714a57..f3bfada5b7 100644
--- a/apps/codecs/libalac/alac.c
+++ b/apps/codecs/libalac/alac.c
@@ -48,13 +48,13 @@
v = (((v) & 0x00FF) << 0x08) | \
(((v) & 0xFF00) >> 0x08); } while (0)
-int16_t predictor_coef_table[32] IDATA_ATTR;
-int16_t predictor_coef_table_a[32] IDATA_ATTR;
-int16_t predictor_coef_table_b[32] IDATA_ATTR;
+int16_t predictor_coef_table[32] IBSS_ATTR;
+int16_t predictor_coef_table_a[32] IBSS_ATTR;
+int16_t predictor_coef_table_b[32] IBSS_ATTR;
int32_t predicterror_buffer_a[4096];
int32_t predicterror_buffer_b[4096];
-int32_t outputsamples_buffer_a[4096] IDATA_ATTR;
-int32_t outputsamples_buffer_b[4096] IDATA_ATTR;
+int32_t outputsamples_buffer_a[4096] IBSS_ATTR;
+int32_t outputsamples_buffer_b[4096] IBSS_ATTR;
void alac_set_info(alac_file *alac, char *inputbuffer)
{
diff --git a/apps/codecs/libmad/layer12.c b/apps/codecs/libmad/layer12.c
index b16e197e6c..fb71fb059d 100644
--- a/apps/codecs/libmad/layer12.c
+++ b/apps/codecs/libmad/layer12.c
@@ -42,7 +42,7 @@
* used in both Layer I and Layer II decoding
*/
static
-mad_fixed_t const sf_table[64] IDATA_ATTR = {
+mad_fixed_t const sf_table[64] ICONST_ATTR = {
# include "sf_table.dat"
};
@@ -269,7 +269,7 @@ struct quantclass {
unsigned char bits;
mad_fixed_t C;
mad_fixed_t D;
-} const qc_table[17] IDATA_ATTR = {
+} const qc_table[17] ICONST_ATTR = {
# include "qc_table.dat"
};
diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c
index ac804f303d..539526a93c 100644
--- a/apps/codecs/libmad/layer3.c
+++ b/apps/codecs/libmad/layer3.c
@@ -384,7 +384,7 @@ mad_fixed_t const ca[8] = {
* imdct_s[i/even][k] = cos((PI / 24) * (2 * (i / 2) + 7) * (2 * k + 1))
* imdct_s[i /odd][k] = cos((PI / 24) * (2 * (6 + (i-1)/2) + 7) * (2 * k + 1))
*/
-mad_fixed_t const imdct_s[6][6] IDATA_ATTR = {
+mad_fixed_t const imdct_s[6][6] ICONST_ATTR = {
# include "imdct_s.dat"
};
@@ -396,7 +396,7 @@ mad_fixed_t const imdct_s[6][6] IDATA_ATTR = {
* window_l[i] = sin((PI / 36) * (i + 1/2))
*/
static
-mad_fixed_t const window_l[36] IDATA_ATTR = {
+mad_fixed_t const window_l[36] ICONST_ATTR = {
MAD_F(0x00b2aa3e) /* 0.043619387 */, MAD_F(0x0216a2a2) /* 0.130526192 */,
MAD_F(0x03768962) /* 0.216439614 */, MAD_F(0x04cfb0e2) /* 0.300705800 */,
MAD_F(0x061f78aa) /* 0.382683432 */, MAD_F(0x07635284) /* 0.461748613 */,
@@ -426,7 +426,7 @@ mad_fixed_t const window_l[36] IDATA_ATTR = {
*
* window_s[i] = sin((PI / 12) * (i + 1/2))
*/
-mad_fixed_t const window_s[12] IDATA_ATTR = {
+mad_fixed_t const window_s[12] ICONST_ATTR = {
MAD_F(0x0216a2a2) /* 0.130526192 */, MAD_F(0x061f78aa) /* 0.382683432 */,
MAD_F(0x09bd7ca0) /* 0.608761429 */, MAD_F(0x0cb19346) /* 0.793353340 */,
MAD_F(0x0ec835e8) /* 0.923879533 */, MAD_F(0x0fdcf549) /* 0.991444861 */,
diff --git a/apps/codecs/libmad/synth.c b/apps/codecs/libmad/synth.c
index 1b13312caf..e6955d6af9 100644
--- a/apps/codecs/libmad/synth.c
+++ b/apps/codecs/libmad/synth.c
@@ -561,7 +561,7 @@ void dct32(mad_fixed_t const in[32], unsigned int slot,
# endif
static
-mad_fixed_t const D[17][32] IDATA_ATTR = {
+mad_fixed_t const D[17][32] ICONST_ATTR = {
# include "D.dat"
};
diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c
index 51ffcce921..596751526b 100644
--- a/apps/codecs/libmusepack/synth_filter.c
+++ b/apps/codecs/libmusepack/synth_filter.c
@@ -54,7 +54,7 @@ typedef mpc_int32_t ptrdiff_t;
#endif
-static const MPC_SAMPLE_FORMAT Di_opt [32] [16] IDATA_ATTR = {
+static const MPC_SAMPLE_FORMAT Di_opt [32] [16] ICONST_ATTR = {
{ _( 0), _( -29), _( 213), _( -459), _( 2037), _(-5153), _( 6574), _(-37489), _(75038), _(37489), _(6574), _( 5153), _(2037), _( 459), _(213), _(29) },
{ _( -1), _( -31), _( 218), _( -519), _( 2000), _(-5517), _( 5959), _(-39336), _(74992), _(35640), _(7134), _( 4788), _(2063), _( 401), _(208), _(26) },
{ _( -1), _( -35), _( 222), _( -581), _( 1952), _(-5879), _( 5288), _(-41176), _(74856), _(33791), _(7640), _( 4425), _(2080), _( 347), _(202), _(24) },
@@ -347,7 +347,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL
for ( k = 0; k < 32; k++, D += 16, V++ ) {
- #if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+ #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) && 1
asm volatile (
"movem.l (%[D]), %%d0-%%d3\n\t"
"move.l (%[V]), %%a5\n\t"
diff --git a/apps/codecs/libwavpack/wputils.c b/apps/codecs/libwavpack/wputils.c
index 479c18028f..549cd8a4fa 100644
--- a/apps/codecs/libwavpack/wputils.c
+++ b/apps/codecs/libwavpack/wputils.c
@@ -45,7 +45,7 @@ static ulong read_next_header (read_stream infile, WavpackHeader *wphdr);
// large integer or floating point files (but always provides at least 24 bits
// of resolution).
-static WavpackContext wpc IDATA_ATTR;
+static WavpackContext wpc IBSS_ATTR;
WavpackContext *WavpackOpenFileInput (read_stream infile, char *error)
{