From 1ca965b474783df60c9158953fca1b5aebf461d9 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Fri, 17 Apr 2020 00:38:14 +0200 Subject: [PATCH] (WIP) updates for c++17 - opened for discussion (#249) * updates for c++17 * picked upstream fix on Earle's advice https://github.com/schellingb/TinySoundFont/blob/21c07c0bcd702e7adf3db349ac926914b98d17ce/tsf.h#L829-L839 (simplified PR) * remove `register` --- src/libflac/bitreader.c | 26 +++++++++++++------------- src/libmad/bit.c | 11 +++++++---- src/libmad/huffman.c | 38 +++++++++++++++++++------------------- src/libmad/layer3.c | 3 +++ 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/libflac/bitreader.c b/src/libflac/bitreader.c index 8eb7281..a64c1ce 100644 --- a/src/libflac/bitreader.c +++ b/src/libflac/bitreader.c @@ -123,23 +123,23 @@ struct FLAC__BitReader { static inline void crc16_update_word_(FLAC__BitReader *br, brword word) { - register uint32_t crc = br->read_crc16; + unsigned crc = br->read_crc16; #if FLAC__BYTES_PER_WORD == 4 switch(br->crc16_align) { - case 0: crc = FLAC__CRC16_UPDATE((uint32_t)(word >> 24), crc); - case 8: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 16) & 0xff), crc); - case 16: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 8) & 0xff), crc); + case 0: crc = FLAC__CRC16_UPDATE((uint32_t)(word >> 24), crc); /* Falls Through. */ + case 8: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 16) & 0xff), crc); /* Falls Through. */ + case 16: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 8) & 0xff), crc); /* Falls Through. */ case 24: br->read_crc16 = FLAC__CRC16_UPDATE((uint32_t)(word & 0xff), crc); } #elif FLAC__BYTES_PER_WORD == 8 switch(br->crc16_align) { - case 0: crc = FLAC__CRC16_UPDATE((uint32_t)(word >> 56), crc); - case 8: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 48) & 0xff), crc); - case 16: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 40) & 0xff), crc); - case 24: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 32) & 0xff), crc); - case 32: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 24) & 0xff), crc); - case 40: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 16) & 0xff), crc); - case 48: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 8) & 0xff), crc); + case 0: crc = FLAC__CRC16_UPDATE((uint32_t)(word >> 56), crc); /* Falls Through. */ + case 8: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 48) & 0xff), crc); /* Falls Through. */ + case 16: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 40) & 0xff), crc); /* Falls Through. */ + case 24: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 32) & 0xff), crc); /* Falls Through. */ + case 32: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 24) & 0xff), crc); /* Falls Through. */ + case 40: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 16) & 0xff), crc); /* Falls Through. */ + case 48: crc = FLAC__CRC16_UPDATE((uint32_t)((word >> 8) & 0xff), crc); /* Falls Through. */ case 56: br->read_crc16 = FLAC__CRC16_UPDATE((uint32_t)(word & 0xff), crc); } #else @@ -233,7 +233,7 @@ static FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br) FLAC__BitReader *FLAC__bitreader_new(void) { - FLAC__BitReader *br = calloc(1, sizeof(FLAC__BitReader)); + FLAC__BitReader *br = (FLAC__BitReader*)calloc(1, sizeof(FLAC__BitReader)); /* calloc() implies: memset(br, 0, sizeof(FLAC__BitReader)); @@ -268,7 +268,7 @@ FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__BitReaderReadCallback br->words = br->bytes = 0; br->consumed_words = br->consumed_bits = 0; br->capacity = FLAC__BITREADER_DEFAULT_CAPACITY; - br->buffer = malloc(sizeof(brword) * br->capacity); + br->buffer = (brword*)malloc(sizeof(brword) * br->capacity); if(br->buffer == 0) return false; br->read_callback = rcb; diff --git a/src/libmad/bit.c b/src/libmad/bit.c index 016fa05..a39076e 100644 --- a/src/libmad/bit.c +++ b/src/libmad/bit.c @@ -140,7 +140,7 @@ stack(__FUNCTION__, __FILE__, __LINE__); */ unsigned long mad_bit_read(struct mad_bitptr *bitptr, unsigned int len) { - register unsigned long value; + unsigned long value; if (bitptr->left == CHAR_BIT) bitptr->cache = *bitptr->byte; @@ -202,11 +202,11 @@ stack(__FUNCTION__, __FILE__, __LINE__); unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len, unsigned short init) { - register unsigned int crc; + unsigned int crc; stack(__FUNCTION__, __FILE__, __LINE__); for (crc = init; len >= 32; len -= 32) { - register unsigned long data; + unsigned long data; data = mad_bit_read(&bitptr, 32); @@ -219,18 +219,21 @@ stack(__FUNCTION__, __FILE__, __LINE__); switch (len / 8) { case 3: crc = (crc << 8) ^ crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; + /* Falls Through. */ case 2: crc = (crc << 8) ^ crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; + /* Falls Through. */ case 1: crc = (crc << 8) ^ crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; len %= 8; + /* Falls Through. */ case 0: break; } while (len--) { - register unsigned int msb; + unsigned int msb; msb = mad_bit_read(&bitptr, 1) ^ (crc >> 15); diff --git a/src/libmad/huffman.c b/src/libmad/huffman.c index 691e0bd..3387085 100644 --- a/src/libmad/huffman.c +++ b/src/libmad/huffman.c @@ -51,7 +51,7 @@ # endif static -const union huffquad const hufftabA[] PROGMEM = { +union huffquad const hufftabA[] PROGMEM = { /* 0000 */ PTR(16, 2), /* 0001 */ PTR(20, 2), /* 0010 */ PTR(24, 1), @@ -91,7 +91,7 @@ const union huffquad const hufftabA[] PROGMEM = { }; static -const union huffquad const hufftabB[] PROGMEM = { +union huffquad const hufftabB[] PROGMEM = { /* 0000 */ V(1, 1, 1, 1, 4), /* 0001 */ V(1, 1, 1, 0, 4), /* 0010 */ V(1, 1, 0, 1, 4), @@ -127,12 +127,12 @@ const union huffquad const hufftabB[] PROGMEM = { # endif static -const union huffpair const hufftab0[] PROGMEM = { +union huffpair const hufftab0[] PROGMEM = { /* */ V(0, 0, 0) }; static -const union huffpair const hufftab1[] PROGMEM = { +union huffpair const hufftab1[] PROGMEM = { /* 000 */ V(1, 1, 3), /* 001 */ V(0, 1, 3), /* 010 */ V(1, 0, 2), @@ -144,7 +144,7 @@ const union huffpair const hufftab1[] PROGMEM = { }; static -const union huffpair const hufftab2[] PROGMEM = { +union huffpair const hufftab2[] PROGMEM = { /* 000 */ PTR(8, 3), /* 001 */ V(1, 1, 3), /* 010 */ V(0, 1, 3), @@ -166,7 +166,7 @@ const union huffpair const hufftab2[] PROGMEM = { }; static -const union huffpair const hufftab3[] PROGMEM = { +union huffpair const hufftab3[] PROGMEM = { /* 000 */ PTR(8, 3), /* 001 */ V(1, 0, 3), /* 010 */ V(1, 1, 2), @@ -188,7 +188,7 @@ const union huffpair const hufftab3[] PROGMEM = { }; static -const union huffpair const hufftab5[] PROGMEM = { +union huffpair const hufftab5[] PROGMEM = { /* 000 */ PTR(8, 4), /* 001 */ V(1, 1, 3), /* 010 */ V(0, 1, 3), @@ -222,7 +222,7 @@ const union huffpair const hufftab5[] PROGMEM = { }; static -const union huffpair const hufftab6[] PROGMEM = { +union huffpair const hufftab6[] PROGMEM = { /* 0000 */ PTR(16, 3), /* 0001 */ PTR(24, 1), /* 0010 */ PTR(26, 1), @@ -260,7 +260,7 @@ const union huffpair const hufftab6[] PROGMEM = { }; static -const union huffpair const hufftab7[] PROGMEM = { +union huffpair const hufftab7[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 2), @@ -425,7 +425,7 @@ union huffpair const hufftab8[] PROGMEM = { }; # else static -const union huffpair const hufftab8[] PROGMEM = { +union huffpair const hufftab8[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ V(1, 2, 4), @@ -510,7 +510,7 @@ const union huffpair const hufftab8[] PROGMEM = { # endif static -const union huffpair const hufftab9[] PROGMEM = { +union huffpair const hufftab9[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 3), /* 0010 */ PTR(40, 2), @@ -582,7 +582,7 @@ const union huffpair const hufftab9[] PROGMEM = { }; static -const union huffpair const hufftab10[] PROGMEM = { +union huffpair const hufftab10[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 2), @@ -720,7 +720,7 @@ const union huffpair const hufftab10[] PROGMEM = { }; static -const union huffpair const hufftab11[] PROGMEM = { +union huffpair const hufftab11[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 4), @@ -856,7 +856,7 @@ const union huffpair const hufftab11[] PROGMEM = { }; static -const union huffpair const hufftab12[] PROGMEM = { +union huffpair const hufftab12[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 4), @@ -984,7 +984,7 @@ const union huffpair const hufftab12[] PROGMEM = { }; static -const union huffpair const hufftab13[] PROGMEM = { +union huffpair const hufftab13[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 4), @@ -1510,7 +1510,7 @@ const union huffpair const hufftab13[] PROGMEM = { }; static -const union huffpair const hufftab15[] PROGMEM = { +union huffpair const hufftab15[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 4), @@ -2018,7 +2018,7 @@ const union huffpair const hufftab15[] PROGMEM = { }; static -const union huffpair const hufftab16[] PROGMEM = { +union huffpair const hufftab16[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 4), @@ -2552,7 +2552,7 @@ const union huffpair const hufftab16[] PROGMEM = { }; static -const union huffpair const hufftab24[] PROGMEM = { +union huffpair const hufftab24[] PROGMEM = { /* 0000 */ PTR(16, 4), /* 0001 */ PTR(32, 4), /* 0010 */ PTR(48, 4), @@ -3074,7 +3074,7 @@ const union huffpair const hufftab24[] PROGMEM = { union huffquad const *const mad_huff_quad_table[2] PROGMEM = { hufftabA, hufftabB }; -const struct hufftable const mad_huff_pair_table[32] PROGMEM = { +struct hufftable const mad_huff_pair_table[32] PROGMEM = { /* 0 */ { hufftab0, 0, 0 }, /* 1 */ { hufftab1, 0, 3 }, /* 2 */ { hufftab2, 0, 3 }, diff --git a/src/libmad/layer3.c b/src/libmad/layer3.c index 694ce2d..66ed7c2 100644 --- a/src/libmad/layer3.c +++ b/src/libmad/layer3.c @@ -929,8 +929,11 @@ mad_fixed_t III_requantize(unsigned int value, signed int exp) #pragma GCC diagnostic ignored "-Wstrict-aliasing" *(uint32_t*)&power = *(uint32_t*)&rq_table[value]; //memcpy_P(&power, &rq_table[value], sizeof(power)); // Avoid byte access to PROGMEM #pragma GCC diagnostic pop +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wuninitialized" requantized = power.mantissa; exp += power.exponent; +#pragma GCC diagnostic pop if (exp < 0) { if (-exp >= (int)(sizeof(mad_fixed_t) * CHAR_BIT)) {