Merge commit 'dec0d4ec4153bf9fc2b78ae6c2df45b6ea8dde7a' as 'external/sdl/SDL'

external/sdl/SDL/src/thread/n3ds/SDL_syscond.c

@@ -0,0 +1,118 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_internal.h"
+
+#ifdef SDL_THREAD_N3DS
+
+/* An implementation of condition variables using libctru's CondVar */
+
+#include "SDL_sysmutex_c.h"
+
+struct SDL_Condition
+{
+    CondVar cond_variable;
+};
+
+/* Create a condition variable */
+SDL_Condition *SDL_CreateCondition(void)
+{
+    SDL_Condition *cond = (SDL_Condition *)SDL_malloc(sizeof(SDL_Condition));
+    if (cond) {
+        CondVar_Init(&cond->cond_variable);
+    } else {
+        SDL_OutOfMemory();
+    }
+    return cond;
+}
+
+/* Destroy a condition variable */
+void SDL_DestroyCondition(SDL_Condition *cond)
+{
+    if (cond) {
+        SDL_free(cond);
+    }
+}
+
+/* Restart one of the threads that are waiting on the condition variable */
+int SDL_SignalCondition(SDL_Condition *cond)
+{
+    if (cond == NULL) {
+        return SDL_InvalidParamError("cond");
+    }
+
+    CondVar_Signal(&cond->cond_variable);
+    return 0;
+}
+
+/* Restart all threads that are waiting on the condition variable */
+int SDL_BroadcastCondition(SDL_Condition *cond)
+{
+    if (cond == NULL) {
+        return SDL_InvalidParamError("cond");
+    }
+
+    CondVar_Broadcast(&cond->cond_variable);
+    return 0;
+}
+
+/* Wait on the condition variable for at most 'timeoutNS' nanoseconds.
+   The mutex must be locked before entering this function!
+   The mutex is unlocked during the wait, and locked again after the wait.
+
+Typical use:
+
+Thread A:
+    SDL_LockMutex(lock);
+    while ( ! condition ) {
+        SDL_WaitCondition(cond, lock);
+    }
+    SDL_UnlockMutex(lock);
+
+Thread B:
+    SDL_LockMutex(lock);
+    ...
+    condition = true;
+    ...
+    SDL_SignalCondition(cond);
+    SDL_UnlockMutex(lock);
+ */
+int SDL_WaitConditionTimeoutNS(SDL_Condition *cond, SDL_Mutex *mutex, Sint64 timeoutNS)
+{
+    Result res;
+
+    if (cond == NULL) {
+        return SDL_InvalidParamError("cond");
+    }
+    if (mutex == NULL) {
+        return SDL_InvalidParamError("mutex");
+    }
+
+    res = 0;
+    if (timeoutNS < 0) {
+        CondVar_Wait(&cond->cond_variable, &mutex->lock.lock);
+    } else {
+        res = CondVar_WaitTimeout(&cond->cond_variable, &mutex->lock.lock, timeoutNS);
+    }
+
+    return R_SUCCEEDED(res) ? 0 : SDL_MUTEX_TIMEDOUT;
+}
+
+#endif /* SDL_THREAD_N3DS */

external/sdl/SDL/src/thread/n3ds/SDL_sysmutex.c

