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

GB, GBA Core: Ensure the core is halted even if a state is not loaded

This commit is contained in:
Vicki Pfau 2017-04-24 13:14:31 -07:00
parent 5cda42077c
commit 91491e704e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gb/core.c
View File

@ -792,6 +792,11 @@ static void _GBVLPReset(struct mCore* core) {
LR35902Reset(core->cpu); LR35902Reset(core->cpu);
mVideoLogContextRewind(gbcore->logContext, core); mVideoLogContextRewind(gbcore->logContext, core);
GBVideoProxyRendererShim(&gb->video, &gbcore->proxyRenderer); GBVideoProxyRendererShim(&gb->video, &gbcore->proxyRenderer);
// Make sure CPU loop never spins
GBHalt(gb->cpu);
gb->memory.ie = 0;
gb->memory.ime = false;
} }
static bool _GBVLPLoadROM(struct mCore* core, struct VFile* vf) { static bool _GBVLPLoadROM(struct mCore* core, struct VFile* vf) {

5
src/gba/core.c
View File

@ -811,6 +811,11 @@ static void _GBAVLPReset(struct mCore* core) {
ARMReset(core->cpu); ARMReset(core->cpu);
mVideoLogContextRewind(gbacore->logContext, core); mVideoLogContextRewind(gbacore->logContext, core);
GBAVideoProxyRendererShim(&gba->video, &gbacore->proxyRenderer); GBAVideoProxyRendererShim(&gba->video, &gbacore->proxyRenderer);
// Make sure CPU loop never spins
GBAHalt(gba);
gba->cpu->memory.store16(gba->cpu, BASE_IO | REG_IME, 0, NULL);
gba->cpu->memory.store16(gba->cpu, BASE_IO | REG_IE, 0, NULL);
} }
static bool _GBAVLPLoadROM(struct mCore* core, struct VFile* vf) { static bool _GBAVLPLoadROM(struct mCore* core, struct VFile* vf) {