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

ARM: Implement MCR for coprocessor 15

This commit is contained in:
Jeffrey Pfau 2016-06-01 21:42:34 -07:00
parent b83f037799
commit f32e92e0f1
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arm/arm.h
View File

@ -177,7 +177,7 @@ struct ARMCP15 {
ARMCoprocessorAccess cpAccess;
} r1;
uint32_t (*write)(struct ARMCore*, int crn, int crm, int opcode2, uint32_t value);
uint32_t (*write)(struct ARMCore*, int crn, int crm, int opcode1, int opcode2, uint32_t value);
};
struct ARMCore {

26
src/arm/isa-arm.c
View File

@ -618,11 +618,33 @@ DEFINE_INSTRUCTION_ARM(BX,
// Begin coprocessor definitions
#define DEFINE_COPROCESSOR_INSTRUCTION(NAME, BODY) \
DEFINE_INSTRUCTION_ARM(NAME, \
int op1 = (opcode >> 21) & 7; \
int op2 = (opcode >> 5) & 7; \
int rd = (opcode >> 12) & 0xF; \
int cp = (opcode >> 8) & 0xF; \
int crn = (opcode >> 16) & 0xF; \
int crm = opcode & 0xF; \
UNUSED(op1); \
UNUSED(op2); \
UNUSED(rd); \
UNUSED(crn); \
UNUSED(crm); \
BODY;)
DEFINE_COPROCESSOR_INSTRUCTION(MRC, ARM_STUB)
DEFINE_COPROCESSOR_INSTRUCTION(MCR,
if (cp == 15) {
cpu->cp15.write(cpu, crn, crm, op1, op2, cpu->gprs[rd]);
} else {
ARM_STUB;
})
DEFINE_INSTRUCTION_ARM(CDP, ARM_STUB)
DEFINE_INSTRUCTION_ARM(LDC, ARM_STUB)
DEFINE_INSTRUCTION_ARM(STC, ARM_STUB)
DEFINE_INSTRUCTION_ARM(MCR, ARM_STUB)
DEFINE_INSTRUCTION_ARM(MRC, ARM_STUB)
// Begin miscellaneous definitions