os2: add port files for SDL2-2.0.4 from Andrey Vasilkin

only geniconv/iconv.h (was from LGPL libiconv) is replaced with a generic
minimal iconv.h based on public knowledge.

src/thread/os2/SDL_sysmutex.c

@@ -0,0 +1,132 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 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"
+
+#if SDL_THREAD_OS2
+
+/* An implementation of mutexes for OS/2 */
+
+#include "SDL_thread.h"
+#include "SDL_systhread_c.h"
+#include "../../core/os2/SDL_os2.h"
+
+#define INCL_DOSSEMAPHORES
+#define INCL_DOSERRORS
+#include <os2.h>
+
+struct SDL_mutex
+{
+  ULONG      ulHandle;
+};
+
+/* Create a mutex */
+SDL_mutex *
+SDL_CreateMutex(void)
+{
+  ULONG      ulRC;
+  HMTX       hMtx;
+
+  ulRC = DosCreateMutexSem( NULL, &hMtx, 0, FALSE );
+  if ( ulRC != NO_ERROR )
+  {
+    debug( "DosCreateMutexSem(), rc = %u", ulRC );
+    return NULL;
+  }
+
+  return (SDL_mutex *)hMtx;
+}
+
+/* Free the mutex */
+void
+SDL_DestroyMutex(SDL_mutex * mutex)
+{
+  ULONG      ulRC;
+  HMTX       hMtx = (HMTX)mutex;
+
+  ulRC = DosCloseMutexSem( hMtx );
+  if ( ulRC != NO_ERROR )
+    debug( "DosCloseMutexSem(), rc = %u", ulRC );
+}
+
+/* Lock the mutex */
+int
+SDL_LockMutex(SDL_mutex * mutex)
+{
+  ULONG      ulRC;
+  HMTX       hMtx = (HMTX)mutex;
+
+  if ( hMtx == NULLHANDLE )
+    return SDL_SetError( "Passed a NULL mutex" );
+
+  ulRC = DosRequestMutexSem( hMtx, SEM_INDEFINITE_WAIT );
+  if ( ulRC != NO_ERROR )
+  {
+    debug( "DosRequestMutexSem(), rc = %u", ulRC );
+    return -1;
+  }
+
+  return 0;
+}
+
+/* try Lock the mutex */
+int
+SDL_TryLockMutex(SDL_mutex * mutex)
+{
+  ULONG      ulRC;
+  HMTX       hMtx = (HMTX)mutex;
+
+  if ( hMtx == NULLHANDLE )
+    return SDL_SetError( "Passed a NULL mutex" );
+
+  ulRC = DosRequestMutexSem( hMtx, SEM_IMMEDIATE_RETURN );
+
+  if ( ulRC == ERROR_TIMEOUT )
+    return SDL_MUTEX_TIMEDOUT;
+
+  if ( ulRC != NO_ERROR )
+  {
+    debug( "DosRequestMutexSem(), rc = %u", ulRC );
+    return -1;
+  }
+
+  return 0;
+}
+
+/* Unlock the mutex */
+int
+SDL_UnlockMutex(SDL_mutex * mutex)
+{
+  ULONG      ulRC;
+  HMTX       hMtx = (HMTX)mutex;
+
+  if ( hMtx == NULLHANDLE )
+    return SDL_SetError( "Passed a NULL mutex" );
+
+  ulRC = DosReleaseMutexSem( hMtx );
+  if ( ulRC != NO_ERROR )
+    return SDL_SetError( "DosReleaseMutexSem(), rc = %u", ulRC );
+
+  return 0;
+}
+
+#endif /* SDL_THREAD_OS2 */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_syssem.c

