From a934a36a1876016fdf012d8177f4138e697e054c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20=C3=85stholm?= <[EMAIL REDACTED]>
Date: Sun, 16 Mar 2025 18:43:19 +0100
Subject: [PATCH] emscripten: Don't use legacy JS library functions for
assertions
(cherry picked from commit 54f5b73333c6fb067af37f976718a5fef8890931)
---
src/SDL_assert.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/SDL_assert.c b/src/SDL_assert.c
index 62a90ca225fa0..2440d04b1ec34 100644
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -34,15 +34,7 @@
#endif
#ifdef SDL_PLATFORM_EMSCRIPTEN
- #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
+#include <emscripten.h>
#endif
// The size of the stack buffer to use for rendering assert messages.
@@ -252,7 +244,7 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
for (;;) {
bool okay = true;
/* *INDENT-OFF* */ // clang-format off
- char *buf = (char *) MAIN_THREAD_EM_ASM_PTR({
+ int reply = MAIN_THREAD_EM_ASM_INT({
var str =
UTF8ToString($0) + '\n\n' +
'Abort/Retry/Ignore/AlwaysIgnore? [ariA] :';
@@ -260,26 +252,32 @@ static SDL_AssertState SDLCALL SDL_PromptAssertion(const SDL_AssertData *data, v
if (reply === null) {
reply = "i";
}
- return allocate(intArrayFromString(reply), 'i8', ALLOC_NORMAL);
+ return reply.length === 1 ? reply.charCodeAt(0) : -1;
}, message);
/* *INDENT-ON* */ // clang-format on
- if (SDL_strcmp(buf, "a") == 0) {
+ switch (reply) {
+ case 'a':
state = SDL_ASSERTION_ABORT;
+ break;
#if 0 // (currently) no break functionality on Emscripten
- } else if (SDL_strcmp(buf, "b") == 0) {
+ case 'b':
state = SDL_ASSERTION_BREAK;
+ break;
#endif
- } else if (SDL_strcmp(buf, "r") == 0) {
+ case 'r':
state = SDL_ASSERTION_RETRY;
- } else if (SDL_strcmp(buf, "i") == 0) {
+ break;
+ case 'i':
state = SDL_ASSERTION_IGNORE;
- } else if (SDL_strcmp(buf, "A") == 0) {
+ break;
+ case 'A':
state = SDL_ASSERTION_ALWAYS_IGNORE;
- } else {
+ break;
+ default:
okay = false;
+ break;
}
- free(buf); // This should NOT be SDL_free()
if (okay) {
break;