@@ -0,0 +1,86 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_internal.h"
+
+#ifdef SDL_THREAD_N3DS
+
+/* An implementation of mutexes using libctru's RecursiveLock */
+
+#include "SDL_sysmutex_c.h"
+
+/* Create a mutex */
+SDL_Mutex *SDL_CreateMutex(void)
+{
+    SDL_Mutex *mutex;
+
+    /* Allocate mutex memory */
+    mutex = (SDL_Mutex *)SDL_malloc(sizeof(*mutex));
+    if (mutex) {
+        RecursiveLock_Init(&mutex->lock);
+    } else {
+        SDL_OutOfMemory();
+    }
+    return mutex;
+}
+
+/* Free the mutex */
+void SDL_DestroyMutex(SDL_Mutex *mutex)
+{
+    if (mutex) {
+        SDL_free(mutex);
+    }
+}
+
+/* Lock the mutex */
+int SDL_LockMutex(SDL_Mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doesn't know about NULL mutexes */
+{
+    if (mutex == NULL) {
+        return 0;
+    }
+
+    RecursiveLock_Lock(&mutex->lock);
+
+    return 0;
+}
+
+/* try Lock the mutex */
+int SDL_TryLockMutex(SDL_Mutex *mutex)
+{
+    if (mutex == NULL) {
+        return 0;
+    }
+
+    return RecursiveLock_TryLock(&mutex->lock);
+}
+
+/* Unlock the mutex */
+int SDL_UnlockMutex(SDL_Mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doesn't know about NULL mutexes */
+{
+    if (mutex == NULL) {
+        return 0;
+    }
+
+    RecursiveLock_Unlock(&mutex->lock);
+
+    return 0;
+}
+
+#endif /* SDL_THREAD_N3DS */

external/sdl/SDL/src/thread/n3ds/SDL_sysmutex_c.h

@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_internal.h"
+
+#ifndef SDL_sysmutex_c_h_
+#define SDL_sysmutex_c_h_
+
+#include <3ds.h>
+
+struct SDL_Mutex
+{
+    RecursiveLock lock;
+};
+
+#endif /* SDL_sysmutex_c_h */

external/sdl/SDL/src/thread/n3ds/SDL_syssem.c

@@ -0,0 +1,118 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_internal.h"
+
+#ifdef SDL_THREAD_N3DS
+
+/* An implementation of semaphores using libctru's LightSemaphore */
+
+#include <3ds.h>
+
+int WaitOnSemaphoreFor(SDL_Semaphore *sem, Sint64 timeout);
+
+struct SDL_Semaphore
+{
+    LightSemaphore semaphore;
+};
+
+SDL_Semaphore *SDL_CreateSemaphore(Uint32 initial_value)
+{
+    SDL_Semaphore *sem;
+
+    if (initial_value > SDL_MAX_SINT16) {
+        SDL_SetError("Initial semaphore value too high for this platform");
+        return NULL;
+    }
+
+    sem = (SDL_Semaphore *)SDL_malloc(sizeof(*sem));
+    if (sem == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    LightSemaphore_Init(&sem->semaphore, initial_value, SDL_MAX_SINT16);
+
+    return sem;
+}
+
+/* WARNING:
+   You cannot call this function when another thread is using the semaphore.
+*/
+void SDL_DestroySemaphore(SDL_Semaphore *sem)
+{
+    SDL_free(sem);
+}
+
+int SDL_WaitSemaphoreTimeoutNS(SDL_Semaphore *sem, Sint64 timeoutNS)
+{
+    if (sem == NULL) {
+        return SDL_InvalidParamError("sem");
+    }
+
+    if (timeoutNS == SDL_MUTEX_MAXWAIT) {
+        LightSemaphore_Acquire(&sem->semaphore, 1);
+        return 0;
+    }
+
+    if (LightSemaphore_TryAcquire(&sem->semaphore, 1) != 0) {
+        return WaitOnSemaphoreFor(sem, timeoutNS);
+    }
+
+    return 0;
+}
+
+int WaitOnSemaphoreFor(SDL_Semaphore *sem, Sint64 timeout)
+{
+    Uint64 stop_time = SDL_GetTicksNS() + timeout;
+    Uint64 current_time = SDL_GetTicksNS();
+    while (current_time < stop_time) {
+        if (LightSemaphore_TryAcquire(&sem->semaphore, 1) == 0) {
+            return 0;
+        }
+        /* 100 microseconds seems to be the sweet spot */
+        SDL_DelayNS(SDL_US_TO_NS(100));
+        current_time = SDL_GetTicksNS();
+    }
+
+    /* If we failed, yield to avoid starvation on busy waits */
+    SDL_DelayNS(1);
+    return SDL_MUTEX_TIMEDOUT;
+}
+
+Uint32 SDL_GetSemaphoreValue(SDL_Semaphore *sem)
+{
+    if (sem == NULL) {
+        SDL_InvalidParamError("sem");
+        return 0;
+    }
+    return sem->semaphore.current_count;
+}
+
+int SDL_PostSemaphore(SDL_Semaphore *sem)
+{
+    if (sem == NULL) {
+        return SDL_InvalidParamError("sem");
+    }
+    LightSemaphore_Release(&sem->semaphore, 1);
+    return 0;
+}
+
+#endif /* SDL_THREAD_N3DS */

external/sdl/SDL/src/thread/n3ds/SDL_systhread.c

@@ -0,0 +1,139 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_internal.h"
+
+#ifdef SDL_THREAD_N3DS
+
+/* Thread management routines for SDL */
+
+#include "../SDL_systhread.h"
+
+/* N3DS has very limited RAM (128MB), so we put a limit on thread stack size. */
+#define N3DS_THREAD_STACK_SIZE_MAX     (16 * 1024)
+#define N3DS_THREAD_STACK_SIZE_DEFAULT (4 * 1024)
+
+#define N3DS_THREAD_PRIORITY_LOW           0x3F /**< Minimum priority */
+#define N3DS_THREAD_PRIORITY_MEDIUM        0x2F /**< Slightly higher than main thread (0x30) */
+#define N3DS_THREAD_PRIORITY_HIGH          0x19 /**< High priority for non-video work */
+#define N3DS_THREAD_PRIORITY_TIME_CRITICAL 0x18 /**< Highest priority */
+
+static size_t GetStackSize(size_t requested_size);
+
+static void ThreadEntry(void *arg)
+{
+    SDL_RunThread((SDL_Thread *)arg);
+    threadExit(0);
+}
+
+#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+#error "SDL_PASSED_BEGINTHREAD_ENDTHREAD is not supported on N3DS"
+#endif
+
+int SDL_SYS_CreateThread(SDL_Thread *thread)
+{
+    s32 priority;
+    size_t stack_size = GetStackSize(thread->stacksize);
+    svcGetThreadPriority(&priority, CUR_THREAD_HANDLE);
+
+    thread->handle = threadCreate(ThreadEntry,
+                                  thread,
+                                  stack_size,
+                                  priority,
+                                  -1,
+                                  false);
+
+    if (thread->handle == NULL) {
+        return SDL_SetError("Couldn't create thread");
+    }
+
+    return 0;
+}
+
+static size_t GetStackSize(size_t requested_size)
+{
+    if (requested_size == 0) {
+        return N3DS_THREAD_STACK_SIZE_DEFAULT;
+    }
+
+    if (requested_size > N3DS_THREAD_STACK_SIZE_MAX) {
+        SDL_LogWarn(SDL_LOG_CATEGORY_SYSTEM,
+                    "Requested a thread size of %zu,"
+                    " falling back to the maximum supported of %zu\n",
+                    requested_size,
+                    N3DS_THREAD_STACK_SIZE_MAX);
+        requested_size = N3DS_THREAD_STACK_SIZE_MAX;
+    }
+    return requested_size;
+}
+
+void SDL_SYS_SetupThread(const char *name)
+{
+    return;
+}
+
+SDL_threadID SDL_ThreadID(void)
+{
+    u32 thread_ID = 0;
+    svcGetThreadId(&thread_ID, CUR_THREAD_HANDLE);
+    return (SDL_threadID)thread_ID;
+}
+
+int SDL_SYS_SetThreadPriority(SDL_ThreadPriority sdl_priority)
+{
+    s32 svc_priority;
+    switch (sdl_priority) {
+    case SDL_THREAD_PRIORITY_LOW:
+        svc_priority = N3DS_THREAD_PRIORITY_LOW;
+        break;
+    case SDL_THREAD_PRIORITY_NORMAL:
+        svc_priority = N3DS_THREAD_PRIORITY_MEDIUM;
+        break;
+    case SDL_THREAD_PRIORITY_HIGH:
+        svc_priority = N3DS_THREAD_PRIORITY_HIGH;
+        break;
+    case SDL_THREAD_PRIORITY_TIME_CRITICAL:
+        svc_priority = N3DS_THREAD_PRIORITY_TIME_CRITICAL;
+        break;
+    default:
+        svc_priority = N3DS_THREAD_PRIORITY_MEDIUM;
+    }
+    return (int)svcSetThreadPriority(CUR_THREAD_HANDLE, svc_priority);
+}
+
+void SDL_SYS_WaitThread(SDL_Thread *thread)
+{
+    Result res = threadJoin(thread->handle, U64_MAX);
+
+    /*
+      Detached threads can be waited on, but should NOT be cleaned manually
+      as it would result in a fatal error.
+    */
+    if (R_SUCCEEDED(res) && SDL_AtomicGet(&thread->state) != SDL_THREAD_STATE_DETACHED) {
+        threadFree(thread->handle);
+    }
+}
+
+void SDL_SYS_DetachThread(SDL_Thread *thread)
+{
+    threadDetach(thread->handle);
+}
+
+#endif /* SDL_THREAD_N3DS */

external/sdl/SDL/src/thread/n3ds/SDL_systhread_c.h

@@ -0,0 +1,30 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_internal.h"
+
+#ifndef SDL_systhread_c_h_
+#define SDL_systhread_c_h_
+
+#include <3ds.h>
+
+typedef Thread SYS_ThreadHandle;
+
+#endif /* SDL_systhread_c_h_ */