Browse Source

Revert "[debug] breakpoint instruction is unsupported on win32"

This reverts commit 715910256f.
remotes/1785372757367212240/tmp_refs/heads/variable-page-size
Exverge 4 weeks ago
parent
commit
90480182e3
No known key found for this signature in database GPG Key ID: DAD399BCC5FB77E4
  1. 4
      src/common/assert.cpp
  2. 2
      src/common/multi_level_page_table.inc
  3. 2
      src/core/arm/nce/arm_nce.cpp

4
src/common/assert.cpp

@ -16,7 +16,7 @@ __declspec(dllimport) void __stdcall DebugBreak(void);
void AssertFailSoftImpl() {
if (Settings::values.use_debug_asserts) {
Common::Log::Stop();
#ifndef _WIN32
#ifndef _MSC_VER
# if defined(ARCHITECTURE_x86_64)
__asm__ __volatile__("int $3");
# elif defined(ARCHITECTURE_arm64)
@ -24,7 +24,7 @@ void AssertFailSoftImpl() {
# else
__builtin_debugtrap();
# endif
#else // Non-Windows Clang/GCC ^^^ Windows vvv
#else // Clang/GCC ^^^ MSVC vvv
DebugBreak();
#endif
}

2
src/common/multi_level_page_table.inc

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-FileCopyrightText: 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2021 yuzu Emulator Project

2
src/core/arm/nce/arm_nce.cpp

@ -455,7 +455,7 @@ HaltReason ArmNce::RunThread(Kernel::KThread* thread) {
#if defined(__APPLE__)
ASSERT(pthread_setspecific(ContextKey, &thread_params) == 0);
#elif defined(_WIN32)
ASSERT_MSG(TlsSetValue(ContextKey, &thread_params) != 0, "Failed to set TLS value: id {}, error {}", ContextKey, GetLastError());
ASSERT_MSG(TlsSetValue(ContextKey, &thread_params) == 0, "Failed to set TLS value: id {}, error {}", ContextKey, GetLastError());
#endif
// Move non-critical operations outside the locked section

Loading…
Cancel
Save