Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 08:22:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Last round of GCC 4.6 fixes (no whatsnew)

Browse Source
This commit is contained in:
R. Belmont 2011-05-30 04:13:28 +00:00
parent 6f1a375e76
commit 52d71359e2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/sound/ymf271.c
View File

@ -524,7 +524,7 @@ static void update_pcm(YMF271Chip *chip, int slotnum, INT32 *mixp, int length)
int i;
int final_volume;
INT16 sample;
INT64 ch0_vol, ch1_vol, ch2_vol, ch3_vol;
INT64 ch0_vol, ch1_vol; //, ch2_vol, ch3_vol;
const UINT8 *rombase;
YMF271Slot *slot = &chip->slots[slotnum];
@ -561,8 +561,8 @@ static void update_pcm(YMF271Chip *chip, int slotnum, INT32 *mixp, int length)
ch0_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch0_level]) >> 16;
ch1_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch1_level]) >> 16;
ch2_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch2_level]) >> 16;
ch3_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch3_level]) >> 16;
// ch2_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch2_level]) >> 16;
// ch3_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch3_level]) >> 16;
if (ch0_vol > 65536) ch0_vol = 65536;
if (ch1_vol > 65536) ch1_vol = 65536;

4
src/lib/formats/wavfile.c
View File

@ -70,7 +70,7 @@ static casserr_t wavfile_process(cassette_image *cassette, struct CassetteOption
UINT16 format_type = 0;
UINT32 bytes_per_second = 0;
UINT16 block_align = 0;
// UINT16 block_align = 0;
int waveform_flags = 0;
/* read header */
@ -108,7 +108,7 @@ static casserr_t wavfile_process(cassette_image *cassette, struct CassetteOption
opts->channels = get_leuint16(&format_tag[2]);
opts->sample_frequency = get_leuint32(&format_tag[4]);
bytes_per_second = get_leuint32(&format_tag[8]);
block_align = get_leuint16(&format_tag[12]);
// block_align = get_leuint16(&format_tag[12]);
opts->bits_per_sample = get_leuint16(&format_tag[14]);
if (format_type != WAV_FORMAT_PCM)

16
src/lib/softfloat/softfloat.c
View File

@ -1866,7 +1866,7 @@ float32 float32_div( float32 a, float32 b )
float32 float32_rem( float32 a, float32 b )
{
flag aSign, bSign, zSign;
flag aSign, zSign;
int16 aExp, bExp, expDiff;
bits32 aSig, bSig;
bits32 q;
@ -1879,7 +1879,7 @@ float32 float32_rem( float32 a, float32 b )
aSign = extractFloat32Sign( a );
bSig = extractFloat32Frac( b );
bExp = extractFloat32Exp( b );
bSign = extractFloat32Sign( b );
// bSign = extractFloat32Sign( b );
if ( aExp == 0xFF ) {
if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
return propagateFloat32NaN( a, b );
@ -2803,7 +2803,7 @@ float64 float64_div( float64 a, float64 b )
float64 float64_rem( float64 a, float64 b )
{
flag aSign, bSign, zSign;
flag aSign, zSign;
int16 aExp, bExp, expDiff;
bits64 aSig, bSig;
bits64 q, alternateASig;
@ -2814,7 +2814,7 @@ float64 float64_rem( float64 a, float64 b )
aSign = extractFloat64Sign( a );
bSig = extractFloat64Frac( b );
bExp = extractFloat64Exp( b );
bSign = extractFloat64Sign( b );
// bSign = extractFloat64Sign( b );
if ( aExp == 0x7FF ) {
if ( aSig || ( ( bExp == 0x7FF ) && bSig ) ) {
return propagateFloat64NaN( a, b );
@ -3711,7 +3711,7 @@ floatx80 floatx80_div( floatx80 a, floatx80 b )
floatx80 floatx80_rem( floatx80 a, floatx80 b )
{
flag aSign, bSign, zSign;
flag aSign, zSign;
int32 aExp, bExp, expDiff;
bits64 aSig0, aSig1, bSig;
bits64 q, term0, term1, alternateASig0, alternateASig1;
@ -3722,7 +3722,7 @@ floatx80 floatx80_rem( floatx80 a, floatx80 b )
aSign = extractFloatx80Sign( a );
bSig = extractFloatx80Frac( b );
bExp = extractFloatx80Exp( b );
bSign = extractFloatx80Sign( b );
// bSign = extractFloatx80Sign( b );
if ( aExp == 0x7FFF ) {
if ( (bits64) ( aSig0<<1 )
|| ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
@ -4820,7 +4820,7 @@ float128 float128_div( float128 a, float128 b )
float128 float128_rem( float128 a, float128 b )
{
flag aSign, bSign, zSign;
flag aSign, zSign;
int32 aExp, bExp, expDiff;
bits64 aSig0, aSig1, bSig0, bSig1, q, term0, term1, term2;
bits64 allZero, alternateASig0, alternateASig1, sigMean1;
@ -4834,7 +4834,7 @@ float128 float128_rem( float128 a, float128 b )
bSig1 = extractFloat128Frac1( b );
bSig0 = extractFloat128Frac0( b );
bExp = extractFloat128Exp( b );
bSign = extractFloat128Sign( b );
// bSign = extractFloat128Sign( b );
if ( aExp == 0x7FFF ) {
if ( ( aSig0 | aSig1 )
|| ( ( bExp == 0x7FFF ) && ( bSig0 | bSig1 ) ) ) {