otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

OPN: fix out of bounds when using some FM effects

Browse source 
on non-FM channels
issue #2286
This commit is contained in:
tildearrow 2024-12-09 01:57:30 -05:00
parent 5eae178dcb
commit 52a4588ad9
4 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/engine/platform/ym2203.cpp
View file

@ -938,6 +938,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RS: { case DIV_CMD_FM_RS: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -954,6 +955,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_AM: { case DIV_CMD_FM_AM: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -970,6 +972,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DR: { case DIV_CMD_FM_DR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -986,6 +989,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SL: { case DIV_CMD_FM_SL: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1002,6 +1006,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RR: { case DIV_CMD_FM_RR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1018,6 +1023,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_D2R: { case DIV_CMD_FM_D2R: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1034,6 +1040,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DT: { case DIV_CMD_FM_DT: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1050,6 +1057,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SSG: { case DIV_CMD_FM_SSG: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1086,6 +1094,7 @@ int DivPlatformYM2203::dispatch(DivCommand c) {
} }
break; break;
case DIV_CMD_FM_HARD_RESET: case DIV_CMD_FM_HARD_RESET:
if (c.chan>=psgChanOffs) break;
chan[c.chan].hardReset=c.value; chan[c.chan].hardReset=c.value;
break; break;
case DIV_CMD_MACRO_OFF: case DIV_CMD_MACRO_OFF:

9
src/engine/platform/ym2608.cpp
View file

@ -1460,6 +1460,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RS: { case DIV_CMD_FM_RS: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1476,6 +1477,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_AM: { case DIV_CMD_FM_AM: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1492,6 +1494,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DR: { case DIV_CMD_FM_DR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1508,6 +1511,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SL: { case DIV_CMD_FM_SL: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1524,6 +1528,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RR: { case DIV_CMD_FM_RR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1540,6 +1545,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_D2R: { case DIV_CMD_FM_D2R: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1556,6 +1562,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DT: { case DIV_CMD_FM_DT: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1572,6 +1579,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SSG: { case DIV_CMD_FM_SSG: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1608,6 +1616,7 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
} }
break; break;
case DIV_CMD_FM_HARD_RESET: case DIV_CMD_FM_HARD_RESET:
if (c.chan>=psgChanOffs) break;
chan[c.chan].hardReset=c.value; chan[c.chan].hardReset=c.value;
break; break;
case DIV_CMD_MACRO_OFF: case DIV_CMD_MACRO_OFF:

9
src/engine/platform/ym2610.cpp
View file

@ -1427,6 +1427,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RS: { case DIV_CMD_FM_RS: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1443,6 +1444,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_AM: { case DIV_CMD_FM_AM: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1459,6 +1461,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DR: { case DIV_CMD_FM_DR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1475,6 +1478,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SL: { case DIV_CMD_FM_SL: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1491,6 +1495,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RR: { case DIV_CMD_FM_RR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1507,6 +1512,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_D2R: { case DIV_CMD_FM_D2R: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1523,6 +1529,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DT: { case DIV_CMD_FM_DT: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1539,6 +1546,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SSG: { case DIV_CMD_FM_SSG: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1575,6 +1583,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
} }
break; break;
case DIV_CMD_FM_HARD_RESET: case DIV_CMD_FM_HARD_RESET:
if (c.chan>=psgChanOffs) break;
chan[c.chan].hardReset=c.value; chan[c.chan].hardReset=c.value;
break; break;
case DIV_CMD_MACRO_OFF: case DIV_CMD_MACRO_OFF:

9
src/engine/platform/ym2610b.cpp
View file

@ -1495,6 +1495,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RS: { case DIV_CMD_FM_RS: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1511,6 +1512,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_AM: { case DIV_CMD_FM_AM: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1527,6 +1529,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DR: { case DIV_CMD_FM_DR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1543,6 +1546,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SL: { case DIV_CMD_FM_SL: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1559,6 +1563,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_RR: { case DIV_CMD_FM_RR: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1575,6 +1580,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_D2R: { case DIV_CMD_FM_D2R: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1591,6 +1597,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_DT: { case DIV_CMD_FM_DT: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1607,6 +1614,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_FM_SSG: { case DIV_CMD_FM_SSG: {
if (c.chan>=psgChanOffs) break;
if (c.value<0) { if (c.value<0) {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
DivInstrumentFM::Operator& op=chan[c.chan].state.op[i]; DivInstrumentFM::Operator& op=chan[c.chan].state.op[i];
@ -1643,6 +1651,7 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
} }
break; break;
case DIV_CMD_FM_HARD_RESET: case DIV_CMD_FM_HARD_RESET:
if (c.chan>=psgChanOffs) break;
chan[c.chan].hardReset=c.value; chan[c.chan].hardReset=c.value;
break; break;
case DIV_CMD_MACRO_OFF: case DIV_CMD_MACRO_OFF: