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

prefetch now checks for rights to execute at the address. Stops execution if pc(r15) runs outside valid addressranges

This commit is contained in:
mightymax 2007-01-10 00:31:12 +00:00
parent 1ff96c7899
commit 67ac2f8b04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/armcpu.c
View File

@ -195,13 +195,13 @@ u32 armcpu_prefetch(armcpu_t *armcpu)
{
if(armcpu->CPSR.bits.T == 0)
{
armcpu->instruction = MMU_readWord(armcpu->proc_ID, armcpu->next_instruction);
armcpu->instruction = MMU_readWordACL(armcpu->proc_ID, armcpu->next_instruction,ACCESS_EXECUTION);
armcpu->instruct_adr = armcpu->next_instruction;
armcpu->next_instruction += 4;
armcpu->R[15] = armcpu->next_instruction + 4;
return MMU.MMU_WAIT32[armcpu->proc_ID][(armcpu->instruct_adr>>24)&0xF];
}
armcpu->instruction = MMU_readHWord(armcpu->proc_ID, armcpu->next_instruction);
armcpu->instruction = MMU_readHWordACL(armcpu->proc_ID, armcpu->next_instruction,ACCESS_EXECUTION);
armcpu->instruct_adr = armcpu->next_instruction;
armcpu->next_instruction = armcpu->next_instruction + 2;
armcpu->R[15] = armcpu->next_instruction + 2;