Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Correct OS X compiler warnings [Scott Michel]

Browse Source
This commit is contained in:
R. Belmont 2010-02-14 17:46:59 +00:00
parent f31c069a53
commit 30d328738d
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emu/cpu/drcbex86.c
View File

@ -1553,7 +1553,7 @@ static void emit_or_r32_p32(drcbe_state *drcbe, x86code **dst, UINT8 reg, const
if (inst->flags == 0 && (UINT32)param->value == 0)
/* skip */;
else if (inst->flags == 0 && (UINT32)param->value == 0xffffffff)
emit_mov_r32_imm(dst, reg, -1); // mov reg,-1
emit_mov_r32_imm(dst, reg, ~0); // mov reg,-1
else
emit_or_r32_imm(dst, reg, param->value); // or reg,param
}
@ -1576,7 +1576,7 @@ static void emit_or_m32_p32(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAMS
if (inst->flags == 0 && (UINT32)param->value == 0)
/* skip */;
else if (inst->flags == 0 && (UINT32)param->value == 0xffffffff)
emit_mov_m32_imm(dst, MEMPARAMS, -1); // mov [dest],-1
emit_mov_m32_imm(dst, MEMPARAMS, ~0); // mov [dest],-1
else
emit_or_m32_imm(dst, MEMPARAMS, param->value); // or [dest],param
}
@ -2501,14 +2501,14 @@ static void emit_or_r64_p64(drcbe_state *drcbe, x86code **dst, UINT8 reglo, UINT
if (inst->flags == 0 && (UINT32)param->value == 0)
/* skip */;
else if (inst->flags == 0 && (UINT32)param->value == 0xffffffff)
emit_mov_r32_imm(dst, reglo, -1); // mov reglo,-1
emit_mov_r32_imm(dst, reglo, ~0); // mov reglo,-1
else
emit_or_r32_imm(dst, reglo, param->value); // or reglo,param
if (saveflags) emit_pushf(dst); // pushf
if (inst->flags == 0 && (UINT32)(param->value >> 32) == 0)
/* skip */;
else if (inst->flags == 0 && (UINT32)(param->value >> 32) == 0xffffffff)
emit_mov_r32_imm(dst, reghi, -1); // mov reghi,-1
emit_mov_r32_imm(dst, reghi, ~0); // mov reghi,-1
else
emit_or_r32_imm(dst, reghi, param->value >> 32); // or reghi,param >> 32
}
@ -2536,14 +2536,14 @@ static void emit_or_m64_p64(drcbe_state *drcbe, x86code **dst, DECLARE_MEMPARAMS
if (inst->flags == 0 && (UINT32)param->value == 0)
/* skip */;
else if (inst->flags == 0 && (UINT32)param->value == 0xffffffff)
emit_mov_m32_imm(dst, MEMPARAMS, -1); // mov [dest],-1
emit_mov_m32_imm(dst, MEMPARAMS, ~0); // mov [dest],-1
else
emit_or_m32_imm(dst, MEMPARAMS, param->value); // or [dest],param
if (saveflags) emit_pushf(dst); // pushf
if (inst->flags == 0 && (UINT32)(param->value >> 32) == 0)
/* skip */;
else if (inst->flags == 0 && (UINT32)(param->value >> 32) == 0xffffffff)
emit_mov_m32_imm(dst, MEMPARAMS + 4, -1); // mov [dest+4],-1
emit_mov_m32_imm(dst, MEMPARAMS + 4, ~0); // mov [dest+4],-1
else
emit_or_m32_imm(dst, MEMPARAMS + 4, param->value >> 32); // or [dest+4],param >> 32
}

15
src/emu/sound/sidenvel.c
View File

@ -543,18 +543,15 @@ INLINE UINT16 enveEmuShortAttack(sidOperator* pVoice)
#endif
/* return enveEmuStartRelease(pVoice); */
return enveEmuStartDecay(pVoice);
else
{
#if defined(DIRECT_FIXPOINT) && !defined(SID_FPUENVE)
pVoice->enveVol = pVoice->enveStep.w[HI];
pVoice->enveVol = pVoice->enveStep.w[HI];
#else
pVoice->enveVol = pVoice->enveStep;
pVoice->enveVol = pVoice->enveStep;
#endif
pVoice->enveShortAttackCount--;
/* cout << hex << pVoice->enveShortAttackCount << " / " << pVoice->enveVol << endl; */
enveEmuEnveAdvance(pVoice);
return masterAmplModTable[ pVoice->sid->masterVolumeAmplIndex + pVoice->enveVol ];
}
pVoice->enveShortAttackCount--;
/* cout << hex << pVoice->enveShortAttackCount << " / " << pVoice->enveVol << endl; */
enveEmuEnveAdvance(pVoice);
return masterAmplModTable[ pVoice->sid->masterVolumeAmplIndex + pVoice->enveVol ];
}
INLINE UINT16 enveEmuAlterShortAttack(sidOperator* pVoice)