github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-14 15:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPU/Recompiler: Fix ICache updates on ARM32

Browse Source
This commit is contained in:
Stenzek 2024-12-14 01:05:32 +10:00
parent 5687dd22bd
commit e683c89770
No known key found for this signature in database
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/cpu_recompiler_arm32.cpp
View File

@ -178,8 +178,8 @@ void armEmitFarLoad(vixl::aarch32::Assembler* armAsm, const vixl::aarch32::Regis
armAsm->ldr(reg, vixl::aarch32::MemOperand(reg)); armAsm->ldr(reg, vixl::aarch32::MemOperand(reg));
} }
void armEmitFarStore(vixl::aarch32::Assembler* armAsm, const vixl::aarch32::Register& reg, const void* addr, [[maybe_unused]] void armEmitFarStore(vixl::aarch32::Assembler* armAsm, const vixl::aarch32::Register& reg,
const vixl::aarch32::Register& tempreg) const void* addr, const vixl::aarch32::Register& tempreg)
{ {
armMoveAddressToReg(armAsm, tempreg, addr); armMoveAddressToReg(armAsm, tempreg, addr);
armAsm->str(reg, vixl::aarch32::MemOperand(tempreg)); armAsm->str(reg, vixl::aarch32::MemOperand(tempreg));
@ -634,12 +634,20 @@ void CPU::ARM32Recompiler::GenerateICacheCheckAndUpdate()
const u32 line = GetICacheLine(current_pc); const u32 line = GetICacheLine(current_pc);
const u32 offset = OFFSETOF(State, icache_tags) + (line * sizeof(u32)); const u32 offset = OFFSETOF(State, icache_tags) + (line * sizeof(u32));
// Offsets must be <4K on ARM.
MemOperand line_addr = MemOperand(RSTATE, offset);
if (offset >= 4096)
{
armEmitMov(armAsm, RSCRATCH, offset);
line_addr = MemOperand(RSTATE, RSCRATCH);
}
Label cache_hit; Label cache_hit;
armAsm->ldr(existing_tag_reg, MemOperand(RSTATE, offset)); armAsm->ldr(existing_tag_reg, line_addr);
armAsm->cmp(existing_tag_reg, current_tag_reg); armAsm->cmp(existing_tag_reg, current_tag_reg);
armAsm->b(eq, &cache_hit); armAsm->b(eq, &cache_hit);
armAsm->str(current_tag_reg, MemOperand(RSTATE, offset)); armAsm->str(current_tag_reg, line_addr);
armAsm->add(ticks_reg, ticks_reg, armCheckAddSubConstant(static_cast<u32>(fill_ticks))); armAsm->add(ticks_reg, ticks_reg, armCheckAddSubConstant(static_cast<u32>(fill_ticks)));
armAsm->bind(&cache_hit); armAsm->bind(&cache_hit);