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

Implement IntrWait

This commit is contained in:
Jeffrey Pfau 2013-04-26 02:00:59 -07:00
parent 7c895f6091
commit d2e84f0a30
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/arm/arm.c
View File

@ -135,6 +135,24 @@ void ARMRaiseIRQ(struct ARMCore* cpu) {
cpu->cpsr.i = 1;
}
void ARMRaiseSWI(struct ARMCore* cpu) {
union PSR cpsr = cpu->cpsr;
int instructionWidth;
if (cpu->executionMode == MODE_THUMB) {
instructionWidth = WORD_SIZE_THUMB;
} else {
instructionWidth = WORD_SIZE_ARM;
}
ARMSetPrivilegeMode(cpu, MODE_SUPERVISOR);
cpu->cpsr.priv = MODE_IRQ;
cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth + WORD_SIZE_ARM;
cpu->gprs[ARM_PC] = BASE_SWI + WORD_SIZE_ARM;
cpu->memory->setActiveRegion(cpu->memory, cpu->gprs[ARM_PC]);
_ARMSetMode(cpu, MODE_ARM);
cpu->spsr = cpsr;
cpu->cpsr.i = 1;
}
void ARMRun(struct ARMCore* cpu) {
if (cpu->executionMode == MODE_THUMB) {
ThumbStep(cpu);

1
src/arm/arm.h
View File

@ -122,6 +122,7 @@ void ARMAssociateBoard(struct ARMCore* cpu, struct ARMBoard* board);
void ARMReset(struct ARMCore* cpu);
void ARMSetPrivilegeMode(struct ARMCore*, enum PrivilegeMode);
void ARMRaiseIRQ(struct ARMCore*);
void ARMRaiseSWI(struct ARMCore*);
void ARMRun(struct ARMCore* cpu);

15
src/gba/gba-bios.c
View File

@ -1,6 +1,7 @@
#include "gba-bios.h"
#include "gba.h"
#include "gba-io.h"
#include "gba-memory.h"
#include <math.h>
@ -81,6 +82,20 @@ void GBASwi16(struct ARMBoard* board, int immediate) {
case 0x2:
GBAHalt(gba);
break;
case 0x05:
// VBlankIntrWait
gba->cpu.gprs[0] = 1;
gba->cpu.gprs[1] = 1;
// Fall through:
case 0x04:
// IntrWait
gba->memory.io[REG_IME >> 1] = 1;
if (!gba->cpu.gprs[0] && gba->memory.io[REG_IF >> 1] & gba->cpu.gprs[1]) {
break;
}
gba->memory.io[REG_IF >> 1] = 0;
ARMRaiseSWI(&gba->cpu);
break;
case 0xB:
_CpuSet(gba);
break;