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

ARM: Add basic CP15 information

This commit is contained in:
Jeffrey Pfau 2016-06-01 19:13:31 -07:00
parent e75cb6f7b4
commit 290d5b77dd
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/arm/arm.c
View File

@ -69,6 +69,7 @@ static inline enum RegisterBank _ARMSelectBank(enum PrivilegeMode mode) {
} }
void ARMInit(struct ARMCore* cpu) { void ARMInit(struct ARMCore* cpu) {
memset(&cpu->cp15, 0, sizeof(cpu->cp15));
cpu->master->init(cpu, cpu->master); cpu->master->init(cpu, cpu->master);
size_t i; size_t i;
for (i = 0; i < cpu->numComponents; ++i) { for (i = 0; i < cpu->numComponents; ++i) {
@ -115,6 +116,10 @@ void ARMReset(struct ARMCore* cpu) {
for (i = 0; i < 16; ++i) { for (i = 0; i < 16; ++i) {
cpu->gprs[i] = 0; cpu->gprs[i] = 0;
} }
if (ARMControlRegIsVE(cpu->cp15.r1.c0)) {
cpu->gprs[ARM_PC] = 0xFFFF0000;
}
for (i = 0; i < 6; ++i) { for (i = 0; i < 6; ++i) {
cpu->bankedRegisters[i][0] = 0; cpu->bankedRegisters[i][0] = 0;
cpu->bankedRegisters[i][1] = 0; cpu->bankedRegisters[i][1] = 0;
@ -161,6 +166,9 @@ void ARMRaiseIRQ(struct ARMCore* cpu) {
cpu->cpsr.priv = MODE_IRQ; cpu->cpsr.priv = MODE_IRQ;
cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth + WORD_SIZE_ARM; cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth + WORD_SIZE_ARM;
cpu->gprs[ARM_PC] = BASE_IRQ; cpu->gprs[ARM_PC] = BASE_IRQ;
if (ARMControlRegIsVE(cpu->cp15.r1.c0)) {
cpu->gprs[ARM_PC] |= 0xFFFF0000;
}
int currentCycles = 0; int currentCycles = 0;
ARM_WRITE_PC; ARM_WRITE_PC;
_ARMSetMode(cpu, MODE_ARM); _ARMSetMode(cpu, MODE_ARM);
@ -181,6 +189,9 @@ void ARMRaiseSWI(struct ARMCore* cpu) {
cpu->cpsr.priv = MODE_SUPERVISOR; cpu->cpsr.priv = MODE_SUPERVISOR;
cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth; cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth;
cpu->gprs[ARM_PC] = BASE_SWI; cpu->gprs[ARM_PC] = BASE_SWI;
if (ARMControlRegIsVE(cpu->cp15.r1.c0)) {
cpu->gprs[ARM_PC] |= 0xFFFF0000;
}
int currentCycles = 0; int currentCycles = 0;
ARM_WRITE_PC; ARM_WRITE_PC;
_ARMSetMode(cpu, MODE_ARM); _ARMSetMode(cpu, MODE_ARM);
@ -201,6 +212,9 @@ void ARMRaiseUndefined(struct ARMCore* cpu) {
cpu->cpsr.priv = MODE_UNDEFINED; cpu->cpsr.priv = MODE_UNDEFINED;
cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth; cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth;
cpu->gprs[ARM_PC] = BASE_UNDEF; cpu->gprs[ARM_PC] = BASE_UNDEF;
if (ARMControlRegIsVE(cpu->cp15.r1.c0)) {
cpu->gprs[ARM_PC] |= 0xFFFF0000;
}
int currentCycles = 0; int currentCycles = 0;
ARM_WRITE_PC; ARM_WRITE_PC;
_ARMSetMode(cpu, MODE_ARM); _ARMSetMode(cpu, MODE_ARM);

50
src/arm/arm.h
View File

@ -131,6 +131,55 @@ struct ARMInterruptHandler {
void (*hitStub)(struct ARMCore* cpu, uint32_t opcode); void (*hitStub)(struct ARMCore* cpu, uint32_t opcode);
}; };
DECL_BITFIELD(ARMCPUID, uint32_t);
DECL_BITFIELD(ARMCacheType, uint32_t);
DECL_BITFIELD(ARMTCMType, uint32_t);
DECL_BITFIELD(ARMTLBType, uint32_t);
DECL_BITFIELD(ARMMPUType, uint32_t);
DECL_BITFIELD(ARMControlReg, uint32_t);
DECL_BIT(ARMControlReg, M, 0);
DECL_BIT(ARMControlReg, A, 1);
DECL_BIT(ARMControlReg, C, 2);
DECL_BIT(ARMControlReg, W, 3);
DECL_BIT(ARMControlReg, P, 4);
DECL_BIT(ARMControlReg, D, 5);
DECL_BIT(ARMControlReg, L, 6);
DECL_BIT(ARMControlReg, B, 7);
DECL_BIT(ARMControlReg, S, 8);
DECL_BIT(ARMControlReg, R, 9);
DECL_BIT(ARMControlReg, F, 10);
DECL_BIT(ARMControlReg, Z, 11);
DECL_BIT(ARMControlReg, I, 12);
DECL_BIT(ARMControlReg, V, 13);
DECL_BIT(ARMControlReg, RR, 14);
DECL_BIT(ARMControlReg, L4, 15);
DECL_BIT(ARMControlReg, FI, 21);
DECL_BIT(ARMControlReg, U, 22);
DECL_BIT(ARMControlReg, XP, 23);
DECL_BIT(ARMControlReg, VE, 24);
DECL_BIT(ARMControlReg, EE, 25);
DECL_BIT(ARMControlReg, L2, 26);
DECL_BITFIELD(ARMCoprocessorAccess, uint32_t);
struct ARMCP15 {
struct {
ARMCPUID cpuid;
ARMCacheType cachetype;
ARMTCMType tcmtype;
ARMTLBType tlbtype;
ARMMPUType mputype;
} r0;
struct {
ARMControlReg c0;
uint32_t c1;
ARMCoprocessorAccess cpAccess;
} r1;
uint32_t (*write)(struct ARMCore*, int crn, int crm, int opcode2, uint32_t value);
};
struct ARMCore { struct ARMCore {
int32_t gprs[16]; int32_t gprs[16];
union PSR cpsr; union PSR cpsr;
@ -152,6 +201,7 @@ struct ARMCore {
struct ARMMemory memory; struct ARMMemory memory;
struct ARMInterruptHandler irqh; struct ARMInterruptHandler irqh;
struct ARMCP15 cp15;
struct mCPUComponent* master; struct mCPUComponent* master;