kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Undid some minor madness.

CQTexperiment
Chris Moeller 2016-07-07 17:11:33 -07:00
parent 84e38a6213
commit 2b54fdbeae
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Frameworks/GME/vgmplay/chips/yam.c
View File

@ -2040,7 +2040,8 @@ static void readnextsample(
if(out < (-0x8000)) { out = (-0x8000); /* logf("<adpcmunderflow>"); */ } if(out < (-0x8000)) { out = (-0x8000); /* logf("<adpcmunderflow>"); */ }
chan->adpcmstep = (chan->adpcmstep * adpcmscale[s & 7]) >> 8; chan->adpcmstep = (chan->adpcmstep * adpcmscale[s & 7]) >> 8;
if(chan->adpcmstep > 0x6000) { chan->adpcmstep = 0x6000; } if(chan->adpcmstep > 0x6000) { chan->adpcmstep = 0x6000; }
if(chan->adpcmstep < 0x7F) { chan->adpcmstep = 0x7F; } if(chan->adpcmstep < 0x007F) { chan->adpcmstep = 0x007F; }
chan->adpcmprev = out;
s = out; s = out;
} }
break; break;

13
Frameworks/HighlyTheoretical/HighlyTheoretical/Core/yam.c
View File

@ -1246,7 +1246,9 @@ static void chan_aica_store_reg(struct YAM_STATE *state, uint8 ch, uint8 a, uint
// DSP registers // DSP registers
// //
static void coef_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) { static void coef_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
#ifdef ENABLE_DYNAREC
sint16 old = state->coef[n]; sint16 old = state->coef[n];
#endif
yam_flush(state); yam_flush(state);
n &= 0x7F; n &= 0x7F;
state->coef[n] <<= 3; state->coef[n] <<= 3;
@ -1259,7 +1261,9 @@ static void coef_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask)
} }
static void madrs_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) { static void madrs_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
#ifdef ENABLE_DYNAREC
uint16 old = state->madrs[n]; uint16 old = state->madrs[n];
#endif
yam_flush(state); yam_flush(state);
n &= 0x3F; n &= 0x3F;
state->madrs[n] &= ~mask; state->madrs[n] &= ~mask;
@ -2029,7 +2033,8 @@ static void readnextsample(
if(out < (-0x8000)) { out = (-0x8000); /* logf("<adpcmunderflow>"); */ } if(out < (-0x8000)) { out = (-0x8000); /* logf("<adpcmunderflow>"); */ }
chan->adpcmstep = (chan->adpcmstep * adpcmscale[s & 7]) >> 8; chan->adpcmstep = (chan->adpcmstep * adpcmscale[s & 7]) >> 8;
if(chan->adpcmstep > 0x6000) { chan->adpcmstep = 0x6000; } if(chan->adpcmstep > 0x6000) { chan->adpcmstep = 0x6000; }
if(chan->adpcmstep < 0x7F) { chan->adpcmstep = 0x7F; } if(chan->adpcmstep < 0x007F) { chan->adpcmstep = 0x007F; }
chan->adpcmprev = out;
s = out; s = out;
} }
break; break;
@ -2867,10 +2872,10 @@ static void render_effects(
dynacompile(state); dynacompile(state);
} }
samplefunc = (dsp_sample_t)(((uint8*)(state->dynacode)) + DYNACODE_SLOP_SIZE); samplefunc = (dsp_sample_t)(((uint8*)(state->dynacode)) + DYNACODE_SLOP_SIZE);
#else
if (0) {
#endif
} else { } else {
#else
{
#endif
samplefunc = dsp_sample_interpret; samplefunc = dsp_sample_interpret;
} }