From 715910256f9a6561cda99305f3ab9baa58c7e06b Mon Sep 17 00:00:00 2001 From: Exverge Date: Thu, 16 Jul 2026 18:29:34 -0400 Subject: [PATCH] [debug] breakpoint instruction is unsupported on win32 --- src/common/assert.cpp | 4 ++-- src/common/multi_level_page_table.inc | 2 +- src/core/arm/nce/arm_nce.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/assert.cpp b/src/common/assert.cpp index 4c8f57882b..4b34c3d05d 100644 --- a/src/common/assert.cpp +++ b/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 _MSC_VER +#ifndef _WIN32 # if defined(ARCHITECTURE_x86_64) __asm__ __volatile__("int $3"); # elif defined(ARCHITECTURE_arm64) @@ -24,7 +24,7 @@ void AssertFailSoftImpl() { # else __builtin_debugtrap(); # endif -#else // Clang/GCC ^^^ MSVC vvv +#else // Non-Windows Clang/GCC ^^^ Windows vvv DebugBreak(); #endif } diff --git a/src/common/multi_level_page_table.inc b/src/common/multi_level_page_table.inc index a2e61a161e..2d8a8ed7b4 100644 --- a/src/common/multi_level_page_table.inc +++ b/src/common/multi_level_page_table.inc @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2026 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2021 yuzu Emulator Project diff --git a/src/core/arm/nce/arm_nce.cpp b/src/core/arm/nce/arm_nce.cpp index f6ecefaacb..941b498038 100644 --- a/src/core/arm/nce/arm_nce.cpp +++ b/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