piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-22 05:40:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

melonDSi: skeleton in place

Browse Source
This commit is contained in:
Arisotura
2019-06-15 13:09:11 +02:00
parent 0e421ccebd
commit 83d23939db
7 changed files with 523 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/CP15.cpp
View File

@ -19,6 +19,7 @@
#include <stdio.h>
#include <string.h>
#include "NDS.h"
#include "DSi.h"
#include "ARM.h"
@ -680,7 +681,8 @@ u32 ARMv5::CodeRead32(u32 addr, bool branch)
if (CodeMem.Mem) return *(u32*)&CodeMem.Mem[addr & CodeMem.Mask];
return NDS::ARM9Read32(addr);
//return NDS::ARM9Read32(addr);
return DSi::ARM9Read32(addr);
}
@ -699,7 +701,8 @@ void ARMv5::DataRead8(u32 addr, u32* val)
return;
}
*val = NDS::ARM9Read8(addr);
*val = DSi::ARM9Read8(addr);
//*val = NDS::ARM9Read8(addr);
DataCycles = MemTimings[addr >> 12][1];
}
@ -720,7 +723,8 @@ void ARMv5::DataRead16(u32 addr, u32* val)
return;
}
*val = NDS::ARM9Read16(addr);
*val = DSi::ARM9Read16(addr);
//*val = NDS::ARM9Read16(addr);
DataCycles = MemTimings[addr >> 12][1];
}
@ -741,7 +745,8 @@ void ARMv5::DataRead32(u32 addr, u32* val)
return;
}
*val = NDS::ARM9Read32(addr);
*val = DSi::ARM9Read32(addr);
//*val = NDS::ARM9Read32(addr);
DataCycles = MemTimings[addr >> 12][2];
}
@ -762,7 +767,8 @@ void ARMv5::DataRead32S(u32 addr, u32* val)
return;
}
*val = NDS::ARM9Read32(addr);
*val = DSi::ARM9Read32(addr);
//*val = NDS::ARM9Read32(addr);
DataCycles += MemTimings[addr >> 12][3];
}
@ -781,7 +787,8 @@ void ARMv5::DataWrite8(u32 addr, u8 val)
return;
}
NDS::ARM9Write8(addr, val);
DSi::ARM9Write8(addr, val);
//NDS::ARM9Write8(addr, val);
DataCycles = MemTimings[addr >> 12][1];
}
@ -802,7 +809,8 @@ void ARMv5::DataWrite16(u32 addr, u16 val)
return;
}
NDS::ARM9Write16(addr, val);
DSi::ARM9Write16(addr, val);
//NDS::ARM9Write16(addr, val);
DataCycles = MemTimings[addr >> 12][1];
}
@ -823,7 +831,8 @@ void ARMv5::DataWrite32(u32 addr, u32 val)
return;
}
NDS::ARM9Write32(addr, val);
DSi::ARM9Write32(addr, val);
//NDS::ARM9Write32(addr, val);
DataCycles = MemTimings[addr >> 12][2];
}
@ -844,7 +853,8 @@ void ARMv5::DataWrite32S(u32 addr, u32 val)
return;
}
NDS::ARM9Write32(addr, val);
DSi::ARM9Write32(addr, val);
//NDS::ARM9Write32(addr, val);
DataCycles += MemTimings[addr >> 12][3];
}
@ -857,6 +867,7 @@ void ARMv5::GetCodeMemRegion(u32 addr, NDS::MemRegion* region)
return;
}*/
NDS::ARM9GetMemRegion(addr, false, &CodeMem);
DSi::ARM9GetMemRegion(addr, false, &CodeMem);
//NDS::ARM9GetMemRegion(addr, false, &CodeMem);
}