@@ -0,0 +1,196 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 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"
+
+#if SDL_THREAD_OS2
+
+/* An implementation of semaphores for OS/2 */
+
+#include "SDL_thread.h"
+#include "../../core/os2/SDL_os2.h"
+
+#define INCL_DOSSEMAPHORES
+#define INCL_DOSERRORS
+#define INCL_DOSMISC
+#include <os2.h>
+
+struct SDL_semaphore {
+  HEV        hEv;
+  HMTX       hMtx;
+  ULONG      cPost;
+};
+
+
+SDL_sem *
+SDL_CreateSemaphore(Uint32 initial_value)
+{
+  ULONG      ulRC;
+  SDL_sem    *pSDLSem = SDL_malloc( sizeof(SDL_sem) );
+
+  if ( pSDLSem == NULL )
+  {
+    SDL_OutOfMemory();
+    return NULL;
+  }
+
+  ulRC = DosCreateEventSem( NULL, &pSDLSem->hEv, DCE_AUTORESET, FALSE );
+  if ( ulRC != NO_ERROR )
+  {
+    debug( "DosCreateEventSem(), rc = %u", ulRC );
+    SDL_free( pSDLSem );
+    return NULL;
+  }
+
+  ulRC = DosCreateMutexSem( NULL, &pSDLSem->hMtx, 0, FALSE );
+  if ( ulRC != NO_ERROR )
+  {
+    debug( "DosCreateMutexSem(), rc = %u", ulRC );
+    DosCloseEventSem( pSDLSem->hEv );
+    SDL_free( pSDLSem );
+    return NULL;
+  }
+
+  pSDLSem->cPost = initial_value;
+
+  return pSDLSem;
+}
+
+void
+SDL_DestroySemaphore(SDL_sem * sem)
+{
+  if ( sem == NULL )
+    return;
+
+  DosCloseMutexSem( sem->hMtx );
+  DosCloseEventSem( sem->hEv );
+  SDL_free( sem );
+}
+
+int
+SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
+{
+  ULONG      ulRC;
+  ULONG      ulStartTime, ulCurTime;
+  ULONG      ulTimeout;
+  ULONG      cPost;
+
+  if ( sem == NULL )
+    return SDL_SetError( "Passed a NULL sem" );
+
+  if ( timeout != SEM_INDEFINITE_WAIT )
+    DosQuerySysInfo( QSV_MS_COUNT, QSV_MS_COUNT, &ulStartTime, sizeof(ULONG) );
+
+  while( TRUE )
+  {
+    ulRC = DosRequestMutexSem( sem->hMtx, SEM_INDEFINITE_WAIT );
+    if ( ulRC != NO_ERROR )
+      return SDL_SetError( "DosRequestMutexSem() failed, rc = %u", ulRC );
+  
+    cPost = sem->cPost;
+    if ( sem->cPost != 0 )
+      sem->cPost--;
+
+    DosReleaseMutexSem( sem->hMtx );
+
+    if ( cPost != 0 )
+      break;
+
+    if ( timeout == SEM_INDEFINITE_WAIT )
+      ulTimeout = SEM_INDEFINITE_WAIT;
+    else
+    {
+      DosQuerySysInfo( QSV_MS_COUNT, QSV_MS_COUNT, &ulCurTime, sizeof(ULONG) );
+      ulTimeout = ulCurTime - ulStartTime;
+      if ( timeout < ulTimeout )
+        return SDL_MUTEX_TIMEDOUT;
+      ulTimeout = timeout - ulTimeout;
+    }
+
+    ulRC = DosWaitEventSem( sem->hEv, ulTimeout );
+    if ( ulRC == ERROR_TIMEOUT )
+      return SDL_MUTEX_TIMEDOUT;
+
+    if ( ulRC != NO_ERROR )
+      return SDL_SetError( "DosWaitEventSem() failed, rc = %u", ulRC );
+  }
+
+  return 0;
+}
+
+int
+SDL_SemTryWait(SDL_sem * sem)
+{
+  return SDL_SemWaitTimeout( sem, 0 );
+}
+
+int
+SDL_SemWait(SDL_sem * sem)
+{
+  return SDL_SemWaitTimeout( sem, SDL_MUTEX_MAXWAIT );
+}
+
+Uint32
+SDL_SemValue(SDL_sem * sem)
+{
+  ULONG      ulRC;
+
+  if ( sem == NULL )
+  {
+    SDL_SetError( "Passed a NULL sem" );
+    return 0;
+  }
+
+  ulRC = DosRequestMutexSem( sem->hMtx, SEM_INDEFINITE_WAIT );
+  if ( ulRC != NO_ERROR )
+    return SDL_SetError( "DosRequestMutexSem() failed, rc = %u", ulRC );
+
+  ulRC = sem->cPost;
+  DosReleaseMutexSem( sem->hMtx );
+
+  return ulRC;
+}
+
+int
+SDL_SemPost(SDL_sem * sem)
+{
+  ULONG      ulRC;
+
+  if ( sem == NULL )
+    return SDL_SetError( "Passed a NULL sem" );
+
+  ulRC = DosRequestMutexSem( sem->hMtx, SEM_INDEFINITE_WAIT );
+  if ( ulRC != NO_ERROR )
+    return SDL_SetError( "DosRequestMutexSem() failed, rc = %u", ulRC );
+
+  sem->cPost++;
+
+  ulRC = DosPostEventSem( sem->hEv );
+  if ( ( ulRC != NO_ERROR ) && ( ulRC != ERROR_ALREADY_POSTED ) )
+    debug( "DosPostEventSem() failed, rc = %u", ulRC );
+
+  DosReleaseMutexSem( sem->hMtx );
+
+  return 0;
+}
+
+#endif /* SDL_THREAD_OS2 */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_systhread.c

