From 0cff5836c3f410136e3fdb3e2f9e24bb81dd9a87 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 19 Apr 2014 17:09:24 +0200 Subject: Remove CPU detection and inline asm handling Not needed anymore. I'm not opposed to having asm, but inline asm is too much of a pain, and it was planned long ago to eventually get rid fo all inline asm uses. For the note, the inline asm use that was removed with the previous commits was almost worthless. It was confined to video filters, and most video filtering is now done with libavfilter. Some mpv filters (like vf_pullup) actually redirect to libavfilter if possible. If asm is added in the future, it should happen in the form of external files. --- compat/mangle.h | 46 ---------------------------------- compat/x86_cpu.h | 76 -------------------------------------------------------- 2 files changed, 122 deletions(-) delete mode 100644 compat/mangle.h delete mode 100644 compat/x86_cpu.h (limited to 'compat') diff --git a/compat/mangle.h b/compat/mangle.h deleted file mode 100644 index fbec0d0b92..0000000000 --- a/compat/mangle.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * CPP macros to deal with different symbol mangling across binary formats. - * - * Copyright (C) 2002 Felix Buenemann - * - * 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_MANGLE_H -#define MPLAYER_MANGLE_H - -#include "config.h" - -#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 300) -#define attribute_used __attribute__((used)) -#else -#define attribute_used -#endif - -#if defined(_WIN32) && !defined(_WIN64) || defined(__APPLE__) -#define EXTERN_PREFIX "_" -#else -#define EXTERN_PREFIX "" -#endif - -#if ARCH_X86_64 && defined(PIC) -#define MANGLE(a) EXTERN_PREFIX #a "(%%rip)" -#else -#define MANGLE(a) EXTERN_PREFIX #a -#endif - -#endif /* MPLAYER_MANGLE_H */ diff --git a/compat/x86_cpu.h b/compat/x86_cpu.h deleted file mode 100644 index 49a5b28a35..0000000000 --- a/compat/x86_cpu.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * copyright (c) 2006 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg 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. - * - * FFmpeg 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 FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef MP_AVUTIL_X86_CPU_H -#define MP_AVUTIL_X86_CPU_H - -#include -#include "config.h" - -#if ARCH_X86_64 -# define REG_a "rax" -# define REG_b "rbx" -# define REG_c "rcx" -# define REG_d "rdx" -# define REG_D "rdi" -# define REG_S "rsi" -# define PTR_SIZE "8" -typedef int64_t x86_reg; - -# define REG_SP "rsp" -# define REG_BP "rbp" -# define REGBP rbp -# define REGa rax -# define REGb rbx -# define REGc rcx -# define REGd rdx -# define REGSP rsp - -#elif ARCH_X86_32 - -# define REG_a "eax" -# define REG_b "ebx" -# define REG_c "ecx" -# define REG_d "edx" -# define REG_D "edi" -# define REG_S "esi" -# define PTR_SIZE "4" -typedef int32_t x86_reg; - -# define REG_SP "esp" -# define REG_BP "ebp" -# define REGBP ebp -# define REGa eax -# define REGb ebx -# define REGc ecx -# define REGd edx -# define REGSP esp -#else -typedef int x86_reg; -#endif - -#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) -#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) - -#if ARCH_X86_64 && defined(PIC) -# define BROKEN_RELOCATIONS 1 -#endif - -#endif /* AVUTIL_X86_CPU_H */ -- cgit v1.2.3