From 68ff8a0484b592a629ef2bbcb0537265ae36d1d0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 29 Aug 2014 12:09:04 +0200 Subject: Move compat/ and bstr/ directory contents somewhere else bstr.c doesn't really deserve its own directory, and compat had just a few files, most of which may as well be in osdep. There isn't really any justification for these extra directories, so get rid of them. The compat/libav.h was empty - just delete it. We changed our approach to API compatibility, and will likely not need it anymore. --- osdep/atomics.h | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ osdep/compiler.h | 28 ++++++++++++++++++- osdep/mpbswap.h | 32 +++++++++++++++++++++ osdep/terminal-unix.c | 2 +- 4 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 osdep/atomics.h create mode 100644 osdep/mpbswap.h (limited to 'osdep') diff --git a/osdep/atomics.h b/osdep/atomics.h new file mode 100644 index 0000000000..e5fb717a78 --- /dev/null +++ b/osdep/atomics.h @@ -0,0 +1,77 @@ +/* + * This file is part of mpv. + * Copyright (c) 2013 Stefano Pigozzi + * + * mpv is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with mpv. If not, see . + */ + +#ifndef MP_ATOMICS_H +#define MP_ATOMICS_H + +#include +#include "config.h" + +#define HAVE_ATOMICS 1 + +#if HAVE_STDATOMIC +#include +#else + +// Emulate the parts of C11 stdatomic.h needed by mpv. +// Still relies on gcc/clang atomic builtins. + +typedef struct { volatile unsigned long v; } atomic_ulong; +typedef struct { volatile int v; } atomic_int; +typedef struct { volatile _Bool v; } atomic_bool; +typedef struct { volatile long long v; } atomic_llong; +typedef struct { volatile uint_least32_t v; } atomic_uint_least32_t; +typedef struct { volatile unsigned long long v; } atomic_ullong; + +#define ATOMIC_VAR_INIT(x) \ + {.v = (x)} + +#if HAVE_ATOMIC_BUILTINS + +#define atomic_load(p) \ + __atomic_load_n(&(p)->v, __ATOMIC_SEQ_CST) +#define atomic_store(p, val) \ + __atomic_store_n(&(p)->v, val, __ATOMIC_SEQ_CST) +#define atomic_fetch_add(a, b) \ + __atomic_fetch_add(&(a)->v, b, __ATOMIC_SEQ_CST) + +#elif HAVE_SYNC_BUILTINS + +#define atomic_load(p) \ + __sync_fetch_and_add(&(p)->v, 0) +#define atomic_store(p, val) \ + (__sync_synchronize(), (p)->v = (val), __sync_synchronize()) +#define atomic_fetch_add(a, b) \ + __sync_fetch_and_add(&(a)->v, b) + +#else + +// This is extremely wrong. The build system actually disables code that has +// a serious dependency on working atomics, so this is barely ok. +#define atomic_load(p) ((p)->v) +#define atomic_store(p, val) ((p)->v = (val)) +#define atomic_fetch_add(a, b) (((a)->v += (b)) - (b)) + +#undef HAVE_ATOMICS +#define HAVE_ATOMICS 0 + +#endif /* no atomics */ + +#endif /* else HAVE_STDATOMIC */ + +#endif diff --git a/osdep/compiler.h b/osdep/compiler.h index 1b878a9b3d..a507cd02c2 100644 --- a/osdep/compiler.h +++ b/osdep/compiler.h @@ -1 +1,27 @@ -#include "compat/compiler.h" +#ifndef MPV_COMPILER_H +#define MPV_COMPILER_H + +#define MP_EXPAND_ARGS(...) __VA_ARGS__ + +#ifdef __GNUC__ + +#define MP_NORETURN __attribute__((noreturn)) + +/** Use gcc attribute to check printf fns. a1 is the 1-based index of + * the parameter containing the format, and a2 the index of the first + * argument. **/ +#ifdef __MINGW32__ +// MinGW maps "printf" to the non-standard MSVCRT functions, even if +// __USE_MINGW_ANSI_STDIO is defined and set to 1. We need to use "gnu_printf", +// which isn't necessarily available on other GCC compatible compilers. +#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (gnu_printf, a1, a2))) +#else +#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (printf, a1, a2))) +#endif + +#else +#define PRINTF_ATTRIBUTE(a1, a2) +#define MP_NORETURN +#endif + +#endif diff --git a/osdep/mpbswap.h b/osdep/mpbswap.h new file mode 100644 index 0000000000..f75c8b86c8 --- /dev/null +++ b/osdep/mpbswap.h @@ -0,0 +1,32 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_MPBSWAP_H +#define MPLAYER_MPBSWAP_H + +#include + +#define bswap_16(x) av_bswap16(x) +#define bswap_32(x) av_bswap32(x) +#define be2me_16(x) av_be2ne16(x) +#define be2me_32(x) av_be2ne32(x) +#define le2me_16(x) av_le2ne16(x) +#define le2me_32(x) av_le2ne32(x) +#define le2me_64(x) av_le2ne64(x) + +#endif /* MPLAYER_MPBSWAP_H */ diff --git a/osdep/terminal-unix.c b/osdep/terminal-unix.c index 26f288486e..b4890ee30c 100644 --- a/osdep/terminal-unix.c +++ b/osdep/terminal-unix.c @@ -43,7 +43,7 @@ #include #include "common/common.h" -#include "bstr/bstr.h" +#include "misc/bstr.h" #include "input/input.h" #include "input/keycodes.h" #include "misc/ctype.h" -- cgit v1.2.3