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

Fix GDB_STUB compile

This commit is contained in:
gocha 2009-09-04 15:27:53 +00:00
parent f710b64523
commit c24d88fa35
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desmume/src/armcpu.cpp
View File

@ -372,6 +372,7 @@ FORCEINLINE static u32 armcpu_prefetch()
if(armcpu->CPSR.bits.T == 0) if(armcpu->CPSR.bits.T == 0)
{ {
u32 curInstruction = armcpu->next_instruction;
#ifdef GDB_STUB #ifdef GDB_STUB
temp_instruction = temp_instruction =
armcpu->mem_if->prefetch32( armcpu->mem_if->data, armcpu->mem_if->prefetch32( armcpu->mem_if->data,
@ -384,20 +385,20 @@ FORCEINLINE static u32 armcpu_prefetch()
armcpu->R[15] = armcpu->next_instruction + 4; armcpu->R[15] = armcpu->next_instruction + 4;
} }
#else #else
u32 curInstruction = armcpu->next_instruction;
armcpu->instruction = MMU_read32_acl(PROCNUM, curInstruction&0xFFFFFFFC,CP15_ACCESS_EXECUTE); armcpu->instruction = MMU_read32_acl(PROCNUM, curInstruction&0xFFFFFFFC,CP15_ACCESS_EXECUTE);
armcpu->instruct_adr = curInstruction; armcpu->instruct_adr = curInstruction;
armcpu->next_instruction = curInstruction + 4; armcpu->next_instruction = curInstruction + 4;
armcpu->R[15] = curInstruction + 8; armcpu->R[15] = curInstruction + 8;
#endif #endif
return MMU.MMU_WAIT32[PROCNUM][(curInstruction>>24)&0xF]; return MMU.MMU_WAIT32[PROCNUM][(curInstruction>>24)&0xF];
} }
u32 curInstruction = armcpu->next_instruction;
#ifdef GDB_STUB #ifdef GDB_STUB
temp_instruction = temp_instruction =
armcpu->mem_if->prefetch16( armcpu->mem_if->data, armcpu->mem_if->prefetch16( armcpu->mem_if->data,
armcpu->next_instruction); armcpu->next_instruction);
if ( !armcpu->stalled) { if ( !armcpu->stalled) {
armcpu->instruction = temp_instruction; armcpu->instruction = temp_instruction;
@ -406,7 +407,6 @@ FORCEINLINE static u32 armcpu_prefetch()
armcpu->R[15] = armcpu->next_instruction + 2; armcpu->R[15] = armcpu->next_instruction + 2;
} }
#else #else
u32 curInstruction = armcpu->next_instruction;
armcpu->instruction = MMU_read16_acl(PROCNUM, curInstruction&0xFFFFFFFE,CP15_ACCESS_EXECUTE); armcpu->instruction = MMU_read16_acl(PROCNUM, curInstruction&0xFFFFFFFE,CP15_ACCESS_EXECUTE);
armcpu->instruct_adr = curInstruction; armcpu->instruct_adr = curInstruction;
armcpu->next_instruction = curInstruction + 2; armcpu->next_instruction = curInstruction + 2;