Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM7: Add emulation for Undefined CPU mode

Browse Source
This commit is contained in:
Jeffrey Pfau 2015-06-19 00:59:52 -07:00
parent 270ce0cba3
commit d524148469
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -77,6 +77,7 @@ Misc:
- Qt: Don't save window size when entering fullscreen - Qt: Don't save window size when entering fullscreen
- Qt: Make the default fullscreen binding for Windows be Alt-Enter - Qt: Make the default fullscreen binding for Windows be Alt-Enter
- GBA Video: Refactor software renderer into separate files - GBA Video: Refactor software renderer into separate files
- ARM7: Add emulation for Undefined CPU mode
0.2.1: (2015-05-13) 0.2.1: (2015-05-13)
Bugfixes: Bugfixes:

20
src/arm/arm.c
View File

@ -190,6 +190,26 @@ void ARMRaiseSWI(struct ARMCore* cpu) {
cpu->cycles += currentCycles; cpu->cycles += currentCycles;
} }
void ARMRaiseUndefined(struct ARMCore* cpu) {
union PSR cpsr = cpu->cpsr;
int instructionWidth;
if (cpu->executionMode == MODE_THUMB) {
instructionWidth = WORD_SIZE_THUMB;
} else {
instructionWidth = WORD_SIZE_ARM;
}
ARMSetPrivilegeMode(cpu, MODE_UNDEFINED);
cpu->cpsr.priv = MODE_UNDEFINED;
cpu->gprs[ARM_LR] = cpu->gprs[ARM_PC] - instructionWidth;
cpu->gprs[ARM_PC] = BASE_UNDEF;
int currentCycles = 0;
ARM_WRITE_PC;
_ARMSetMode(cpu, MODE_ARM);
cpu->spsr = cpsr;
cpu->cpsr.i = 1;
cpu->cycles += currentCycles;
}
static inline void ARMStep(struct ARMCore* cpu) { static inline void ARMStep(struct ARMCore* cpu) {
uint32_t opcode = cpu->prefetch[0]; uint32_t opcode = cpu->prefetch[0];
cpu->prefetch[0] = cpu->prefetch[1]; cpu->prefetch[0] = cpu->prefetch[1];

1
src/arm/arm.h
View File

@ -172,6 +172,7 @@ void ARMReset(struct ARMCore* cpu);
void ARMSetPrivilegeMode(struct ARMCore*, enum PrivilegeMode); void ARMSetPrivilegeMode(struct ARMCore*, enum PrivilegeMode);
void ARMRaiseIRQ(struct ARMCore*); void ARMRaiseIRQ(struct ARMCore*);
void ARMRaiseSWI(struct ARMCore*); void ARMRaiseSWI(struct ARMCore*);
void ARMRaiseUndefined(struct ARMCore*);
void ARMRun(struct ARMCore* cpu); void ARMRun(struct ARMCore* cpu);
void ARMRunLoop(struct ARMCore* cpu); void ARMRunLoop(struct ARMCore* cpu);

4
src/gba/gba.c
View File

@ -650,7 +650,7 @@ void GBAGetGameTitle(struct GBA* gba, char* out) {
void GBAHitStub(struct ARMCore* cpu, uint32_t opcode) { void GBAHitStub(struct ARMCore* cpu, uint32_t opcode) {
struct GBA* gba = (struct GBA*) cpu->master; struct GBA* gba = (struct GBA*) cpu->master;
enum GBALogLevel level = GBA_LOG_FATAL; enum GBALogLevel level = GBA_LOG_ERROR;
if (gba->debugger) { if (gba->debugger) {
level = GBA_LOG_STUB; level = GBA_LOG_STUB;
struct DebuggerEntryInfo info = { struct DebuggerEntryInfo info = {
@ -671,6 +671,8 @@ void GBAIllegal(struct ARMCore* cpu, uint32_t opcode) {
.opcode = opcode .opcode = opcode
}; };
ARMDebuggerEnter(gba->debugger, DEBUGGER_ENTER_ILLEGAL_OP, &info); ARMDebuggerEnter(gba->debugger, DEBUGGER_ENTER_ILLEGAL_OP, &info);
} else {
ARMRaiseUndefined(cpu);
} }
} }