ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CPU/Recompiler: Fix ICache update codegen on RISCV64

This commit is contained in:
Stenzek 2024-12-31 15:41:29 +10:00
parent 4c08c716c4
commit 34f2600f99
No known key found for this signature in database
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/cpu_recompiler_riscv64.cpp
View File

@ -560,7 +560,7 @@ void CPU::RISCV64Recompiler::GenerateICacheCheckAndUpdate()
if (m_block->HasFlag(CodeCache::BlockFlags::NeedsDynamicFetchTicks)) if (m_block->HasFlag(CodeCache::BlockFlags::NeedsDynamicFetchTicks))
{ {
rvEmitFarLoad(rvAsm, RARG2, GetFetchMemoryAccessTimePtr()); rvEmitFarLoad(rvAsm, RARG2, GetFetchMemoryAccessTimePtr());
rvAsm->LW(RARG1, PTR(&g_state.pending_ticks)); rvAsm->LWU(RARG1, PTR(&g_state.pending_ticks));
rvEmitMov(rvAsm, RARG3, m_block->size); rvEmitMov(rvAsm, RARG3, m_block->size);
rvAsm->MULW(RARG2, RARG2, RARG3); rvAsm->MULW(RARG2, RARG2, RARG3);
rvAsm->ADD(RARG1, RARG1, RARG2); rvAsm->ADD(RARG1, RARG1, RARG2);
@ -568,7 +568,7 @@ void CPU::RISCV64Recompiler::GenerateICacheCheckAndUpdate()
} }
else else
{ {
rvAsm->LW(RARG1, PTR(&g_state.pending_ticks)); rvAsm->LWU(RARG1, PTR(&g_state.pending_ticks));
SafeADDIW(RARG1, RARG1, static_cast<u32>(m_block->uncached_fetch_ticks)); SafeADDIW(RARG1, RARG1, static_cast<u32>(m_block->uncached_fetch_ticks));
rvAsm->SW(RARG1, PTR(&g_state.pending_ticks)); rvAsm->SW(RARG1, PTR(&g_state.pending_ticks));
} }
@ -579,8 +579,12 @@ void CPU::RISCV64Recompiler::GenerateICacheCheckAndUpdate()
const auto& current_tag_reg = RARG2; const auto& current_tag_reg = RARG2;
const auto& existing_tag_reg = RARG3; const auto& existing_tag_reg = RARG3;
// start of block, nothing should be using this
const auto& maddr_reg = biscuit::t0;
DebugAssert(!IsHostRegAllocated(maddr_reg.Index()));
VirtualMemoryAddress current_pc = m_block->pc & ICACHE_TAG_ADDRESS_MASK; VirtualMemoryAddress current_pc = m_block->pc & ICACHE_TAG_ADDRESS_MASK;
rvAsm->LW(ticks_reg, PTR(&g_state.pending_ticks)); rvAsm->LWU(ticks_reg, PTR(&g_state.pending_ticks));
rvEmitMov(rvAsm, current_tag_reg, current_pc); rvEmitMov(rvAsm, current_tag_reg, current_pc);
for (u32 i = 0; i < m_block->icache_line_count; i++, current_pc += ICACHE_LINE_SIZE) for (u32 i = 0; i < m_block->icache_line_count; i++, current_pc += ICACHE_LINE_SIZE)
@ -592,12 +596,22 @@ void CPU::RISCV64Recompiler::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));
// TODO: Verify sign extension here... // Offsets must fit in signed 12 bits.
Label cache_hit; Label cache_hit;
rvAsm->LW(existing_tag_reg, offset, RSTATE); if (offset >= 2048)
rvAsm->BEQ(existing_tag_reg, current_tag_reg, &cache_hit); {
SafeADDI(maddr_reg, RSTATE, offset);
rvAsm->LW(existing_tag_reg, 0, maddr_reg);
rvAsm->BEQ(existing_tag_reg, current_tag_reg, &cache_hit);
rvAsm->SW(current_tag_reg, 0, maddr_reg);
}
else
{
rvAsm->LW(existing_tag_reg, offset, RSTATE);
rvAsm->BEQ(existing_tag_reg, current_tag_reg, &cache_hit);
rvAsm->SW(current_tag_reg, offset, RSTATE);
}
rvAsm->SW(current_tag_reg, offset, RSTATE);
SafeADDIW(ticks_reg, ticks_reg, static_cast<u32>(fill_ticks)); SafeADDIW(ticks_reg, ticks_reg, static_cast<u32>(fill_ticks));
rvAsm->Bind(&cache_hit); rvAsm->Bind(&cache_hit);