@@ -0,0 +1,187 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 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"
+
+#if SDL_THREAD_OS2
+
+/* Thread management routines for SDL */
+
+#include "SDL_thread.h"
+#include "../SDL_systhread.h"
+#include "../SDL_thread_c.h"
+#include "../SDL_systhread.h"
+#include "SDL_systls_c.h"
+#include "../../core/os2/SDL_os2.h"
+
+#define INCL_DOSPROCESS
+#define INCL_DOSERRORS
+#include <os2.h>
+
+#ifndef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+/* We'll use the C library from this DLL */
+#include <process.h>
+
+/* Cygwin gcc-3 ... MingW64 (even with a i386 host) does this like MSVC. */
+#if (defined(__MINGW32__) && (__GNUC__ < 4))
+typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
+        unsigned (__stdcall *func)(void *), void *arg,
+        unsigned, unsigned *threadID);
+typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
+
+#elif defined(__WATCOMC__)
+/* This is for Watcom targets except OS2 */
+#if __WATCOMC__ < 1240
+#define __watcall
+#endif
+typedef unsigned long (__watcall * pfnSDL_CurrentBeginThread) (void *,
+                                                               unsigned,
+                                                               unsigned
+                                                               (__stdcall *
+                                                                func) (void
+                                                                       *),
+                                                               void *arg,
+                                                               unsigned,
+                                                               unsigned
+                                                               *threadID);
+typedef void (__watcall * pfnSDL_CurrentEndThread) (unsigned code);
+
+#else
+typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
+                                                        unsigned (__stdcall *
+                                                                  func) (void
+                                                                         *),
+                                                        void *arg, unsigned,
+                                                        unsigned *threadID);
+typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
+#endif
+#endif /* !SDL_PASSED_BEGINTHREAD_ENDTHREAD */
+
+
+typedef struct ThreadStartParms {
+  void *args;
+  pfnSDL_CurrentEndThread pfnCurrentEndThread;
+} tThreadStartParms, *pThreadStartParms;
+
+static void RunThread(void *data)
+{
+  pThreadStartParms           pThreadParms = (pThreadStartParms) data;
+  pfnSDL_CurrentEndThread     pfnEndThread = pThreadParms->pfnCurrentEndThread;
+  void                        *args = pThreadParms->args;
+
+  SDL_free( pThreadParms );
+
+  if ( ppSDLTLSData != NULL )
+    *ppSDLTLSData = NULL;
+
+  SDL_RunThread( args );
+
+  if ( pfnEndThread != NULL )
+    pfnEndThread();
+}
+
+
+
+#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args,
+                     pfnSDL_CurrentBeginThread pfnBeginThread,
+                     pfnSDL_CurrentEndThread pfnEndThread)
+#else
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
+#endif /* SDL_PASSED_BEGINTHREAD_ENDTHREAD */
+{
+  pThreadStartParms    pThreadParms = SDL_malloc( sizeof(tThreadStartParms) );
+
+  if ( pThreadParms == NULL )
+    return SDL_OutOfMemory();
+
+  // Save the function which we will have to call to clear the RTL of calling app!
+  pThreadParms->pfnCurrentEndThread = pfnEndThread;
+  // Also save the real parameters we have to pass to thread function
+  pThreadParms->args = args;
+
+  // Start the thread using the runtime library of calling app!
+  thread->handle = (SYS_ThreadHandle)
+  #ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+    ( (size_t) pfnBeginThread( RunThread, NULL, 65535, pThreadParms ) );
+  #else
+    _beginthread( RunThread, NULL, 65535, pThreadParms );
+  #endif
+
+  if ( thread->handle == -1 )
+      return SDL_SetError( "Not enough resources to create thread" );
+
+  return 0;
+}
+
+void
+SDL_SYS_SetupThread(const char *name)
+{
+    return;
+}
+
+SDL_threadID
+SDL_ThreadID(void)
+{
+  PTIB       tib;
+  PPIB       pib;
+
+  DosGetInfoBlocks( &tib, &pib );
+  return tib->tib_ptib2->tib2_ultid;
+}
+
+int
+SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
+{
+  ULONG      ulRC;
+
+  ulRC = DosSetPriority( PRTYS_THREAD,
+                         priority == SDL_THREAD_PRIORITY_LOW
+                           ? PRTYC_IDLETIME
+                           : priority == SDL_THREAD_PRIORITY_HIGH
+                               ? PRTYC_TIMECRITICAL 
+                               : PRTYC_REGULAR ,
+                         0, 0 );
+  if ( ulRC != NO_ERROR )
+    return SDL_SetError( "DosSetPriority() failed, rc = %u", ulRC );
+
+  return 0;
+}
+
+void
+SDL_SYS_WaitThread(SDL_Thread * thread)
+{
+  ULONG      ulRC = DosWaitThread( (PTID)&thread->handle, DCWW_WAIT );
+
+  if ( ulRC != NO_ERROR )
+    debug( "DosWaitThread() failed, rc = %u", ulRC );
+}
+
+void
+SDL_SYS_DetachThread(SDL_Thread * thread)
+{
+  return;
+}
+
+#endif /* SDL_THREAD_OS2 */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_systhread_c.h

