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

Enable instruction cache routines. Fixed typos in constants.

This commit is contained in:
DesperateProgrammer 2024-01-19 10:00:02 +01:00
parent 1019afee92
commit 434c234098
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ARM.h
View File

@ -313,6 +313,7 @@ public:
void ICacheLookup(u32 addr); void ICacheLookup(u32 addr);
void ICacheInvalidateByAddr(u32 addr); void ICacheInvalidateByAddr(u32 addr);
void ICacheInvalidateAll(); void ICacheInvalidateAll();
bool IsAddressICachable(u32 addr);
void CP15Write(u32 id, u32 val); void CP15Write(u32 id, u32 val);
u32 CP15Read(u32 id) const; u32 CP15Read(u32 id) const;

18
src/CP15.cpp
View File

@ -417,6 +417,11 @@ void ARMv5::ICacheInvalidateAll()
ICacheTags[i] = 1; ICacheTags[i] = 1;
} }
bool ARMv5::IsAddressICachable(u32 addr)
{
return PU_Map[addr >> 12] & 0x40 ;
}
void ARMv5::CP15Write(u32 id, u32 val) void ARMv5::CP15Write(u32 id, u32 val)
{ {
@ -430,7 +435,7 @@ void ARMv5::CP15Write(u32 id, u32 val)
val &= 0x000FF085; val &= 0x000FF085;
CP15Control &= ~0x000FF085; CP15Control &= ~0x000FF085;
CP15Control |= val; CP15Control |= val;
//printf("CP15Control = %08X (%08X->%08X)\n", CP15Control, old, val); //Log(LogLevel::Debug, "CP15Control = %08X (%08X->%08X)\n", CP15Control, old, val);
UpdateDTCMSetting(); UpdateDTCMSetting();
UpdateITCMSetting(); UpdateITCMSetting();
if ((old & 0x1005) != (val & 0x1005)) if ((old & 0x1005) != (val & 0x1005))
@ -800,6 +805,7 @@ u32 ARMv5::CodeRead32(u32 addr, bool branch)
} }
CodeCycles = RegionCodeCycles; CodeCycles = RegionCodeCycles;
#if 0
if (CodeCycles == 0xFF) // cached memory. hax if (CodeCycles == 0xFF) // cached memory. hax
{ {
if (branch || !(addr & 0x1F)) if (branch || !(addr & 0x1F))
@ -809,6 +815,16 @@ u32 ARMv5::CodeRead32(u32 addr, bool branch)
//return *(u32*)&CurICacheLine[addr & 0x1C]; //return *(u32*)&CurICacheLine[addr & 0x1C];
} }
#else
if (CP15Control & CP15_CACHE_CR_ICACHEENABLE)
{
if (IsAddressICachable(addr))
{
ICacheLookup(addr);
return *(u32*)&CurICacheLine[addr & (ICACHE_LINELENGTH - 4)];
}
}
#endif
if (CodeMem.Mem) return *(u32*)&CodeMem.Mem[addr & CodeMem.Mask]; if (CodeMem.Mem) return *(u32*)&CodeMem.Mem[addr & CodeMem.Mask];

9
src/MemConstants.h
View File

@ -44,10 +44,11 @@ constexpr u32 ICACHE_LINELENGTH_LOG2 = ICACHE_LINELENGTH_ENCODED + 3;
constexpr u32 ICACHE_LINELENGTH = 8 * (1 << ICACHE_LINELENGTH_ENCODED); constexpr u32 ICACHE_LINELENGTH = 8 * (1 << ICACHE_LINELENGTH_ENCODED);
constexpr u32 ICACHE_LINESPERSET = ICACHE_SIZE / (ICACHE_SETS * ICACHE_LINELENGTH); constexpr u32 ICACHE_LINESPERSET = ICACHE_SIZE / (ICACHE_SETS * ICACHE_LINELENGTH);
constexpr u32 CP15_CACHE_CR_ROUNDROBIN = (1 < 14); constexpr u32 CP15_CR_MPUENABLE = (1 << 0);
constexpr u32 CP15_CACHE_CR_ICACHEENABLE = (1 < 12); constexpr u32 CP15_CACHE_CR_ROUNDROBIN = (1 << 14);
constexpr u32 CP15_CACHE_CR_DCACHEENABLE = (1 < 2); constexpr u32 CP15_CACHE_CR_ICACHEENABLE = (1 << 12);
constexpr u32 CP15_CACHE_CR_WRITEBUFFERENABLE = (1 < 3); constexpr u32 CP15_CACHE_CR_DCACHEENABLE = (1 << 2);
constexpr u32 CP15_CACHE_CR_WRITEBUFFERENABLE = (1 << 3);
} }
#endif // MELONDS_MEMCONSTANTS_H #endif // MELONDS_MEMCONSTANTS_H