ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DSPHLE Should fix Issue 3543 

Restricts 'ssbm' loop detection to PBs with valid loop pred_scale values.
Masked coef_idx in the adpcm code so it can't fault on invalid values.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6480 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
mylek4 2010-11-26 15:04:35 +00:00
parent e6658d5339
commit 5340b4cb95
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_ADPCM.h
View File

@ -31,7 +31,7 @@ inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16
} }
int scale = 1 << (adpcm.pred_scale & 0xF); int scale = 1 << (adpcm.pred_scale & 0xF);
int coef_idx = adpcm.pred_scale >> 4; int coef_idx = (adpcm.pred_scale >> 4) & 7;
s32 coef1 = adpcm.coefs[coef_idx * 2 + 0]; s32 coef1 = adpcm.coefs[coef_idx * 2 + 0];
s32 coef2 = adpcm.coefs[coef_idx * 2 + 1]; s32 coef2 = adpcm.coefs[coef_idx * 2 + 1];

6
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
View File

@ -140,12 +140,14 @@ inline void MixAddVoice(ParamBlockType &pb,
// identify these types of blocks. Updates did not write any looping values. // identify these types of blocks. Updates did not write any looping values.
if ( if (
(pb.adpcm_loop_info.pred_scale || pb.adpcm_loop_info.yn1 || pb.adpcm_loop_info.yn2) (pb.adpcm_loop_info.pred_scale || pb.adpcm_loop_info.yn1 || pb.adpcm_loop_info.yn2)
&& pb.mixer_control == 0 && pb.mixer_control == 0 && pb.adpcm_loop_info.pred_scale <= 0x7F
) )
{ {
pb.audio_addr.looping = 1; pb.audio_addr.looping = 1;
} }
// Top Spin 3 Wii // Top Spin 3 Wii
if (pb.audio_addr.sample_format > 25) if (pb.audio_addr.sample_format > 25)
pb.audio_addr.sample_format = 0; pb.audio_addr.sample_format = 0;