From 8d3435291b399f7f178957fa0dbfe9e5b1e57fc9 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 3 Oct 2025 21:55:49 +0100 Subject: [PATCH] fix windows compile --- src/doomdef.h | 2 +- src/qs22j.c | 3 +- src/sdl/i_system.cpp | 234 ++++++++++++++++++++++--------------------- 3 files changed, 120 insertions(+), 119 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index eba5ed5b1..30419978b 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -92,7 +92,7 @@ extern char logfilename[1024]; // not sure if this belongs here lul // TODO: figure out whats preventing 32bit windows from working with libbacktrace -#if defined(_WIN32) && !defined(MINGW64) +#if defined(_WIN32) && !defined(__MINGW64__) #define HAVE_DRMINGW #endif diff --git a/src/qs22j.c b/src/qs22j.c index bc94d6648..3b0b6151a 100644 --- a/src/qs22j.c +++ b/src/qs22j.c @@ -18,7 +18,6 @@ #include #include "qs22j.h" -#include "doomdef.h" #define INSORTTHRESH 5 // if n < this use insertion sort // MUST be >= 2 @@ -89,7 +88,7 @@ static inline char *med3(char *a, char *b, char *c, int (*compar)(const void *, void qs22j(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) { // we have nothing to sort - if (UNLIKELY(nmemb <= 1)) + if (__builtin_expect(!!(nmemb <= 1), 0) ) //UNLIKELY - thx windoze { return; } diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 97d9b27b4..7314995e8 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1453,122 +1453,7 @@ void I_SleepDuration(precise_t duration) #endif } -#ifdef HAVE_THREADS -#include "../core/thread_pool.h" -static std::thread::id g_main_thread_id; -#endif - -boolean g_in_exiting_signal_handler = false; - -static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg) -{ - const char *sigmsg; - - switch (signal_num) - { -#ifdef SIGINT - case SIGINT: - sigmsg = ("SIGINT - SRB2Kart-Saturn was interrupted prematurely by the user."); - break; -#endif - case SIGILL: // illegal instruction - invalid function image - sigmsg = ("SIGILL - SRB2Kart-Saturn has attempted to execute an illegal instruction and needs to close."); - break; - case SIGFPE: // mathematical exception - sigmsg = ("SIGFPE - SRB2Kart-Saturn has encountered a mathematical exception and needs to close."); - break; - case SIGSEGV: // segment violation - sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close."); - break; -#ifdef SIGTERM - case SIGTERM: // Software termination signal from kill - sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal."); - break; -#endif -#ifdef SIGBREAK - case SIGBREAK: // Ctrl-Break sequence - sigmsg =("SIGBREAK - SRB2Kart-Saturn was terminated by a Ctrl-Break sequence.") - break; -#endif - case SIGABRT: // abnormal termination triggered by abort call - sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal."); - break; - default: - sprintf(signal_msg, "Signal number %d", signal_num); - sigmsg = (core_dumped ? "Unknown signal" : signal_msg); - break; - } - - if (core_dumped) - { - if (sigmsg) - sprintf(signal_msg, "%s (core dumped)", sigmsg); - else - strcat(signal_msg, " (core dumped)"); - } - else - { - sprintf(signal_msg, "%s", sigmsg); - } -} - -static void I_ReportSignal(int num, int coredumped) -{ - char sigmsg[512]; - - I_PrintSignal(num, coredumped, sigmsg); - - size_t len = strlen(sigmsg); - snprintf(sigmsg + len, sizeof(sigmsg) - len, "\n\nCrash report has been saved into %s", CRASH_LOGFILE_NAME); - I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg); - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Process killed by signal", sigmsg, NULL); -} - -#ifndef NEWSIGNALHANDLER -FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) -{ - g_in_exiting_signal_handler = true; - -#ifdef HAVE_THREADS - if (g_main_thread_id != std::this_thread::get_id()) - { - // Do not attempt any sort of recovery if this signal triggers off the main thread - signal(num, SIG_DFL); - raise(num); - exit(-2); - } -#endif - - D_QuitNetGame(); // Fix server freezes - -#ifdef HAVE_LIBBACKTRACE - write_backtrace(BT_CRASH_REASON_SIGNAL(num)); -#endif - - I_ReportSignal(num, 0); - I_ShutdownSystem(); - signal(num, SIG_DFL); //default signal action - raise(num); - I_Quit(); -} -#endif - -FUNCNORETURN static ATTRNORETURN void quit_handler(int num) -{ -#ifdef HAVE_THREADS - if (g_main_thread_id != std::this_thread::get_id()) - { - // Do not attempt any sort of recovery if this signal triggers off the main thread - signal(num, SIG_DFL); - raise(num); - exit(-2); - } -#endif - - signal(num, SIG_DFL); //default signal action - raise(num); - I_Quit(); -} +static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg); #ifdef HAVE_LIBBACKTRACE #include @@ -1750,6 +1635,123 @@ static void write_backtrace(bt_crash_reason_t reason) } #endif +#ifdef HAVE_THREADS +#include "../core/thread_pool.h" +static std::thread::id g_main_thread_id; +#endif + +boolean g_in_exiting_signal_handler = false; + +static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg) +{ + const char *sigmsg; + + switch (signal_num) + { +#ifdef SIGINT + case SIGINT: + sigmsg = ("SIGINT - SRB2Kart-Saturn was interrupted prematurely by the user."); + break; +#endif + case SIGILL: // illegal instruction - invalid function image + sigmsg = ("SIGILL - SRB2Kart-Saturn has attempted to execute an illegal instruction and needs to close."); + break; + case SIGFPE: // mathematical exception + sigmsg = ("SIGFPE - SRB2Kart-Saturn has encountered a mathematical exception and needs to close."); + break; + case SIGSEGV: // segment violation + sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close."); + break; +#ifdef SIGTERM + case SIGTERM: // Software termination signal from kill + sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal."); + break; +#endif +#ifdef SIGBREAK + case SIGBREAK: // Ctrl-Break sequence + sigmsg =("SIGBREAK - SRB2Kart-Saturn was terminated by a Ctrl-Break sequence."); + break; +#endif + case SIGABRT: // abnormal termination triggered by abort call + sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal."); + break; + default: + sprintf(signal_msg, "Signal number %d", signal_num); + sigmsg = (core_dumped ? "Unknown signal" : signal_msg); + break; + } + + if (core_dumped) + { + if (sigmsg) + sprintf(signal_msg, "%s (core dumped)", sigmsg); + else + strcat(signal_msg, " (core dumped)"); + } + else + { + sprintf(signal_msg, "%s", sigmsg); + } +} + +static void I_ReportSignal(int num, int coredumped) +{ + char sigmsg[512]; + + I_PrintSignal(num, coredumped, sigmsg); + + size_t len = strlen(sigmsg); + snprintf(sigmsg + len, sizeof(sigmsg) - len, "\n\nCrash report has been saved into %s", CRASH_LOGFILE_NAME); + I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg); + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Process killed by signal", sigmsg, NULL); +} + +#ifndef NEWSIGNALHANDLER +FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) +{ + g_in_exiting_signal_handler = true; + +#ifdef HAVE_THREADS + if (g_main_thread_id != std::this_thread::get_id()) + { + // Do not attempt any sort of recovery if this signal triggers off the main thread + signal(num, SIG_DFL); + raise(num); + exit(-2); + } +#endif + + D_QuitNetGame(); // Fix server freezes + +#ifdef HAVE_LIBBACKTRACE + write_backtrace(BT_CRASH_REASON_SIGNAL(num)); +#endif + + I_ReportSignal(num, 0); + I_ShutdownSystem(); + signal(num, SIG_DFL); //default signal action + raise(num); + I_Quit(); +} +#endif + +FUNCNORETURN static ATTRNORETURN void quit_handler(int num) +{ +#ifdef HAVE_THREADS + if (g_main_thread_id != std::this_thread::get_id()) + { + // Do not attempt any sort of recovery if this signal triggers off the main thread + signal(num, SIG_DFL); + raise(num); + exit(-2); + } +#endif + + signal(num, SIG_DFL); //default signal action + raise(num); + I_Quit(); +} + static void I_RegisterSignals(void) { #ifdef HAVE_THREADS