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

GBA: Cap audio FIFO read size during deserialization

This commit is contained in:
Jeffrey Pfau 2015-06-01 00:33:16 -07:00
parent 1157ab06d2
commit ab6eac53ee
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -33,6 +33,7 @@ Bugfixes:
- ARM7: Fix Thumb MUL timing
- Qt: Cap the maximum number of multiplayer windows
- Qt: Fix maximum year in sensor override
- GBA: Cap audio FIFO read size during deserialization
Misc:
- Qt: Handle saving input settings better
- Debugger: Free watchpoints in addition to breakpoints

8
src/gba/audio.c
View File

@ -904,8 +904,12 @@ void GBAAudioDeserialize(struct GBAAudio* audio, const struct GBASerializedState
CircleBufferClear(&audio->chA.fifo);
CircleBufferClear(&audio->chB.fifo);
int i;
for (i = 0; i < state->audio.fifoSize; ++i) {
size_t fifoSize = state->audio.fifoSize;
if (state->audio.fifoSize > CircleBufferCapacity(&audio->chA.fifo)) {
fifoSize = CircleBufferCapacity(&audio->chA.fifo);
}
size_t i;
for (i = 0; i < fifoSize; ++i) {
CircleBufferWrite8(&audio->chA.fifo, state->audio.fifoA[i]);
CircleBufferWrite8(&audio->chB.fifo, state->audio.fifoB[i]);
}

2
src/gba/serialize.h
View File

@ -231,7 +231,7 @@ struct GBASerializedState {
int32_t nextEvent;
int32_t eventDiff;
int32_t nextSample;
int32_t fifoSize;
uint32_t fifoSize;
unsigned ch1Volume : 4;
unsigned ch1Dead : 1;
unsigned ch1Hi : 1;