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

-files now compile in VC++

This commit is contained in:
cyberwarriorx 2006-12-01 03:45:58 +00:00
parent b33d11bffb
commit d0960e5db7
2 changed files with 839 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1137
desmume/src/arm_instructions.c
View File

File diff suppressed because it is too large Load Diff

3
desmume/src/thumb_instructions.c
View File

@ -787,6 +787,7 @@ static u32 FASTCALL OP_POP_PC(armcpu_t *cpu)
u32 i = cpu->instruction;
u32 adr = cpu->R[13];
u32 c = 0, j;
u32 v;
for(j = 0; j<8; ++j)
if(BIT_N(i, j))
@ -796,7 +797,7 @@ static u32 FASTCALL OP_POP_PC(armcpu_t *cpu)
adr += 4;
}
u32 v = MMU_readWord(cpu->proc_ID, adr);
v = MMU_readWord(cpu->proc_ID, adr);
c += MMU.MMU_WAIT32[cpu->proc_ID][(adr>>24)&0xF];
cpu->R[15] = v & 0xFFFFFFFE;
cpu->next_instruction = v & 0xFFFFFFFE;