This is a fallback for cases where building with yasm enabled, but
the compiler doesn't support inline asm (or it is disabled by the
user), and the compiler doesn't support the _mm_empty intrinsic (like
gcc, if the user hasn't added -mmmx to the cflags).
The function is named emms_c - if it were named plain 'emms' it
causes conflicts with the instruction with the same name within
the function.
---
libavutil/internal.h | 3 +++
libavutil/x86/Makefile | 1 +
libavutil/x86/emms.asm | 34 ++++++++++++++++++++++++++++++++++
libavutil/x86/emms.h | 24 ++++++++++++++++++++++++
4 files changed, 62 insertions(+)
create mode 100644 libavutil/x86/emms.asm
create mode 100644 libavutil/x86/emms.h
diff --git a/libavutil/internal.h b/libavutil/internal.h
index f0f5a63..f9cf78e 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -141,6 +141,9 @@ static av_always_inline void emms_c(void)
#elif HAVE_MMX && HAVE_MM_EMPTY
# include <mmintrin.h>
# define emms_c _mm_empty
+#elif HAVE_MMX && HAVE_YASM
+# include "libavutil/x86/emms.h"
+# define emms_c avpriv_emms_c
#else
# define emms_c()
#endif /* HAVE_MMX_INLINE */
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index 3dd696c..ae07470 100644
--- a/libavutil/x86/Makefile
+++ b/libavutil/x86/Makefile
@@ -2,4 +2,5 @@ OBJS += x86/cpu.o
\
x86/float_dsp_init.o \
YASM-OBJS += x86/cpuid.o \
+ x86/emms.o \
x86/float_dsp.o \
diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
new file mode 100644
index 0000000..0072048
--- /dev/null
+++ b/libavutil/x86/emms.asm
@@ -0,0 +1,34 @@
+;*****************************************************************************
+;* Copyright (C) 2013 Martin Storsjo
+;*
+;* This file is part of Libav.
+;*
+;* Libav is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* Libav 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
+;* Lesser General Public License for more details.
+;*
+;* You should have received a copy of the GNU Lesser General Public
+;* License along with Libav; if not, write to the Free Software
+;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%define program_name avpriv
+
+%include "x86util.asm"
+
+SECTION .text
+
+%define public_func_emms_c
+
+;-----------------------------------------------------------------------------
+; void avpriv_emms(void)
+;-----------------------------------------------------------------------------
+cglobal emms_c, 0, 0
+ emms
+ RET
diff --git a/libavutil/x86/emms.h b/libavutil/x86/emms.h
new file mode 100644
index 0000000..10362b9
--- /dev/null
+++ b/libavutil/x86/emms.h
@@ -0,0 +1,24 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_X86_EMMS_H
+#define AVUTIL_X86_EMMS_H
+
+void avpriv_emms_c(void);
+
+#endif /* AVUTIL_X86_EMMS_H */
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
