From 30f41c02aec763d32e62351452da9ef582bc3472 Mon Sep 17 00:00:00 2001 From: 3gg <3gg@shellblade.net> Date: Fri, 6 Mar 2026 13:30:59 -0800 Subject: Move contrib libraries to contrib repo --- contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex.c | 100 ----------------- contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex_c.h | 21 ---- contrib/SDL-3.2.8/src/thread/psp/SDL_syssem.c | 119 --------------------- contrib/SDL-3.2.8/src/thread/psp/SDL_systhread.c | 112 ------------------- contrib/SDL-3.2.8/src/thread/psp/SDL_systhread_c.h | 24 ----- 5 files changed, 376 deletions(-) delete mode 100644 contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex.c delete mode 100644 contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex_c.h delete mode 100644 contrib/SDL-3.2.8/src/thread/psp/SDL_syssem.c delete mode 100644 contrib/SDL-3.2.8/src/thread/psp/SDL_systhread.c delete mode 100644 contrib/SDL-3.2.8/src/thread/psp/SDL_systhread_c.h (limited to 'contrib/SDL-3.2.8/src/thread/psp') diff --git a/contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex.c b/contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex.c deleted file mode 100644 index c8ed80d..0000000 --- a/contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2025 Sam Lantinga - - 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_PSP - -// An implementation of mutexes using semaphores - -#include "SDL_systhread_c.h" - -#include -#include - -#define SCE_KERNEL_MUTEX_ATTR_RECURSIVE 0x0200U - -struct SDL_Mutex -{ - SceLwMutexWorkarea lock; -}; - -SDL_Mutex *SDL_CreateMutex(void) -{ - SDL_Mutex *mutex = (SDL_Mutex *)SDL_malloc(sizeof(*mutex)); - if (mutex) { - const SceInt32 res = sceKernelCreateLwMutex( - &mutex->lock, - "SDL mutex", - SCE_KERNEL_MUTEX_ATTR_RECURSIVE, - 0, - NULL); - - if (res < 0) { - SDL_free(mutex); - mutex = NULL; - SDL_SetError("Error trying to create mutex: %lx", res); - } - } - return mutex; -} - -void SDL_DestroyMutex(SDL_Mutex *mutex) -{ - if (mutex) { - sceKernelDeleteLwMutex(&mutex->lock); - SDL_free(mutex); - } -} - -void SDL_LockMutex(SDL_Mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS // clang doesn't know about NULL mutexes -{ - if (mutex) { - const SceInt32 res = sceKernelLockLwMutex(&mutex->lock, 1, NULL); - SDL_assert(res == SCE_KERNEL_ERROR_OK); // assume we're in a lot of trouble if this assert fails. - } -} - -bool SDL_TryLockMutex(SDL_Mutex *mutex) -{ - bool result = true; - if (mutex) { - const SceInt32 res = sceKernelTryLockLwMutex(&mutex->lock, 1); - if (res == SCE_KERNEL_ERROR_OK) { - result = true; - } else if (res == SCE_KERNEL_ERROR_WAIT_TIMEOUT) { - result = false; - } else { - SDL_assert(res == SCE_KERNEL_ERROR_OK); // assume we're in a lot of trouble if this assert fails. - result = false; - } - } - return result; -} - -void SDL_UnlockMutex(SDL_Mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS // clang doesn't know about NULL mutexes -{ - if (mutex) { - const SceInt32 res = sceKernelUnlockLwMutex(&mutex->lock, 1); - SDL_assert(res == SCE_KERNEL_ERROR_OK); // assume we're in a lot of trouble if this assert fails. - } -} - -#endif // SDL_THREAD_PSP diff --git a/contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex_c.h b/contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex_c.h deleted file mode 100644 index 4b0c6f8..0000000 --- a/contrib/SDL-3.2.8/src/thread/psp/SDL_sysmutex_c.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2025 Sam Lantinga - - 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" diff --git a/contrib/SDL-3.2.8/src/thread/psp/SDL_syssem.c b/contrib/SDL-3.2.8/src/thread/psp/SDL_syssem.c deleted file mode 100644 index 27e332f..0000000 --- a/contrib/SDL-3.2.8/src/thread/psp/SDL_syssem.c +++ /dev/null @@ -1,119 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2025 Sam Lantinga - - 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_PSP - -// Semaphore functions for the PSP. - -#include -#include - -#include -#include - -struct SDL_Semaphore -{ - SceUID semid; -}; - -// Create a semaphore -SDL_Semaphore *SDL_CreateSemaphore(Uint32 initial_value) -{ - SDL_Semaphore *sem; - - sem = (SDL_Semaphore *)SDL_malloc(sizeof(*sem)); - if (sem) { - // TODO: Figure out the limit on the maximum value. - sem->semid = sceKernelCreateSema("SDL sema", 0, initial_value, 255, NULL); - if (sem->semid < 0) { - SDL_SetError("Couldn't create semaphore"); - SDL_free(sem); - sem = NULL; - } - } - - return sem; -} - -// Free the semaphore -void SDL_DestroySemaphore(SDL_Semaphore *sem) -{ - if (sem) { - if (sem->semid > 0) { - sceKernelDeleteSema(sem->semid); - sem->semid = 0; - } - - SDL_free(sem); - } -} - -/* TODO: This routine is a bit overloaded. - * If the timeout is 0 then just poll the semaphore; if it's -1, pass - * NULL to sceKernelWaitSema() so that it waits indefinitely; and if the timeout - * is specified, convert it to microseconds. */ -bool SDL_WaitSemaphoreTimeoutNS(SDL_Semaphore *sem, Sint64 timeoutNS) -{ - SceUInt timeoutUS; - SceUInt *pTimeout = NULL; - - if (!sem) { - return true; - } - - if (timeoutNS == 0) { - return (sceKernelPollSema(sem->semid, 1) == 0); - } - - if (timeoutNS > 0) { - timeoutUS = (SceUInt)SDL_NS_TO_US(timeoutNS); // Convert to microseconds. - pTimeout = &timeoutUS; - } - - return (sceKernelWaitSema(sem->semid, 1, pTimeout) == 0); -} - -// Returns the current count of the semaphore -Uint32 SDL_GetSemaphoreValue(SDL_Semaphore *sem) -{ - SceKernelSemaInfo info; - - if (!sem) { - return 0; - } - - if (sceKernelReferSemaStatus(sem->semid, &info) == 0) { - return info.currentCount; - } - return 0; -} - -void SDL_SignalSemaphore(SDL_Semaphore *sem) -{ - if (!sem) { - return; - } - - sceKernelSignalSema(sem->semid, 1); -} - -#endif // SDL_THREAD_PSP diff --git a/contrib/SDL-3.2.8/src/thread/psp/SDL_systhread.c b/contrib/SDL-3.2.8/src/thread/psp/SDL_systhread.c deleted file mode 100644 index 3d60718..0000000 --- a/contrib/SDL-3.2.8/src/thread/psp/SDL_systhread.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2025 Sam Lantinga - - 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_PSP - -// PSP thread management routines for SDL - -#include -#include - -#include "../SDL_systhread.h" -#include "../SDL_thread_c.h" -#include -#include - -static int ThreadEntry(SceSize args, void *argp) -{ - SDL_RunThread(*(SDL_Thread **)argp); - return 0; -} - -bool SDL_SYS_CreateThread(SDL_Thread *thread, - SDL_FunctionPointer pfnBeginThread, - SDL_FunctionPointer pfnEndThread) -{ - SceKernelThreadInfo status; - int priority = 32; - - // Set priority of new thread to the same as the current thread - status.size = sizeof(SceKernelThreadInfo); - if (sceKernelReferThreadStatus(sceKernelGetThreadId(), &status) == 0) { - priority = status.currentPriority; - } - - thread->handle = sceKernelCreateThread(thread->name, ThreadEntry, - priority, thread->stacksize ? ((int)thread->stacksize) : 0x8000, - PSP_THREAD_ATTR_VFPU, NULL); - if (thread->handle < 0) { - return SDL_SetError("sceKernelCreateThread() failed"); - } - - sceKernelStartThread(thread->handle, 4, &thread); - return true; -} - -void SDL_SYS_SetupThread(const char *name) -{ - // Do nothing. -} - -SDL_ThreadID SDL_GetCurrentThreadID(void) -{ - return (SDL_ThreadID)sceKernelGetThreadId(); -} - -void SDL_SYS_WaitThread(SDL_Thread *thread) -{ - sceKernelWaitThreadEnd(thread->handle, NULL); - sceKernelDeleteThread(thread->handle); -} - -void SDL_SYS_DetachThread(SDL_Thread *thread) -{ - // !!! FIXME: is this correct? - sceKernelDeleteThread(thread->handle); -} - -void SDL_SYS_KillThread(SDL_Thread *thread) -{ - sceKernelTerminateDeleteThread(thread->handle); -} - -bool SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority) -{ - int value; - - if (priority == SDL_THREAD_PRIORITY_LOW) { - value = 111; - } else if (priority == SDL_THREAD_PRIORITY_HIGH) { - value = 32; - } else if (priority == SDL_THREAD_PRIORITY_TIME_CRITICAL) { - value = 16; - } else { - value = 50; - } - - if (sceKernelChangeThreadPriority(sceKernelGetThreadId(), value) < 0) { - return SDL_SetError("sceKernelChangeThreadPriority() failed"); - } - return true; -} - -#endif // SDL_THREAD_PSP diff --git a/contrib/SDL-3.2.8/src/thread/psp/SDL_systhread_c.h b/contrib/SDL-3.2.8/src/thread/psp/SDL_systhread_c.h deleted file mode 100644 index 9e951ec..0000000 --- a/contrib/SDL-3.2.8/src/thread/psp/SDL_systhread_c.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2025 Sam Lantinga - - 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 - -typedef SceUID SYS_ThreadHandle; -- cgit v1.2.3