libretro/mgba
1
0
Fork 0
mirror of https://github.com/libretro/mgba.git synced 2025-03-03 21:17:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GBA: Ensure cycles never go negative

Browse Source
This commit is contained in:
Jeffrey Pfau 2015-08-11 01:16:57 -07:00
parent e36f3c8211
commit 6822b8cabe
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -71,6 +71,7 @@ Bugfixes:
- Qt: Fix passing command line options
- Qt: Fix crashes on Windows by using using QMetaObject to do cross-thread calls
- GBA Video: Fix timing on first scanline
- GBA: Ensure cycles never go negative
Misc:
- Qt: Handle saving input settings better
- Debugger: Free watchpoints in addition to breakpoints

5
src/gba/gba.c
View File

@ -184,6 +184,11 @@ static void GBAProcessEvents(struct ARMCore* cpu) {
int32_t cycles = cpu->nextEvent;
int32_t nextEvent = INT_MAX;
int32_t testEvent;
#ifndef NDEBUG
if (cycles < 0) {
GBALog(gba, GBA_LOG_FATAL, "Negative cycles passed: %i", cycles);
}
#endif
gba->bus = cpu->prefetch[1];
if (cpu->executionMode == MODE_THUMB) {

4
src/gba/serialize.c
View File

@ -87,6 +87,10 @@ bool GBADeserialize(struct GBA* gba, const struct GBASerializedState* state) {
GBALog(gba, GBA_LOG_WARN, "Savestate is corrupted: CPU cycles are negative");
error = true;
}
if (state->cpu.nextEvent < 0) {
GBALog(gba, GBA_LOG_WARN, "Savestate is corrupted: Next event is negative");
error = true;
}
if (state->video.eventDiff < 0) {
GBALog(gba, GBA_LOG_WARN, "Savestate is corrupted: video eventDiff is negative");
error = true;