Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-27 15:07:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "[nce] Added case for access fault handling to manage page edge cases"

Browse source
This commit is contained in:
CamilleLaVey 2026-03-10 03:01:02 -04:00
parent b88ca5b635
commit 8c077fc4cd
1 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/core/arm/nce/arm_nce.cpp
View file

@ -43,10 +43,6 @@ fpsimd_context* GetFloatingPointState(mcontext_t& host_ctx) {
using namespace Common::Literals; using namespace Common::Literals;
constexpr u32 StackSize = 128_KiB; constexpr u32 StackSize = 128_KiB;
constexpr u64 CacheLineSize = 64;
constexpr u64 SplitPageAccessWindow = 64;
constexpr size_t MaxPreciseAccessPages = 256;
constexpr u8 MaxPreciseAccessPageWeight = 4;
} // namespace } // namespace
@ -162,35 +158,19 @@ bool ArmNce::HandleGuestAlignmentFault(GuestContext* guest_ctx, void* raw_info,
} }
bool ArmNce::HandleGuestAccessFault(GuestContext* guest_ctx, void* raw_info, void* raw_context) { bool ArmNce::HandleGuestAccessFault(GuestContext* guest_ctx, void* raw_info, void* raw_context) {
auto& host_ctx = static_cast<ucontext_t*>(raw_context)->uc_mcontext;
auto* fpctx = GetFloatingPointState(host_ctx);
auto* info = static_cast<siginfo_t*>(raw_info); auto* info = static_cast<siginfo_t*>(raw_info);
auto* parent = guest_ctx->parent; auto* parent = guest_ctx->parent;
const u64 fault_addr = reinterpret_cast<u64>(info->si_addr); // Try to handle an invalid access.
const Common::ProcessAddress addr = fault_addr & ~Memory::YUZU_PAGEMASK; // TODO: handle accesses which split a page?
const u64 page_offset = fault_addr & Memory::YUZU_PAGEMASK; const Common::ProcessAddress addr =
(reinterpret_cast<u64>(info->si_addr) & ~Memory::YUZU_PAGEMASK);
auto& memory = guest_ctx->parent->m_running_thread->GetOwnerProcess()->GetMemory(); auto& memory = guest_ctx->parent->m_running_thread->GetOwnerProcess()->GetMemory();
bool handled = memory.InvalidateNCE(addr, Memory::YUZU_PAGESIZE); if (memory.InvalidateNCE(addr, Memory::YUZU_PAGESIZE)) {
if (page_offset < SplitPageAccessWindow && addr >= Memory::YUZU_PAGESIZE) {
handled |= memory.InvalidateNCE(addr - Memory::YUZU_PAGESIZE, Memory::YUZU_PAGESIZE);
}
if (page_offset + SplitPageAccessWindow > Memory::YUZU_PAGESIZE) {
handled |= memory.InvalidateNCE(addr + Memory::YUZU_PAGESIZE, Memory::YUZU_PAGESIZE);
}
if (handled) {
// We handled the access successfully and are returning to guest code. // We handled the access successfully and are returning to guest code.
return true; return true;
} }
if (auto next_pc = MatchAndExecuteOneInstruction(memory, &host_ctx, fpctx); next_pc) {
parent->MarkPreciseAccessFaultWindow(fault_addr);
host_ctx.pc = *next_pc;
return true;
}
// We couldn't handle the access. // We couldn't handle the access.
return HandleFailedGuestFault(guest_ctx, raw_info, raw_context); return HandleFailedGuestFault(guest_ctx, raw_info, raw_context);
} }