From 4e25bce61668e771e7727437e91682b6acbdd5df Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Thu, 3 Jul 2025 15:29:07 +0200 Subject: [PATCH 1/3] FEXServer: Drop use of FEX_TODO macro --- Source/Tools/FEXServer/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Tools/FEXServer/Main.cpp b/Source/Tools/FEXServer/Main.cpp index 69de04a77..0e7113c3e 100644 --- a/Source/Tools/FEXServer/Main.cpp +++ b/Source/Tools/FEXServer/Main.cpp @@ -63,7 +63,7 @@ void ClientMsgHandler(int FD, FEXServerClient::Logging::PacketMsg* const Msg, co namespace { void ActionHandler(int sig, siginfo_t* info, void* context) { - // FEX_TODO("Fix this"); + // TODO: Fix this if (sig == SIGINT) { // Someone trying to kill us. Shutdown. ProcessPipe::Shutdown(); From a3a55d19b8078b037c4563852eab2c3cca0c8b9d Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Thu, 3 Jul 2025 15:26:30 +0200 Subject: [PATCH 2/3] Revert "FEX_TODO: Convert some XXX to FEX_TODO" This reverts commit 256df76674cd358d11972eb40c7ebbb5198cf972. --- FEXCore/Source/Interface/Core/Core.cpp | 3 +-- FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h | 22 ++++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/FEXCore/Source/Interface/Core/Core.cpp b/FEXCore/Source/Interface/Core/Core.cpp index e7931fb5d..616e2c953 100644 --- a/FEXCore/Source/Interface/Core/Core.cpp +++ b/FEXCore/Source/Interface/Core/Core.cpp @@ -52,7 +52,6 @@ $end_info$ #include #include #include -#include #include #include @@ -405,7 +404,7 @@ void ContextImpl::ExecuteThread(FEXCore::Core::InternalThreadState* Thread) { } // If it is the parent thread that died then just leave - FEX_TODO("This doesn't make sense when the parent thread doesn't outlive its children"); + // TODO: This doesn't make sense when the parent thread doesn't outlive its children } void ContextImpl::InitializeCompiler(FEXCore::Core::InternalThreadState* Thread) { diff --git a/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h b/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h index 69c9f4191..91d2e6039 100644 --- a/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h +++ b/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h @@ -6,17 +6,15 @@ #endif #if FEX_WARN_TODO -// FEX_TODO_ISSUE(github ticket number, "comment") -#define FEX_TODO_ISSUE(github_ticket, comment) DO_PRAGMA(GCC warning "TODO: https://github.com/FEX-Emu/FEX/issues/" #github_ticket comment); -// FEX_TODO("comment") -#define FEX_TODO(comment) DO_PRAGMA(GCC warning "TODO: " comment); +// Use like FEX_TODO_ISSUE(github ticket number, username, comment) or +// FEX_TODO_ISSUE(github ticket number, comment) +#define FEX_TODO_ISSUE(number, ...) DO_PRAGMA(GCC warning "TODO: https://github.com/FEX-Emu/FEX/issues/" #number __VA_ARGS__) +// Use like FEX_TODO(username, comment) or FEX_TODO(comment) +#define FEX_TODO(...) DO_PRAGMA(GCC warning "TODO: " __VA_ARGS__); #else -// FEX_TODO_ISSUE(github ticket number, "comment") -#define FEX_TODO_ISSUE(github_ticket, comment) -// FEX_TODO("comment") -#define FEX_TODO(comment) +// Use like FEX_TODO_ISSUE(github ticket number, username, comment) or +// FEX_TODO_ISSUE(github ticket number, comment) +#define FEX_TODO_ISSUE(number, ...) do {} while (false) +// Use like FEX_TODO(username, comment) or FEX_TODO(comment) +#define FEX_TODO(...) do {} while (false) #endif - -// For linking to tickets, non-todo -// FEX_TICKET(github ticket number) or FEX_TICKET(github ticket number, "comment") -#define FEX_TICKET(github_ticket, ...) \ No newline at end of file From 3b67e573b5cd668aabcfa7e644cc9ae6ae35a9b9 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Thu, 3 Jul 2025 15:26:52 +0200 Subject: [PATCH 3/3] Revert "FexHeaderUtils: Add TodoDefines" This reverts commit ad1fd7f54b2e04932066afab350a95e72310ed9a. --- FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h diff --git a/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h b/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h deleted file mode 100644 index 91d2e6039..000000000 --- a/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: MIT -#pragma once - -#ifndef DO_PRAGMA -#define DO_PRAGMA(x) _Pragma(#x) -#endif - -#if FEX_WARN_TODO -// Use like FEX_TODO_ISSUE(github ticket number, username, comment) or -// FEX_TODO_ISSUE(github ticket number, comment) -#define FEX_TODO_ISSUE(number, ...) DO_PRAGMA(GCC warning "TODO: https://github.com/FEX-Emu/FEX/issues/" #number __VA_ARGS__) -// Use like FEX_TODO(username, comment) or FEX_TODO(comment) -#define FEX_TODO(...) DO_PRAGMA(GCC warning "TODO: " __VA_ARGS__); -#else -// Use like FEX_TODO_ISSUE(github ticket number, username, comment) or -// FEX_TODO_ISSUE(github ticket number, comment) -#define FEX_TODO_ISSUE(number, ...) do {} while (false) -// Use like FEX_TODO(username, comment) or FEX_TODO(comment) -#define FEX_TODO(...) do {} while (false) -#endif