mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

emscripten: Don't use legacy JS library functions for assertions 

(cherry picked from commit 54f5b73333)
(cherry picked from commit a8f0eb4c33)
This commit is contained in:
Carl Åstholm 2025-03-16 18:43:19 +01:00 committed by Sam Lantinga
parent 3f6efbf2df
commit 2708e08f40
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/SDL_assert.c
View File

@ -42,15 +42,7 @@
#endif #endif
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)
#include <emscripten.h> #include <emscripten.h>
/* older Emscriptens don't have this, but we need to for wasm64 compatibility. */
#ifndef MAIN_THREAD_EM_ASM_PTR
#ifdef __wasm64__
#error You need to upgrade your Emscripten compiler to support wasm64
#else
#define MAIN_THREAD_EM_ASM_PTR MAIN_THREAD_EM_ASM_INT
#endif
#endif
#endif #endif
/* The size of the stack buffer to use for rendering assert messages. */ /* The size of the stack buffer to use for rendering assert messages. */
@ -259,7 +251,7 @@ static SDL_assert_state SDLCALL SDL_PromptAssertion(const SDL_assert_data *data,
for (;;) { for (;;) {
SDL_bool okay = SDL_TRUE; SDL_bool okay = SDL_TRUE;
/* *INDENT-OFF* */ /* clang-format off */ /* *INDENT-OFF* */ /* clang-format off */
char *buf = (char *) MAIN_THREAD_EM_ASM_PTR({ int reply = MAIN_THREAD_EM_ASM_INT({
var str = var str =
UTF8ToString($0) + '\n\n' + UTF8ToString($0) + '\n\n' +
'Abort/Retry/Ignore/AlwaysIgnore? [ariA] :'; 'Abort/Retry/Ignore/AlwaysIgnore? [ariA] :';
@ -267,26 +259,31 @@ static SDL_assert_state SDLCALL SDL_PromptAssertion(const SDL_assert_data *data,
if (reply === null) { if (reply === null) {
reply = "i"; reply = "i";
} }
return allocate(intArrayFromString(reply), 'i8', ALLOC_NORMAL); return reply.length === 1 ? reply.charCodeAt(0) : -1;
}, message); }, message);
/* *INDENT-ON* */ /* clang-format on */ /* *INDENT-ON* */ /* clang-format on */
if (SDL_strcmp(buf, "a") == 0) { switch (reply) {
case 'a':
state = SDL_ASSERTION_ABORT; state = SDL_ASSERTION_ABORT;
#if 0 /* (currently) no break functionality on Emscripten */ #if 0 /* (currently) no break functionality on Emscripten */
} else if (SDL_strcmp(buf, "b") == 0) { case 'b':
state = SDL_ASSERTION_BREAK; state = SDL_ASSERTION_BREAK;
break;
#endif #endif
} else if (SDL_strcmp(buf, "r") == 0) { case 'r':
state = SDL_ASSERTION_RETRY; state = SDL_ASSERTION_RETRY;
} else if (SDL_strcmp(buf, "i") == 0) { break;
case 'i':
state = SDL_ASSERTION_IGNORE; state = SDL_ASSERTION_IGNORE;
} else if (SDL_strcmp(buf, "A") == 0) { break;
case 'A':
state = SDL_ASSERTION_ALWAYS_IGNORE; state = SDL_ASSERTION_ALWAYS_IGNORE;
} else { break;
default:
okay = SDL_FALSE; okay = SDL_FALSE;
break;
} }
free(buf);
if (okay) { if (okay) {
break; break;