piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-29 17:19:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

make the set-timing functions a tad less hacky

Browse Source
This commit is contained in:
Arisotura
2021-06-01 02:22:46 +02:00
parent 43879a8fd8
commit 20a0e8828b
2 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/CP15.cpp
View File

@ -225,7 +225,8 @@ void ARMv5::UpdatePURegion(u32 n)
usermask |= 0x40; usermask |= 0x40;
} }
//printf("PU region %d: %08X-%08X, user=%02X priv=%02X\n", n, start<<12, end<<12, usermask, privmask); printf("PU region %d: %08X-%08X, user=%02X priv=%02X\n", n, start<<12, end<<12, usermask, privmask);
printf("%08X/%08X\n", PU_DataRW, PU_CodeRW);
for (u32 i = start; i < end; i++) for (u32 i = start; i < end; i++)
{ {
@ -233,7 +234,7 @@ void ARMv5::UpdatePURegion(u32 n)
PU_PrivMap[i] = privmask; PU_PrivMap[i] = privmask;
} }
UpdateRegionTimings(start<<12, end<<12); UpdateRegionTimings(start, end);
} }
void ARMv5::UpdatePURegions(bool update_all) void ARMv5::UpdatePURegions(bool update_all)
@ -249,7 +250,7 @@ void ARMv5::UpdatePURegions(bool update_all)
memset(PU_UserMap, mask, 0x100000); memset(PU_UserMap, mask, 0x100000);
memset(PU_PrivMap, mask, 0x100000); memset(PU_PrivMap, mask, 0x100000);
UpdateRegionTimings(0x00000000, 0xFFFFFFFF); UpdateRegionTimings(0x00000, 0x100000);
return; return;
} }
@ -266,16 +267,11 @@ void ARMv5::UpdatePURegions(bool update_all)
// TODO: this is way unoptimized // TODO: this is way unoptimized
// should be okay unless the game keeps changing shit, tho // should be okay unless the game keeps changing shit, tho
if (update_all) UpdateRegionTimings(0x00000000, 0xFFFFFFFF); if (update_all) UpdateRegionTimings(0x00000, 0x100000);
} }
void ARMv5::UpdateRegionTimings(u32 addrstart, u32 addrend) void ARMv5::UpdateRegionTimings(u32 addrstart, u32 addrend)
{ {
addrstart >>= 12;
addrend >>= 12;
if (addrend == 0xFFFFF) addrend++;
for (u32 i = addrstart; i < addrend; i++) for (u32 i = addrstart; i < addrend; i++)
{ {
u8 pu = PU_Map[i]; u8 pu = PU_Map[i];
@ -420,7 +416,7 @@ void ARMv5::ICacheInvalidateAll()
void ARMv5::CP15Write(u32 id, u32 val) void ARMv5::CP15Write(u32 id, u32 val)
{ {
//printf("CP15 write op %03X %08X %08X\n", id, val, R[15]); //if(id!=0x704)printf("CP15 write op %03X %08X %08X\n", id, val, R[15]);
switch (id) switch (id)
{ {
@ -520,7 +516,7 @@ void ARMv5::CP15Write(u32 id, u32 val)
return; return;
case 0x502: // data permissions case 0x502: // data permissions
{ {printf("SET DATAPERM %08X (%08X %08X)\n", val,PU_DataRW,PU_DataRW ^ val);
u32 diff = PU_DataRW ^ val; u32 diff = PU_DataRW ^ val;
PU_DataRW = val; PU_DataRW = val;
for (u32 i = 0; i < 8; i++) for (u32 i = 0; i < 8; i++)
@ -814,6 +810,12 @@ void ARMv5::DataRead16(u32 addr, u32* val)
void ARMv5::DataRead32(u32 addr, u32* val) void ARMv5::DataRead32(u32 addr, u32* val)
{ {
/*if (!(PU_Map[addr>>12] & 0x01))
{printf("addr %08X very bad\n", addr);
DataAbort();
return;
}*/
DataRegion = addr; DataRegion = addr;
addr &= ~3; addr &= ~3;
@ -908,6 +910,12 @@ void ARMv5::DataWrite16(u32 addr, u16 val)
void ARMv5::DataWrite32(u32 addr, u32 val) void ARMv5::DataWrite32(u32 addr, u32 val)
{ {
/*if (!(PU_Map[addr>>12] & 0x02))
{printf("addr %08X wr very bad\n", addr);
DataAbort();
return;
}*/
DataRegion = addr; DataRegion = addr;
addr &= ~3; addr &= ~3;

64
src/NDS.cpp
View File

@ -238,10 +238,8 @@ void DeInit()
void SetARM9RegionTimings(u32 addrstart, u32 addrend, int buswidth, int nonseq, int seq) void SetARM9RegionTimings(u32 addrstart, u32 addrend, int buswidth, int nonseq, int seq)
{ {
addrstart >>= 14; addrstart >>= 2;
addrend >>= 14; addrend >>= 2;
if (addrend == 0x3FFFF) addrend++;
int N16, S16, N32, S32; int N16, S16, N32, S32;
N16 = nonseq; N16 = nonseq;
@ -265,17 +263,13 @@ void SetARM9RegionTimings(u32 addrstart, u32 addrend, int buswidth, int nonseq,
ARM9MemTimings[i][3] = S32; ARM9MemTimings[i][3] = S32;
} }
ARM9->UpdateRegionTimings(addrstart<<14, addrend == 0x40000 ARM9->UpdateRegionTimings(addrstart<<2, addrend<<2);
? 0xFFFFFFFF
: (addrend<<14));
} }
void SetARM7RegionTimings(u32 addrstart, u32 addrend, int buswidth, int nonseq, int seq) void SetARM7RegionTimings(u32 addrstart, u32 addrend, int buswidth, int nonseq, int seq)
{ {
addrstart >>= 15; addrstart >>= 3;
addrend >>= 15; addrend >>= 3;
if (addrend == 0x1FFFF) addrend++;
int N16, S16, N32, S32; int N16, S16, N32, S32;
N16 = nonseq; N16 = nonseq;
@ -314,25 +308,25 @@ void InitTimings()
// TODO: DSi-specific timings!! // TODO: DSi-specific timings!!
SetARM9RegionTimings(0x00000000, 0xFFFFFFFF, 32, 1 + 3, 1); // void SetARM9RegionTimings(0x00000, 0x100000, 32, 1 + 3, 1); // void
SetARM9RegionTimings(0xFFFF0000, 0xFFFFFFFF, 32, 1 + 3, 1); // BIOS SetARM9RegionTimings(0xFFFF0, 0x100000, 32, 1 + 3, 1); // BIOS
SetARM9RegionTimings(0x02000000, 0x03000000, 16, 8, 1); // main RAM SetARM9RegionTimings(0x02000, 0x03000, 16, 8, 1); // main RAM
SetARM9RegionTimings(0x03000000, 0x04000000, 32, 1 + 3, 1); // ARM9/shared WRAM SetARM9RegionTimings(0x03000, 0x04000, 32, 1 + 3, 1); // ARM9/shared WRAM
SetARM9RegionTimings(0x04000000, 0x05000000, 32, 1 + 3, 1); // IO SetARM9RegionTimings(0x04000, 0x05000, 32, 1 + 3, 1); // IO
SetARM9RegionTimings(0x05000000, 0x06000000, 16, 1 + 3, 1); // palette SetARM9RegionTimings(0x05000, 0x06000, 16, 1 + 3, 1); // palette
SetARM9RegionTimings(0x06000000, 0x07000000, 16, 1 + 3, 1); // VRAM SetARM9RegionTimings(0x06000, 0x07000, 16, 1 + 3, 1); // VRAM
SetARM9RegionTimings(0x07000000, 0x08000000, 32, 1 + 3, 1); // OAM SetARM9RegionTimings(0x07000, 0x08000, 32, 1 + 3, 1); // OAM
// ARM7 // ARM7
SetARM7RegionTimings(0x00000000, 0xFFFFFFFF, 32, 1, 1); // void SetARM7RegionTimings(0x00000, 0x100000, 32, 1, 1); // void
SetARM7RegionTimings(0x00000000, 0x00010000, 32, 1, 1); // BIOS SetARM7RegionTimings(0x00000, 0x00010, 32, 1, 1); // BIOS
SetARM7RegionTimings(0x02000000, 0x03000000, 16, 8, 1); // main RAM SetARM7RegionTimings(0x02000, 0x03000, 16, 8, 1); // main RAM
SetARM7RegionTimings(0x03000000, 0x04000000, 32, 1, 1); // ARM7/shared WRAM SetARM7RegionTimings(0x03000, 0x04000, 32, 1, 1); // ARM7/shared WRAM
SetARM7RegionTimings(0x04000000, 0x04800000, 32, 1, 1); // IO SetARM7RegionTimings(0x04000, 0x04800, 32, 1, 1); // IO
SetARM7RegionTimings(0x06000000, 0x07000000, 16, 1, 1); // ARM7 VRAM SetARM7RegionTimings(0x06000, 0x07000, 16, 1, 1); // ARM7 VRAM
// handled later: GBA slot, wifi // handled later: GBA slot, wifi
} }
@ -1240,8 +1234,8 @@ void SetWifiWaitCnt(u16 val)
WifiWaitCnt = val; WifiWaitCnt = val;
const int ntimings[4] = {10, 8, 6, 18}; const int ntimings[4] = {10, 8, 6, 18};
SetARM7RegionTimings(0x04800000, 0x04808000, 16, ntimings[val & 0x3], (val & 0x4) ? 4 : 6); SetARM7RegionTimings(0x04800, 0x04808, 16, ntimings[val & 0x3], (val & 0x4) ? 4 : 6);
SetARM7RegionTimings(0x04808000, 0x04810000, 16, ntimings[(val>>3) & 0x3], (val & 0x20) ? 4 : 10); SetARM7RegionTimings(0x04808, 0x04810, 16, ntimings[(val>>3) & 0x3], (val & 0x20) ? 4 : 10);
} }
void SetGBASlotTimings() void SetGBASlotTimings()
@ -1259,19 +1253,19 @@ void SetGBASlotTimings()
if (curcpu == 0) if (curcpu == 0)
{ {
SetARM9RegionTimings(0x08000000, 0x0A000000, 16, romN + 3, romS); SetARM9RegionTimings(0x08000, 0x0A000, 16, romN + 3, romS);
SetARM9RegionTimings(0x0A000000, 0x0B000000, 8, ramN + 3, ramN); SetARM9RegionTimings(0x0A000, 0x0B000, 8, ramN + 3, ramN);
SetARM7RegionTimings(0x08000000, 0x0A000000, 32, 1, 1); SetARM7RegionTimings(0x08000, 0x0A000, 32, 1, 1);
SetARM7RegionTimings(0x0A000000, 0x0B000000, 32, 1, 1); SetARM7RegionTimings(0x0A000, 0x0B000, 32, 1, 1);
} }
else else
{ {
SetARM9RegionTimings(0x08000000, 0x0A000000, 32, 1, 1); SetARM9RegionTimings(0x08000, 0x0A000, 32, 1, 1);
SetARM9RegionTimings(0x0A000000, 0x0B000000, 32, 1, 1); SetARM9RegionTimings(0x0A000, 0x0B000, 32, 1, 1);
SetARM7RegionTimings(0x08000000, 0x0A000000, 16, romN, romS); SetARM7RegionTimings(0x08000, 0x0A000, 16, romN, romS);
SetARM7RegionTimings(0x0A000000, 0x0B000000, 8, ramN, ramN); SetARM7RegionTimings(0x0A000, 0x0B000, 8, ramN, ramN);
} }
// this open-bus implementation is a rough way of simulating the way values // this open-bus implementation is a rough way of simulating the way values