From 148dc7b4806a216663f347d489869b59dc13925e Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 6 Apr 2026 19:12:51 +0200 Subject: [arm] remove vtable bounce hack (#3776) horrible hack anyways, and PKZA shouldn't need it anymore Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3776 Reviewed-by: Maufeat Co-authored-by: lizzie Co-committed-by: lizzie --- src/core/hle/kernel/physical_core.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/core/hle/kernel/physical_core.cpp') diff --git a/src/core/hle/kernel/physical_core.cpp b/src/core/hle/kernel/physical_core.cpp index 77cdab76d7..e4aff43d82 100644 --- a/src/core/hle/kernel/physical_core.cpp +++ b/src/core/hle/kernel/physical_core.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project @@ -103,26 +103,12 @@ void PhysicalCore::RunThread(Kernel::KThread* thread) { const bool data_abort = True(hr & Core::HaltReason::DataAbort); const bool interrupt = True(hr & Core::HaltReason::BreakLoop); - bool may_abort = true; // Ignore aborting virtual functions (for debugging) - if (prefetch_abort && ::Settings::values.vtable_bouncing) { - auto& lock = m_kernel.GlobalSchedulerContext().SchedulerLock(); - lock.Lock(); - Kernel::Svc::ThreadContext ctx; - interface->GetContext(ctx); - LOG_WARNING(Core_ARM, "vtable bouncing {:016X}", ctx.lr); - ctx.pc = ctx.lr; - ctx.r[0] = 0; - interface->SetContext(ctx); - lock.Unlock(); - may_abort = false; - } - // Since scheduling may occur here, we cannot use any cached // state after returning from calls we make. // Notify the debugger and go to sleep if a breakpoint was hit, // or if the thread is unable to continue for any reason. - if (breakpoint || (prefetch_abort && may_abort)) { + if (breakpoint || prefetch_abort) { if (breakpoint) { interface->RewindBreakpointInstruction(); } -- cgit v1.2.3