shithub: libvpx

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -391,6 +391,7 @@

 ASFLAGS = ${ASFLAGS}

 extralibs = ${extralibs}

 AS_SFX    = ${AS_SFX:-.asm}

+EXE_SFX   = ${EXE_SFX}

 RTCD_OPTIONS = ${RTCD_OPTIONS}

EOF

@@ -540,6 +541,7 @@

     STRIP=${STRIP:-${CROSS}strip}

     NM=${NM:-${CROSS}nm}

         AS_SFX=.s

+        EXE_SFX=

 process_common_toolchain() {

@@ -593,6 +595,9 @@

             *solaris2.10)

                 tgt_os=solaris

;;

+            *os2*)

+                tgt_os=os2

+                ;;

         esac

         if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then

@@ -919,6 +924,9 @@

                 LD=${LD:-${CROSS}gcc}

                 CROSS=${CROSS:-g}

;;

+            os2)

+                AS=${AS:-nasm}

+                ;;

         esac

         AS="${alt_as:-${AS:-auto}}"

@@ -988,6 +996,11 @@

                 # code that still relies on inline assembly.

                 # enabled icc && ! enabled pic && add_cflags -fno-pic -mdynamic-no-pic

                 enabled icc && ! enabled pic && add_cflags -fno-pic

+            ;;

+            os2)

+                add_asflags -f aout

+                enabled debug && add_asflags -g

+                EXE_SFX=.exe

;;

             *) log "Warning: Unknown os $tgt_os while setting up $AS flags"

;;

--- a/configure

+++ b/configure

@@ -109,6 +109,7 @@

 all_platforms="${all_platforms} x86-darwin10-gcc"

 all_platforms="${all_platforms} x86-linux-gcc"

 all_platforms="${all_platforms} x86-linux-icc"

+all_platforms="${all_platforms} x86-os2-gcc"

 all_platforms="${all_platforms} x86-solaris-gcc"

 all_platforms="${all_platforms} x86-win32-gcc"

 all_platforms="${all_platforms} x86-win32-vs7"

--- a/examples.mk

+++ b/examples.mk

@@ -168,12 +168,12 @@

 # Create build/install dependencies for all examples. The common case

 # is handled here. The MSVS case is handled below.

 NOT_MSVS = $(if $(CONFIG_MSVS),,yes)

-DIST-BINS-$(NOT_MSVS)      += $(addprefix bin/,$(ALL_EXAMPLES:.c=))

-INSTALL-BINS-$(NOT_MSVS)   += $(addprefix bin/,$(UTILS:.c=))

+DIST-BINS-$(NOT_MSVS)      += $(addprefix bin/,$(ALL_EXAMPLES:.c=$(EXE_SFX)))

+INSTALL-BINS-$(NOT_MSVS)   += $(addprefix bin/,$(UTILS:.c=$(EXE_SFX)))

 DIST-SRCS-yes              += $(ALL_SRCS)

 INSTALL-SRCS-yes           += $(UTIL_SRCS)

 OBJS-$(NOT_MSVS)           += $(if $(BUILD_OBJS),$(call objs,$(ALL_SRCS)))

-BINS-$(NOT_MSVS)           += $(addprefix $(BUILD_PFX),$(ALL_EXAMPLES:.c=))

+BINS-$(NOT_MSVS)           += $(addprefix $(BUILD_PFX),$(ALL_EXAMPLES:.c=$(EXE_SFX)))

 # Instantiate linker template for all examples.

@@ -183,7 +183,7 @@

     $(if $(BUILD_OBJS),$(eval $(bin):\

         $(LIB_PATH)/lib$(CODEC_LIB)$(CODEC_LIB_SUF)))\

     $(if $(BUILD_OBJS),$(eval $(call linker_template,$(bin),\

-        $(call objs,$($(notdir $(bin)).SRCS)) \

+        $(call objs,$($(notdir $(bin:$(EXE_SFX)=)).SRCS)) \

         -l$(CODEC_LIB) $(addprefix -l,$(CODEC_EXTRA_LIBS))\

         )))\

     $(if $(LIPO_OBJS),$(eval $(call lipo_bin_template,$(bin))))\

--- a/tools_common.c

+++ b/tools_common.c

@@ -9,15 +9,21 @@

*/

 #include <stdio.h>

 #include "tools_common.h"

-#ifdef _WIN32

+#if defined(_WIN32) || defined(__OS2__)

 #include <io.h>

 #include <fcntl.h>

+#ifdef __OS2__

+#define _setmode    setmode

+#define _fileno     fileno

+#define _O_BINARY   O_BINARY

 #endif

+#endif

 FILE* set_binary_mode(FILE *stream)

     (void)stream;

-#ifdef _WIN32

+#if defined(_WIN32) || defined(__OS2__)

     _setmode(_fileno(stream), _O_BINARY);

 #endif

     return stream;

--- a/vp8/common/generic/systemdependent.c

+++ b/vp8/common/generic/systemdependent.c

@@ -19,11 +19,15 @@

 #include "vp8/common/onyxc_int.h"

 #if CONFIG_MULTITHREAD

-#if HAVE_UNISTD_H

+#if HAVE_UNISTD_H && !defined(__OS2__)

 #include <unistd.h>

 #elif defined(_WIN32)

 #include <windows.h>

 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);

+#elif defined(__OS2__)

+#define INCL_DOS

+#define INCL_DOSSPINLOCK

