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

Roll out incorrect fix for Halt bug and apply proper fix

This commit is contained in:
Jeffrey Pfau 2013-05-05 20:37:35 -07:00
parent 7ec435b94c
commit 8bc5ec4222
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,7 @@ void GBASwi16(struct ARMBoard* board, int immediate) {
if (!gba->cpu.gprs[0] && gba->memory.io[REG_IF >> 1] & gba->cpu.gprs[1]) { if (!gba->cpu.gprs[0] && gba->memory.io[REG_IF >> 1] & gba->cpu.gprs[1]) {
break; break;
} }
gba->memory.io[REG_IF >> 1] = 0;
ARMRaiseSWI(&gba->cpu); ARMRaiseSWI(&gba->cpu);
break; break;
case 0x6: case 0x6:

10
src/gba/gba.c
View File

@ -337,17 +337,23 @@ int GBATestIRQ(struct GBA* gba) {
} }
int GBAWaitForIRQ(struct GBA* gba) { int GBAWaitForIRQ(struct GBA* gba) {
int irqs = gba->memory.io[REG_IF >> 1];
int newIRQs = 0;
gba->memory.io[REG_IF >> 1] = 0;
while (1) { while (1) {
if (gba->cpu.nextEvent == INT_MAX) { if (gba->cpu.nextEvent == INT_MAX) {
return 0; break;
} else { } else {
gba->cpu.cycles = gba->cpu.nextEvent; gba->cpu.cycles = gba->cpu.nextEvent;
GBAProcessEvents(&gba->board.d); GBAProcessEvents(&gba->board.d);
if (gba->memory.io[REG_IF >> 1]) { if (gba->memory.io[REG_IF >> 1]) {
return 1; newIRQs = gba->memory.io[REG_IF >> 1];
break;
} }
} }
} }
gba->memory.io[REG_IF >> 1] = newIRQs | irqs;
return newIRQs;
} }
int GBAHalt(struct GBA* gba) { int GBAHalt(struct GBA* gba) {

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

@ -1,5 +1,6 @@
#include "hle-bios.h" #include "hle-bios.h"
const unsigned int hleBiosLength = 216;
const unsigned char hleBios[] = { const unsigned char hleBios[] = {
0x06, 0x00, 0x00, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x05, 0x00, 0x00, 0xea, 0x06, 0x00, 0x00, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x05, 0x00, 0x00, 0xea,
0xfe, 0xff, 0xff, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x00, 0x00, 0xa0, 0xe1, 0xfe, 0xff, 0xff, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x00, 0x00, 0xa0, 0xe1,
@ -13,12 +14,10 @@ const unsigned char hleBios[] = {
0x04, 0xd0, 0x4d, 0xe2, 0xb0, 0x10, 0xcd, 0xe1, 0x01, 0x23, 0xa0, 0xe3, 0x04, 0xd0, 0x4d, 0xe2, 0xb0, 0x10, 0xcd, 0xe1, 0x01, 0x23, 0xa0, 0xe3,
0x02, 0x2c, 0x82, 0xe2, 0xb0, 0x00, 0xd2, 0xe1, 0xb2, 0x00, 0xcd, 0xe1, 0x02, 0x2c, 0x82, 0xe2, 0xb0, 0x00, 0xd2, 0xe1, 0xb2, 0x00, 0xcd, 0xe1,
0xb0, 0x10, 0xdd, 0xe1, 0x01, 0x10, 0x80, 0xe1, 0xb0, 0x10, 0xc2, 0xe1, 0xb0, 0x10, 0xdd, 0xe1, 0x01, 0x10, 0x80, 0xe1, 0xb0, 0x10, 0xc2, 0xe1,
0x00, 0x00, 0xe0, 0xe3, 0xb2, 0x00, 0xc2, 0xe1, 0x1f, 0x00, 0xa0, 0xe3, 0x1f, 0x00, 0xa0, 0xe3, 0x00, 0xf0, 0x29, 0xe1, 0x00, 0x00, 0x02, 0xef,
0x00, 0xf0, 0x29, 0xe1, 0x00, 0x00, 0x02, 0xef, 0xd3, 0x00, 0xa0, 0xe3, 0xd3, 0x00, 0xa0, 0xe3, 0x00, 0xf0, 0x29, 0xe1, 0x01, 0x03, 0xa0, 0xe3,
0x00, 0xf0, 0x29, 0xe1, 0x01, 0x03, 0xa0, 0xe3, 0xb8, 0x20, 0x50, 0xe1, 0xb8, 0x20, 0x50, 0xe1, 0xb0, 0x10, 0xdd, 0xe1, 0x02, 0x10, 0x11, 0xe0,
0xb0, 0x10, 0xdd, 0xe1, 0x02, 0x10, 0x11, 0xe0, 0x02, 0x10, 0x21, 0x10, 0x02, 0x10, 0x21, 0x10, 0xb8, 0x10, 0x40, 0x11, 0xb2, 0x00, 0xdd, 0xe1,
0xb8, 0x10, 0x40, 0x11, 0xb2, 0x00, 0xdd, 0xe1, 0x01, 0x13, 0xa0, 0xe3, 0x01, 0x13, 0xa0, 0xe3, 0x02, 0x1c, 0x81, 0xe2, 0xb0, 0x00, 0xc1, 0xe1,
0x02, 0x1c, 0x81, 0xe2, 0xb0, 0x00, 0xc1, 0xe1, 0xe6, 0xff, 0xff, 0x0a, 0xe8, 0xff, 0xff, 0x0a, 0x04, 0xd0, 0x8d, 0xe2, 0x04, 0x80, 0xbd, 0xe8
0x04, 0xd0, 0x8d, 0xe2, 0x04, 0x80, 0xbd, 0xe8
}; };
const unsigned int hleBiosLength = 224;

2
src/gba/hle-bios.s
View File

@ -47,8 +47,6 @@ strh r0, [sp, #2]
ldrh r1, [sp, #0] ldrh r1, [sp, #0]
orr r1, r0, r1 orr r1, r0, r1
strh r1, [r2, #0] strh r1, [r2, #0]
mov r0, #0xFFFFFFFF
strh r0, [r2, #2]
mov r0, #0x1F mov r0, #0x1F
msr cpsr, r0 msr cpsr, r0
swi #0x020000 swi #0x020000