Skip to content

Commit

Permalink
GBA BIOS: Make HLE BIOS calls interruptable (fixes mgba-emu#1711, fixes
Browse files Browse the repository at this point in the history 
mgba-emu#1823)
  • Loading branch information
@endrift
endrift authored and feos committed Aug 30, 2020
1 parent c58d862 commit e1c51a1
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 47 deletions.
1 change: 1 addition & 0 deletions CHANGES
View file
Expand Up @@ -15,6 +15,7 @@ Emulation fixes:
- GBA BIOS: Implement dummy sound driver calls
- GBA BIOS: Improve HLE BIOS timing
- GBA BIOS: Fix reloading video registers after reset (fixes mgba.io/i/1808)
- GBA BIOS: Make HLE BIOS calls interruptable (fixes mgba.io/i/1711 and mgba.io/i/1823)
- GBA DMA: Linger last DMA on bus (fixes mgba.io/i/301 and mgba.io/i/1320)
- GBA Memory: Improve gamepak prefetch timing
- GBA Memory: Stall on VRAM access in mode 2 (fixes mgba.io/i/190)
Expand Down
2 changes: 2 additions & 0 deletions include/mgba/internal/gba/gba.h
View file
Expand Up @@ -109,6 +109,8 @@ struct GBA {
bool cpuBlocked;
bool earlyExit;
uint32_t dmaPC;
uint32_t biosStall;

int idleDetectionStep;
int idleDetectionFailures;
int32_t cachedRegisters[16];
Expand Down
6 changes: 4 additions & 2 deletions include/mgba/internal/gba/serialize.h
View file
Expand Up @@ -201,7 +201,8 @@ mLOG_DECLARE_CATEGORY(GBA_STATE);
* | bit 1: POSTFLG
* | bit 2: Is IRQ pending?
* 0x00320 - 0x00323: Next IRQ event
* 0x00324 - 0x003FF: Reserved (leave zero)
* 0x00324 - 0x00327: Interruptable BIOS stall cycles
* 0x00328 - 0x003FF: Reserved (leave zero)
* 0x00400 - 0x007FF: I/O memory
* 0x00800 - 0x00BFF: Palette
* 0x00C00 - 0x00FFF: OAM
Expand Down Expand Up @@ -334,8 +335,9 @@ struct GBASerializedState {
uint32_t lastPrefetchedPc;
GBASerializedMiscFlags miscFlags;
uint32_t nextIrq;
int32_t biosStall;

uint32_t reserved[55];
uint32_t reserved[54];

uint16_t io[SIZE_IO >> 1];
uint16_t pram[SIZE_PALETTE_RAM >> 1];
Expand Down
55 changes: 39 additions & 16 deletions src/gba/bios.c
View file
Expand Up @@ -298,10 +298,10 @@ static void _Div(struct GBA* gba, int32_t num, int32_t denom) {
if (loops < 1) {
loops = 1;
}
cpu->cycles += 4 /* prologue */ + 13 * loops + 7 /* epilogue */;
gba->biosStall = 4 /* prologue */ + 13 * loops + 7 /* epilogue */;
}

static int16_t _ArcTan(int32_t i, int32_t* r1, int32_t* r3, int32_t* cycles) {
static int16_t _ArcTan(int32_t i, int32_t* r1, int32_t* r3, uint32_t* cycles) {
int currentCycles = 37;
currentCycles += _mulWait(i * i);
int32_t a = -((i * i) >> 14);
Expand All @@ -325,11 +325,11 @@ static int16_t _ArcTan(int32_t i, int32_t* r1, int32_t* r3, int32_t* cycles) {
if (r3) {
*r3 = b;
}
*cycles += currentCycles;
*cycles = currentCycles;
return (i * b) >> 16;
}

static int16_t _ArcTan2(int32_t x, int32_t y, int32_t* r1, int32_t* cycles) {
static int16_t _ArcTan2(int32_t x, int32_t y, int32_t* r1, uint32_t* cycles) {
if (!y) {
if (x >= 0) {
return 0;
Expand Down Expand Up @@ -363,9 +363,9 @@ static int16_t _ArcTan2(int32_t x, int32_t y, int32_t* r1, int32_t* cycles) {
}
}

static int32_t _Sqrt(uint32_t x, int32_t* cycles) {
static int32_t _Sqrt(uint32_t x, uint32_t* cycles) {
if (!x) {
*cycles += 53;
*cycles = 53;
return 0;
}
int32_t currentCycles = 15;
Expand Down Expand Up @@ -412,7 +412,7 @@ static int32_t _Sqrt(uint32_t x, int32_t* cycles) {
break;
}
}
*cycles += currentCycles;
*cycles = currentCycles;
return bound;
}

Expand All @@ -422,6 +422,9 @@ void GBASwi16(struct ARMCore* cpu, int immediate) {
immediate, cpu->gprs[0], cpu->gprs[1], cpu->gprs[2], cpu->gprs[3]);

switch (immediate) {
case 0xF0: // Used for internal stall counting
cpu->gprs[4] = gba->biosStall;
return;
case 0xFA:
GBAPrintFlush(gba);
return;
Expand All @@ -431,6 +434,8 @@ void GBASwi16(struct ARMCore* cpu, int immediate) {
ARMRaiseSWI(cpu);
return;
}

bool useStall = false;
switch (immediate) {
case GBA_SWI_SOFT_RESET:
_SoftReset(gba);
Expand All @@ -452,19 +457,24 @@ void GBASwi16(struct ARMCore* cpu, int immediate) {
ARMRaiseSWI(cpu);
return;
case GBA_SWI_DIV:
useStall = true;
_Div(gba, cpu->gprs[0], cpu->gprs[1]);
break;
case GBA_SWI_DIV_ARM:
useStall = true;
_Div(gba, cpu->gprs[1], cpu->gprs[0]);
break;
case GBA_SWI_SQRT:
cpu->gprs[0] = _Sqrt(cpu->gprs[0], &cpu->cycles);
useStall = true;
cpu->gprs[0] = _Sqrt(cpu->gprs[0], &gba->biosStall);
break;
case GBA_SWI_ARCTAN:
cpu->gprs[0] = _ArcTan(cpu->gprs[0], &cpu->gprs[1], &cpu->gprs[3], &cpu->cycles);
useStall = true;
cpu->gprs[0] = _ArcTan(cpu->gprs[0], &cpu->gprs[1], &cpu->gprs[3], &gba->biosStall);
break;
case GBA_SWI_ARCTAN2:
cpu->gprs[0] = (uint16_t) _ArcTan2(cpu->gprs[0], cpu->gprs[1], &cpu->gprs[1], &cpu->cycles);
useStall = true;
cpu->gprs[0] = (uint16_t) _ArcTan2(cpu->gprs[0], cpu->gprs[1], &cpu->gprs[1], &gba->biosStall);
cpu->gprs[3] = 0x170;
break;
case GBA_SWI_CPU_SET:
Expand Down Expand Up @@ -589,12 +599,25 @@ void GBASwi16(struct ARMCore* cpu, int immediate) {
default:
mLOG(GBA_BIOS, STUB, "Stub software interrupt: %02X", immediate);
}
gba->cpu->cycles += 45 + cpu->memory.activeNonseqCycles16 /* 8 bit load for SWI # */;
// Return cycles
if (gba->cpu->executionMode == MODE_ARM) {
gba->cpu->cycles += cpu->memory.activeNonseqCycles32 + cpu->memory.activeSeqCycles32;
} else {
gba->cpu->cycles += cpu->memory.activeNonseqCycles16 + cpu->memory.activeSeqCycles16;
if (useStall) {
if (gba->biosStall >= 18) {
gba->biosStall -= 18;
gba->cpu->cycles += gba->biosStall & 3;
gba->biosStall &= ~3;
ARMRaiseSWI(cpu);
} else {
gba->cpu->cycles += gba->biosStall;
useStall = false;
}
}
if (!useStall) {
gba->cpu->cycles += 45 + cpu->memory.activeNonseqCycles16 /* 8 bit load for SWI # */;
// Return cycles
if (gba->cpu->executionMode == MODE_ARM) {
gba->cpu->cycles += cpu->memory.activeNonseqCycles32 + cpu->memory.activeSeqCycles32;
} else {
gba->cpu->cycles += cpu->memory.activeNonseqCycles16 + cpu->memory.activeSeqCycles16;
}
}
gba->memory.biosPrefetch = 0xE3A02004;
}
Expand Down
3 changes: 2 additions & 1 deletion src/gba/gba.c
View file
Expand Up @@ -201,6 +201,7 @@ void GBAReset(struct ARMCore* cpu) {
gba->cpuBlocked = false;
gba->earlyExit = false;
gba->dmaPC = 0;
gba->biosStall = 0;
if (gba->yankedRomSize) {
gba->memory.romSize = gba->yankedRomSize;
gba->memory.romMask = toPow2(gba->memory.romSize) - 1;
Expand Down Expand Up @@ -928,4 +929,4 @@ static bool _setSoftwareBreakpoint(struct ARMDebugger* debugger, uint32_t addres
static void _clearSoftwareBreakpoint(struct ARMDebugger* debugger, const struct ARMDebugBreakpoint* breakpoint) {
GBAClearBreakpoint((struct GBA*) debugger->cpu->master, breakpoint->d.address, breakpoint->sw.mode, breakpoint->sw.opcode);
}
#endif
#endif
29 changes: 15 additions & 14 deletions src/gba/hle-bios.c
View file
Expand Up @@ -3,28 +3,28 @@
#include <mgba/internal/gba/memory.h>

const uint8_t hleBios[SIZE_BIOS] = {
0x06, 0x00, 0x00, 0xea, 0x66, 0x00, 0x00, 0xea, 0x0b, 0x00, 0x00, 0xea,
0x06, 0x00, 0x00, 0xea, 0x66, 0x00, 0x00, 0xea, 0x0c, 0x00, 0x00, 0xea,
0xfe, 0xff, 0xff, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x00, 0x00, 0xa0, 0xe1,
0x59, 0x00, 0x00, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x02, 0x03, 0xa0, 0xe3,
0x03, 0x10, 0xd0, 0xe5, 0xea, 0x00, 0x51, 0xe3, 0x4c, 0x01, 0x9f, 0x15,
0x10, 0xff, 0x2f, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x29, 0xe1,
0x00, 0x00, 0x5d, 0xe3, 0x01, 0xd3, 0xa0, 0x03, 0x20, 0xd0, 0x4d, 0x02,
0x00, 0x58, 0x2d, 0xe9, 0x02, 0xb0, 0x5e, 0xe5, 0xd4, 0xc0, 0xa0, 0xe3,
0x0b, 0xb1, 0x9c, 0xe7, 0x00, 0x00, 0x5b, 0xe3, 0x00, 0xc0, 0x4f, 0xe1,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0xe3, 0x01, 0xd3, 0xa0, 0x03,
0x20, 0xd0, 0x4d, 0x02, 0x10, 0x58, 0x2d, 0xe9, 0x02, 0xb0, 0x5e, 0xe5,
0xd4, 0xc0, 0xa0, 0xe3, 0x0b, 0xb1, 0x9c, 0xe7, 0xd2, 0xcf, 0xa0, 0xe3,
0x0b, 0x00, 0x5c, 0xe1, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0xc0, 0x4f, 0xe1,
0x00, 0x10, 0x2d, 0xe9, 0x80, 0xc0, 0x0c, 0xe2, 0x1f, 0xc0, 0x8c, 0xe3,
0x0c, 0xf0, 0x29, 0xe1, 0x00, 0x40, 0x2d, 0xe9, 0x00, 0x00, 0xa0, 0xe1,
0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1,
0x0c, 0xf0, 0x21, 0xe1, 0x00, 0x40, 0x2d, 0xe9, 0x00, 0x00, 0x5b, 0xe3,
0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1,
0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1,
0x0f, 0xe0, 0xa0, 0xe1, 0x1b, 0xff, 0x2f, 0x11, 0x00, 0x00, 0xa0, 0xe1,
0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1,
0x00, 0x40, 0xbd, 0xe8, 0x93, 0xf0, 0x29, 0xe3, 0x00, 0x10, 0xbd, 0xe8,
0x0c, 0xf0, 0x69, 0xe1, 0x00, 0x58, 0xbd, 0xe8, 0x0e, 0xf0, 0xb0, 0xe1,
0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0xa0, 0xe3, 0xb0, 0x01, 0x00, 0x00,
0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x40, 0xbd, 0xe8,
0x93, 0xf0, 0x29, 0xe3, 0x00, 0x10, 0xbd, 0xe8, 0x0c, 0xf0, 0x69, 0xe1,
0x10, 0x58, 0xbd, 0xe8, 0x0e, 0xf0, 0xb0, 0xe1, 0x00, 0x00, 0x00, 0x00,
0x04, 0x20, 0xa0, 0xe3, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
0xb0, 0x01, 0x00, 0x00, 0xb4, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
0xcc, 0x01, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
0xb0, 0x01, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00,
0xcc, 0x01, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00,
0x48, 0x03, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00,
0x48, 0x03, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00,
0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,
Expand Down Expand Up @@ -72,5 +72,6 @@ const uint8_t hleBios[SIZE_BIOS] = {
0x01, 0x70, 0xa0, 0xe1, 0x01, 0x80, 0xa0, 0xe1, 0x01, 0x90, 0xa0, 0xe1,
0x01, 0xa0, 0xa0, 0xe1, 0xfa, 0x07, 0xa0, 0xe8, 0xfa, 0x07, 0xa0, 0xe8,
0xfa, 0x07, 0xa0, 0xe8, 0xfa, 0x07, 0xa0, 0xe8, 0x00, 0x10, 0xa0, 0xe3,
0xf0, 0x07, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1, 0xb0, 0x01, 0x00, 0x00
0xf0, 0x07, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1, 0xb0, 0x01, 0x00, 0x00,
0x04, 0x40, 0x54, 0xe2, 0xfd, 0xff, 0xff, 0x8a, 0x1e, 0xff, 0x2f, 0xe1
};
36 changes: 22 additions & 14 deletions src/gba/hle-bios.s
View file
Expand Up @@ -25,25 +25,26 @@ bx r0
.word 0
.word 0xE129F000

.word 0 @ Padding for back-compat

swiBase:
cmp sp, #0
moveq sp, #0x04000000
subeq sp, #0x20
stmfd sp!, {r11-r12, lr}
stmfd sp!, {r4, r11-r12, lr}
ldrb r11, [lr, #-2]
mov r12, #swiTable
ldr r11, [r12, r11, lsl #2]
cmp r11, #0
mov r12, #StallCall
cmp r12, r11
swieq 0xF00000 @ Special mGBA-internal call to load the stall count into r4
mrs r12, spsr
stmfd sp!, {r12}
and r12, #0x80
orr r12, #0x1F
msr cpsr, r12
msr cpsr_c, r12
stmfd sp!, {lr}
nop
nop
nop
nop
cmp r11, #0
nop
nop
nop
Expand All @@ -55,16 +56,17 @@ bxne r11
nop
nop
nop
nop
ldmfd sp!, {lr}
msr cpsr, #0x93
ldmfd sp!, {r12}
msr spsr, r12
ldmfd sp!, {r11-r12, lr}
ldmfd sp!, {r4, r11-r12, lr}
movs pc, lr
.word 0
.word 0xE3A02004

.word 0 @ Padding for back-compat

swiTable:
.word SoftReset @ 0x00
.word RegisterRamReset @ 0x01
Expand Down Expand Up @@ -131,11 +133,6 @@ subs pc, lr, #4
SoftReset:
RegisterRamReset:
Stop:
Div:
DivArm:
Sqrt:
ArcTan:
ArcTan2:
GetBiosChecksum:
BgAffineSet:
ObjAffineSet:
Expand Down Expand Up @@ -305,3 +302,14 @@ ldmfd sp!, {r4-r10}
bx lr

.ltorg

Div:
DivArm:
Sqrt:
ArcTan:
ArcTan2:

StallCall:
subs r4, #4
bhi StallCall
bx lr
2 changes: 2 additions & 0 deletions src/gba/serialize.c
View file
Expand Up @@ -69,6 +69,7 @@ void GBASerialize(struct GBA* gba, struct GBASerializedState* state) {
}
miscFlags = GBASerializedMiscFlagsSetBlocked(miscFlags, gba->cpuBlocked);
STORE_32(miscFlags, 0, &state->miscFlags);
STORE_32(gba->biosStall, 0, &state->nextIrq);

GBAMemorySerialize(&gba->memory, state);
GBAIOSerialize(gba, state);
Expand Down Expand Up @@ -187,6 +188,7 @@ bool GBADeserialize(struct GBA* gba, const struct GBASerializedState* state) {
mTimingSchedule(&gba->timing, &gba->irqEvent, when);
}
gba->cpuBlocked = GBASerializedMiscFlagsGetBlocked(miscFlags);
LOAD_32(gba->biosStall, 0, &state->nextIrq);

GBAVideoDeserialize(&gba->video, state);
GBAMemoryDeserialize(&gba->memory, state);
Expand Down

0 comments on commit e1c51a1

Please sign in to comment.