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

Fix writing to PC

This commit is contained in:
Jeffrey Pfau 2013-04-07 01:57:04 -07:00
parent 68f2eed84d
commit 6e3a9a9508
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arm.c
View File

@ -122,6 +122,9 @@ void ARMStep(struct ARMCore* cpu) {
#define ARM_COND_LE (cpu->cpsr.z || !cpu->cpsr.n != !cpu->cpsr.v) #define ARM_COND_LE (cpu->cpsr.z || !cpu->cpsr.n != !cpu->cpsr.v)
#define ARM_COND_AL 1 #define ARM_COND_AL 1
#define ARM_WRITE_PC \
cpu->gprs[ARM_PC] = (cpu->gprs[ARM_PC] & -cpu->instructionWidth) + cpu->instructionWidth
#define ARM_ADDITION_S(M, N, D) \ #define ARM_ADDITION_S(M, N, D) \
if (rd == ARM_PC && _ARMModeHasSPSR(cpu->cpsr.priv)) { \ if (rd == ARM_PC && _ARMModeHasSPSR(cpu->cpsr.priv)) { \
cpu->cpsr = cpu->spsr; \ cpu->cpsr = cpu->spsr; \
@ -380,7 +383,8 @@ DEFINE_INSTRUCTION_ARM(SWPB,)
DEFINE_INSTRUCTION_ARM(B, \ DEFINE_INSTRUCTION_ARM(B, \
int32_t offset = opcode << 8; \ int32_t offset = opcode << 8; \
offset >>= 6; \ offset >>= 6; \
cpu->gprs[ARM_PC] += offset) cpu->gprs[ARM_PC] += offset; \
ARM_WRITE_PC;)
DEFINE_INSTRUCTION_ARM(BL,) DEFINE_INSTRUCTION_ARM(BL,)
DEFINE_INSTRUCTION_ARM(BX,) DEFINE_INSTRUCTION_ARM(BX,)

1
src/main.c
View File

@ -11,6 +11,7 @@ int main(int argc, char** argv) {
GBALoadROM(&gba, fd); GBALoadROM(&gba, fd);
gba.cpu.gprs[ARM_PC] = 0x08000004; gba.cpu.gprs[ARM_PC] = 0x08000004;
ARMStep(&gba.cpu); ARMStep(&gba.cpu);
ARMStep(&gba.cpu);
GBADeinit(&gba); GBADeinit(&gba);
return 0; return 0;