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

LR35902: Fix IRQ raising

This commit is contained in:
Jeffrey Pfau 2016-01-19 22:12:06 -08:00
parent 6f52a26668
commit d2f97a8edc
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lr35902/lr35902.c
View File

@ -74,6 +74,23 @@ void LR35902RaiseIRQ(struct LR35902Core* cpu, uint8_t vector) {
cpu->irqVector = vector;
}
static void _LR35902InstructionIRQFinish(struct LR35902Core* cpu) {
cpu->index = cpu->sp + 1;
cpu->bus = cpu->pc >> 8;
cpu->executionState = LR35902_CORE_MEMORY_STORE;
cpu->instruction = _lr35902InstructionTable[0]; // NOP
cpu->pc = cpu->irqVector;
cpu->memory.setActiveRegion(cpu, cpu->pc);
}
static void _LR35902InstructionIRQ(struct LR35902Core* cpu) {
cpu->sp -= 2; /* TODO: Atomic incrementing? */
cpu->index = cpu->sp;
cpu->bus = cpu->pc;
cpu->executionState = LR35902_CORE_MEMORY_STORE;
cpu->instruction = _LR35902InstructionIRQFinish;
}
void LR35902Tick(struct LR35902Core* cpu) {
++cpu->cycles;
enum LR35902ExecutionState state = cpu->executionState;
@ -82,10 +99,10 @@ void LR35902Tick(struct LR35902Core* cpu) {
switch (state) {
case LR35902_CORE_FETCH:
if (cpu->irqPending) {
cpu->pc = cpu->irqVector;
cpu->index = cpu->sp;
cpu->irqPending = false;
cpu->irqh.setInterrupts(cpu, false);
cpu->instruction = _lr35902InstructionTable[0]; // NOP
cpu->instruction = _LR35902InstructionIRQ;
break;
}
cpu->bus = cpu->memory.load8(cpu, cpu->pc);