clarification
This commit is contained in:
parent
3699768ac9
commit
659763f903
|
@ -117,7 +117,7 @@ namespace melonDS::ARMInterpreter
|
|||
cpu->R[(cpu->CurInstr>>12) & 0xF] = val; \
|
||||
}
|
||||
|
||||
// TODO: user mode
|
||||
// TODO: user mode (note: ldrt w/ rd = 15 may be an undef instr)
|
||||
#define A_LDR_POST \
|
||||
u32 addr = cpu->R[(cpu->CurInstr>>16) & 0xF]; \
|
||||
u32 val; bool dataabort = !cpu->DataRead32(addr, &val); \
|
||||
|
@ -144,7 +144,7 @@ namespace melonDS::ARMInterpreter
|
|||
if (((cpu->CurInstr>>12) & 0xF) == 15) cpu->JumpTo(val); \
|
||||
else cpu->R[(cpu->CurInstr>>12) & 0xF] = val; \
|
||||
|
||||
// TODO: user mode
|
||||
// TODO: user mode (note: ldrbt w/ rd = 15 may be an undef instr)
|
||||
#define A_LDRB_POST \
|
||||
u32 addr = cpu->R[(cpu->CurInstr>>16) & 0xF]; \
|
||||
u32 val; bool dataabort = !cpu->DataRead8(addr, &val); \
|
||||
|
@ -262,7 +262,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
|
|||
if (r&1) { A_UNK(cpu); return; } /* checkme */ \
|
||||
if (!cpu->DataRead32 (offset , &cpu->R[r ])) {cpu->AddCycles_CDI(); return;} \
|
||||
u32 val; if (!cpu->DataRead32S(offset+4, &val)) {cpu->AddCycles_CDI(); return;} \
|
||||
if (r == 14) A_UNK(cpu); /* hang??? */ \
|
||||
if (r == 14) A_UNK(cpu); /* checkme */ \
|
||||
else cpu->R[r+1] = val; \
|
||||
cpu->AddCycles_CDI(); \
|
||||
if (cpu->CurInstr & (1<<21)) cpu->R[(cpu->CurInstr>>16) & 0xF] = offset;
|
||||
|
@ -274,7 +274,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
|
|||
if (r&1) { A_UNK(cpu); return; } /* checkme */ \
|
||||
if (!cpu->DataRead32 (addr , &cpu->R[r ])) {cpu->AddCycles_CDI(); return;} \
|
||||
u32 val; if (!cpu->DataRead32S(addr+4, &val)) {cpu->AddCycles_CDI(); return;} \
|
||||
if (r == 14) A_UNK(cpu); /*hang??? */ \
|
||||
if (r == 14) A_UNK(cpu); /* checkme */ \
|
||||
else cpu->R[r+1] = val; \
|
||||
cpu->AddCycles_CDI(); \
|
||||
cpu->R[(cpu->CurInstr>>16) & 0xF] += offset;
|
||||
|
@ -327,7 +327,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
|
|||
cpu->AddCycles_CDI(); \
|
||||
if (dataabort) return; \
|
||||
val = (s32)(s8)val; \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); /* hang??? */ \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); \
|
||||
else cpu->R[(cpu->CurInstr>>12) & 0xF] = val; \
|
||||
if (cpu->CurInstr & (1<<21)) cpu->R[(cpu->CurInstr>>16) & 0xF] = offset;
|
||||
|
||||
|
@ -337,7 +337,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
|
|||
cpu->AddCycles_CDI(); \
|
||||
if (dataabort) return; \
|
||||
val = (s32)(s8)val; \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); /* hang??? */ \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); \
|
||||
else cpu->R[(cpu->CurInstr>>12) & 0xF] = val; \
|
||||
cpu->R[(cpu->CurInstr>>16) & 0xF] += offset;
|
||||
|
||||
|
@ -347,7 +347,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
|
|||
cpu->AddCycles_CDI(); \
|
||||
if (dataabort) return; \
|
||||
val = (s32)(s16)val; \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); /* checkme */ \
|
||||
else cpu->R[(cpu->CurInstr>>12) & 0xF] = val; \
|
||||
if (cpu->CurInstr & (1<<21)) cpu->R[(cpu->CurInstr>>16) & 0xF] = offset;
|
||||
|
||||
|
@ -357,7 +357,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
|
|||
cpu->AddCycles_CDI(); \
|
||||
if (dataabort) return; \
|
||||
val = (s32)(s16)val; \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); \
|
||||
if (((cpu->CurInstr>>12) & 0xF) == 15) A_UNK(cpu); /* checkme */ \
|
||||
else cpu->R[(cpu->CurInstr>>12) & 0xF] = val; \
|
||||
cpu->R[(cpu->CurInstr>>16) & 0xF] += offset;
|
||||
|
||||
|
|
Loading…
Reference in New Issue