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

Implement HALT

This commit is contained in:
Jeffrey Pfau 2013-04-16 23:14:16 -07:00
parent e88d177582
commit 8c03c20019
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,9 @@ static void _CpuSet(struct GBA* gba) {
void GBASwi16(struct ARMBoard* board, int immediate) { void GBASwi16(struct ARMBoard* board, int immediate) {
struct GBA* gba = ((struct GBABoard*) board)->p; struct GBA* gba = ((struct GBABoard*) board)->p;
switch (immediate) { switch (immediate) {
case 0x2:
GBAHalt(gba);
break;
case 0xB: case 0xB:
_CpuSet(gba); _CpuSet(gba);
break; break;

8
src/gba/gba-io.c
View File

@ -41,6 +41,14 @@ void GBAIOWrite(struct GBA* gba, uint32_t address, uint16_t value) {
case REG_IME: case REG_IME:
GBAWriteIME(gba, value); GBAWriteIME(gba, value);
break; break;
case REG_HALTCNT:
value &= 0x80;
if (!value) {
GBAHalt(gba);
} else {
GBALog(GBA_LOG_STUB, "Stop unimplemented");
}
return;
default: default:
GBALog(GBA_LOG_STUB, "Stub I/O register write: %03x", address); GBALog(GBA_LOG_STUB, "Stub I/O register write: %03x", address);
break; break;

27
src/gba/gba.c
View File

@ -130,12 +130,6 @@ void GBARaiseIRQ(struct GBA* gba, enum GBAIRQ irq) {
} }
} }
void GBAPollNextEvent(struct GBA* gba) {
int32_t nextEvent = gba->video.nextEvent;
gba->cpu.nextEvent = nextEvent;
}
int GBATestIRQ(struct GBA* gba) { int GBATestIRQ(struct GBA* gba) {
if (gba->memory.io[REG_IME >> 1] && gba->memory.io[REG_IE >> 1] & gba->memory.io[REG_IF >> 1]) { if (gba->memory.io[REG_IME >> 1] && gba->memory.io[REG_IE >> 1] & gba->memory.io[REG_IF >> 1]) {
gba->springIRQ = 1; gba->springIRQ = 1;
@ -146,24 +140,7 @@ int GBATestIRQ(struct GBA* gba) {
} }
int GBAWaitForIRQ(struct GBA* gba) { int GBAWaitForIRQ(struct GBA* gba) {
int irqPending = GBATestIRQ(gba) || gba->video.hblankIRQ || gba->video.vblankIRQ || gba->video.vcounterIRQ;
/*if (this.timersEnabled) {
timer = this.timers[0];
irqPending = irqPending || timer.doIrq;
timer = this.timers[1];
irqPending = irqPending || timer.doIrq;
timer = this.timers[2];
irqPending = irqPending || timer.doIrq;
timer = this.timers[3];
irqPending = irqPending || timer.doIrq;
}*/
if (!irqPending) {
return 0;
}
while (1) { while (1) {
GBAPollNextEvent(gba);
if (gba->cpu.nextEvent == INT_MAX) { if (gba->cpu.nextEvent == INT_MAX) {
return 0; return 0;
} else { } else {
@ -176,6 +153,10 @@ int GBAWaitForIRQ(struct GBA* gba) {
} }
} }
int GBAHalt(struct GBA* gba) {
return GBAWaitForIRQ(gba);
}
void GBALog(int level, const char* format, ...) { void GBALog(int level, const char* format, ...) {
va_list args; va_list args;
va_start(args, format); va_start(args, format);

2
src/gba/gba.h
View File

@ -64,9 +64,9 @@ void GBABoardReset(struct ARMBoard* board);
void GBAWriteIE(struct GBA* gba, uint16_t value); void GBAWriteIE(struct GBA* gba, uint16_t value);
void GBAWriteIME(struct GBA* gba, uint16_t value); void GBAWriteIME(struct GBA* gba, uint16_t value);
void GBARaiseIRQ(struct GBA* gba, enum GBAIRQ irq); void GBARaiseIRQ(struct GBA* gba, enum GBAIRQ irq);
void GBAPollNextEvent(struct GBA* gba);
int GBATestIRQ(struct GBA* gba); int GBATestIRQ(struct GBA* gba);
int GBAWaitForIRQ(struct GBA* gba); int GBAWaitForIRQ(struct GBA* gba);
int GBAHalt(struct GBA* gba);
void GBAAttachDebugger(struct GBA* gba, struct ARMDebugger* debugger); void GBAAttachDebugger(struct GBA* gba, struct ARMDebugger* debugger);