+#include <os2.h>

 #endif

 #endif

@@ -32,7 +36,7 @@

     int core_count = 16;

-#if HAVE_UNISTD_H

+#if HAVE_UNISTD_H && !defined(__OS2__)

 #if defined(_SC_NPROCESSORS_ONLN)

     core_count = sysconf(_SC_NPROCESSORS_ONLN);

 #elif defined(_SC_NPROC_ONLN)

@@ -54,6 +58,21 @@

             GetSystemInfo(&sysinfo);

         core_count = sysinfo.dwNumberOfProcessors;

+    }

+#elif defined(__OS2__)

+    {

+        ULONG proc_id;

+        ULONG status;

+        core_count = 0;

+        for (proc_id = 1; ; proc_id++)

+        {

+            if (DosGetProcessorStatus(proc_id, &status))

+                break;

+            if (status == PROC_ONLINE)

+                core_count++;

+        }

 #else

     /* other platforms */

--- a/vp8/common/threading.h

+++ b/vp8/common/threading.h

@@ -33,6 +33,29 @@

 #define pthread_getspecific(ts_key) TlsGetValue(ts_key)

 #define pthread_setspecific(ts_key, value) TlsSetValue(ts_key, (void *)value)

 #define pthread_self() GetCurrentThreadId()

+#elif defined(__OS2__)

+/* OS/2 */

+#define INCL_DOS

+#include <os2.h>

+#include <stdlib.h>

+#define THREAD_FUNCTION void

+#define THREAD_FUNCTION_RETURN void

+#define THREAD_SPECIFIC_INDEX PULONG

+#define pthread_t TID

+#define pthread_attr_t ULONG

+#define pthread_create(thhandle,attr,thfunc,tharg) \

+    ((int)((*(thhandle)=_beginthread(thfunc,NULL,1024*1024,tharg))==-1))

+#define pthread_join(thread, result) ((int)DosWaitThread(&(thread),0))

+#define pthread_detach(thread) 0

+#define thread_sleep(nms) DosSleep(nms)

+#define pthread_cancel(thread) DosKillThread(thread)

+#define ts_key_create(ts_key, destructor) \

+    DosAllocThreadLocalMemory(1, &(ts_key));

+#define pthread_getspecific(ts_key) ((void *)(*(ts_key)))

+#define pthread_setspecific(ts_key, value) (*(ts_key)=(ULONG)(value))

+#define pthread_self() _gettid()

 #else

 #ifdef __APPLE__

 #include <mach/mach_init.h>

@@ -63,6 +86,76 @@

 #define sem_post(sem) ReleaseSemaphore(*sem,1,NULL)

 #define sem_destroy(sem) if(*sem)((int)(CloseHandle(*sem))==TRUE)

 #define thread_sleep(nms) Sleep(nms)

+#elif defined(__OS2__)

+typedef struct

+{

+    HEV  event;

+    HMTX wait_mutex;

+    HMTX count_mutex;

+    int  count;

+} sem_t;

+static inline int sem_init(sem_t *sem, int pshared, unsigned int value)

+{

+    DosCreateEventSem(NULL, &sem->event, pshared ? DC_SEM_SHARED : 0,

+                      value > 0 ? TRUE : FALSE);

+    DosCreateMutexSem(NULL, &sem->wait_mutex, 0, FALSE);

+    DosCreateMutexSem(NULL, &sem->count_mutex, 0, FALSE);

+    sem->count = value;

+    return 0;

+}

+static inline int sem_wait(sem_t * sem)

+{

+    DosRequestMutexSem(sem->wait_mutex, -1);

+    DosWaitEventSem(sem->event, -1);

+    DosRequestMutexSem(sem->count_mutex, -1);

+    sem->count--;

+    if (sem->count == 0)

+    {

+        ULONG post_count;

+        DosResetEventSem(sem->event, &post_count);

+    }

+    DosReleaseMutexSem(sem->count_mutex);

+    DosReleaseMutexSem(sem->wait_mutex);

+    return 0;

+}

+static inline int sem_post(sem_t * sem)

+{

+    DosRequestMutexSem(sem->count_mutex, -1);

+    if (sem->count < 32768)

+    {

+        sem->count++;

+        DosPostEventSem(sem->event);

+    }

+    DosReleaseMutexSem(sem->count_mutex);

+    return 0;

+}

+static inline int sem_destroy(sem_t * sem)

+{

+    DosCloseEventSem(sem->event);

+    DosCloseMutexSem(sem->wait_mutex);

+    DosCloseMutexSem(sem->count_mutex);

+    return 0;

+}

+#define thread_sleep(nms) DosSleep(nms)

 #else

--- a/vpx_ports/x86_abi_support.asm

+++ b/vpx_ports/x86_abi_support.asm

@@ -22,6 +22,8 @@

 %define ABI_IS_32BIT 1

 %elifidn __OUTPUT_FORMAT__,win32

 %define ABI_IS_32BIT 1

+%elifidn __OUTPUT_FORMAT__,aout

+%define ABI_IS_32BIT 1

 %else

 %define ABI_IS_32BIT 0

 %endif

@@ -314,6 +316,8 @@

 %macro SECTION_RODATA 0

 section .text

 %endmacro

+%elifidn __OUTPUT_FORMAT__,aout

+%define SECTION_RODATA section .data

 %else

 %define SECTION_RODATA section .rodata

 %endif