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

DS: Add halting

This commit is contained in:
Jeffrey Pfau 2017-01-04 00:46:05 -08:00
parent bb7bda6f80
commit 750d3444a0
5 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mgba/internal/arm/arm.h
View File

@ -254,6 +254,7 @@ void ARMSetPrivilegeMode(struct ARMCore*, enum PrivilegeMode);
void ARMRaiseIRQ(struct ARMCore*);
void ARMRaiseSWI(struct ARMCore*);
void ARMRaiseUndefined(struct ARMCore*);
void ARMHalt(struct ARMCore*);
void ARMv4Run(struct ARMCore* cpu);
void ARMv4RunLoop(struct ARMCore* cpu);

5
src/arm/arm.c
View File

@ -223,6 +223,11 @@ void ARMRaiseUndefined(struct ARMCore* cpu) {
cpu->cycles += currentCycles;
}
void ARMHalt(struct ARMCore* cpu) {
cpu->nextEvent = cpu->cycles;
cpu->halted = 1;
}
#define ARM_IMPLEMENT(VERSION) \
static inline void ARM ## VERSION ## Step(struct ARMCore* cpu) { \
uint32_t opcode = cpu->prefetch[0]; \

8
src/ds/ds.c
View File

@ -508,6 +508,14 @@ static void _writeRegionConfiguration(struct ARMCore* cpu, int crm, int opcode2,
}
static void _writeCache(struct ARMCore* cpu, int crm, int opcode2, uint32_t value) {
switch (crm) {
case 0:
if (opcode2 == 4) {
ARMHalt(cpu);
return;
}
break;
}
mLOG(DS, STUB, "CP15 cache write: CRm: %i, Op2: %i, Value: 0x%08X", crm, opcode2, value);
}

21
src/ds/io.c
View File

@ -10,6 +10,23 @@
mLOG_DEFINE_CATEGORY(DS_IO, "DS I/O");
static void _DSHaltCNT(struct DSCommon* dscore, uint8_t value) {
switch (value >> 6) {
case 0:
default:
break;
case 1:
mLOG(DS_IO, STUB, "Enter GBA mode not supported");
break;
case 2:
ARMHalt(dscore->cpu);
break;
case 3:
mLOG(DS_IO, STUB, "Enter sleep mode not supported");
break;
}
}
static uint32_t DSIOWrite(struct DSCommon* dscore, uint32_t address, uint16_t value) {
switch (address) {
// Timers
@ -108,6 +125,10 @@ void DS7IOWrite(struct DS* ds, uint32_t address, uint16_t value) {
}
void DS7IOWrite8(struct DS* ds, uint32_t address, uint8_t value) {
if (address == DS7_REG_HALTCNT) {
_DSHaltCNT(&ds->ds7, value);
return;
}
if (address < DS7_REG_MAX) {
uint16_t value16 = value << (8 * (address & 1));
value16 |= (ds->ds7.memory.io[(address & 0xFFF) >> 1]) & ~(0xFF << (8 * (address & 1)));

3
src/gba/gba.c
View File

@ -434,8 +434,7 @@ void GBATestIRQ(struct ARMCore* cpu) {
}
void GBAHalt(struct GBA* gba) {
gba->cpu->nextEvent = gba->cpu->cycles;
gba->cpu->halted = 1;
ARMHalt(gba->cpu);
}
void GBAStop(struct GBA* gba) {