GBA: Add interrupt function for early exit

Author: endrift

include/mgba/internal/gba/gba.h

@@ -154,6 +154,8 @@ void GBAHalt(struct GBA* gba);
 void GBAStop(struct GBA* gba);
 void GBADebug(struct GBA* gba, uint16_t value);
 
+void GBAInterrupt(struct GBA* gba);
+
 #ifdef USE_ELF
 struct ELF;
 

src/gba/audio.c

@@ -424,9 +424,8 @@ static void _sample(struct mTiming* timing, void* user, uint32_t cyclesLate) {
 	}
 	if (!mCoreSyncProduceAudio(audio->p->sync, &audio->psg.buffer)) {
 		// Interrupted
-		audio->p->earlyExit = true;
+		GBAInterrupt(audio->p);
 	}
-
 	mTimingSchedule(timing, &audio->sampleEvent, SAMPLE_INTERVAL - cyclesLate);
 }
 

src/gba/core.c

@@ -1722,7 +1722,7 @@ static void _GBAVLPStartFrameCallback(void *context) {
 		GBAVideoProxyRendererUnshim(&gba->video, &gbacore->vlProxy);
 		mVideoLogContextRewind(gbacore->logContext, core);
 		GBAVideoProxyRendererShim(&gba->video, &gbacore->vlProxy);
-		gba->earlyExit = true;
+		GBAInterrupt(gba);
 	}
 }
 

src/gba/gba.c

@@ -352,8 +352,6 @@ static void GBAProcessEvents(struct ARMCore* cpu) {
 			if (!gba->memory.io[GBA_REG(IME)] || !gba->memory.io[GBA_REG(IE)]) {
 				break;
 			}
-		} else {
-			mASSERT_DEBUG_LOG(GBA, nextEvent >= 0, "Negative cycles will pass: %i", nextEvent);
 		}
 		if (gba->earlyExit) {
 			break;
@@ -628,6 +626,11 @@ void GBADebug(struct GBA* gba, uint16_t flags) {
 	gba->debugFlags = GBADebugFlagsClearSend(gba->debugFlags);
 }
 
+void GBAInterrupt(struct GBA* gba) {
+	gba->earlyExit = true;
+	mTimingInterrupt(&gba->timing);
+}
+
 #ifdef USE_ELF
 bool GBAVerifyELFEntry(struct ELF* elf, uint32_t target) {
 	if (ELFEntry(elf) == target) {

src/gba/sio/lockstep.c

@@ -1052,7 +1052,7 @@ void GBASIOLockstepPlayerSleep(struct GBASIOLockstepPlayer* player) {
 	player->asleep = true;
 	player->driver->user->sleep(player->driver->user);
 	player->driver->d.p->p->cpu->nextEvent = 0;
-	player->driver->d.p->p->earlyExit = true;
+	GBAInterrupt(player->driver->d.p->p);
 }
 
 size_t GBASIOLockstepCoordinatorAttached(struct GBASIOLockstepCoordinator* coordinator) {

src/gba/video.c

@@ -187,7 +187,7 @@ void _startHdraw(struct mTiming* timing, void* context, uint32_t cyclesLate) {
 			video->frameskipCounter = video->frameskip;
 		}
 		++video->frameCounter;
-		video->p->earlyExit = true;
+		GBAInterrupt(video->p);
 		break;
 	case VIDEO_VERTICAL_TOTAL_PIXELS - 1:
 		video->p->memory.io[GBA_REG(DISPSTAT)] = GBARegisterDISPSTATClearInVblank(dispstat);