@@ -0,0 +1,25 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 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"
+
+typedef int SYS_ThreadHandle;
+
+/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_systls.c

@@ -0,0 +1,89 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 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"
+
+#if SDL_THREAD_OS2
+
+#include "../../core/os2/SDL_os2.h"
+
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
+
+#define INCL_DOSPROCESS
+#define INCL_DOSERRORS
+#include <os2.h>
+
+SDL_TLSData     **ppSDLTLSData = NULL;
+
+static ULONG           cTLSAlloc = 0;
+
+// SDL_OS2TLSAlloc() called from SDL_InitSubSystem()
+void SDL_OS2TLSAlloc()
+{
+  ULONG      ulRC;
+
+  if ( ( cTLSAlloc == 0 ) || ( ppSDLTLSData == NULL ) )
+  {
+    // First call - allocate the thread local memory (1 DWORD).
+    ulRC = DosAllocThreadLocalMemory( 1, (PULONG *)&ppSDLTLSData );
+    if ( ulRC != NO_ERROR )
+      debug( "DosAllocThreadLocalMemory() failed, rc = %u", ulRC );
+  }
+  cTLSAlloc++;
+}
+
+// SDL_OS2TLSFree() called from SDL_QuitSubSystem()
+void SDL_OS2TLSFree()
+{
+  ULONG      ulRC;
+
+  if ( cTLSAlloc != 0 )
+    cTLSAlloc--;
+
+  if ( ( cTLSAlloc == 0 ) && ( ppSDLTLSData != NULL ) )
+  {
+    // Last call - free the thread local memory.
+    ulRC = DosFreeThreadLocalMemory( (PULONG)ppSDLTLSData );
+    if ( ulRC != NO_ERROR )
+      debug( "DosFreeThreadLocalMemory() failed, rc = %u", ulRC );
+    else
+      ppSDLTLSData = NULL;
+  }
+}
+
+SDL_TLSData *SDL_SYS_GetTLSData()
+{
+  return ppSDLTLSData == NULL ? NULL : *ppSDLTLSData;
+}
+
+int SDL_SYS_SetTLSData(SDL_TLSData *data)
+{
+  if ( ppSDLTLSData == NULL )
+    return -1;
+
+  *ppSDLTLSData = data;
+  return 0;
+}
+
+#endif /* SDL_THREAD_OS2 */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/thread/os2/SDL_systls_c.h

@@ -0,0 +1,38 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 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"
+
+#if SDL_THREAD_OS2
+
+#include "../SDL_thread_c.h"
+
+extern SDL_TLSData     **ppSDLTLSData;
+
+// SDL_OS2TLSAlloc() called from SDL_InitSubSystem()
+void SDL_OS2TLSAlloc();
+
+// SDL_OS2TLSFree() called from SDL_QuitSubSystem()
+void SDL_OS2TLSFree();
+
+#endif /* SDL_THREAD_OS2 */
+
+/* vi: set ts=4 sw=4 expandtab: */