From a4b1dd65edbe94a32f648840151fe258ea646be8 Mon Sep 17 00:00:00 2001 From: Kieran Kunhya Date: Sat, 17 Dec 2022 21:53:27 +0000 Subject: [PATCH] libavutil: Remove TOMI CPU --- configure | 1 - libavutil/intreadwrite.h | 2 - libavutil/tomi/intreadwrite.h | 150 ---------------------------------- 3 files changed, 153 deletions(-) delete mode 100644 libavutil/tomi/intreadwrite.h diff --git a/configure b/configure index 2180ebb4f1..b4213f026e 100755 --- a/configure +++ b/configure @@ -2046,7 +2046,6 @@ ARCH_LIST=" sparc64 tilegx tilepro - tomi x86 x86_32 x86_64 diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 4c8413a536..c4679fdba4 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -72,8 +72,6 @@ typedef union { # include "mips/intreadwrite.h" #elif ARCH_PPC # include "ppc/intreadwrite.h" -#elif ARCH_TOMI -# include "tomi/intreadwrite.h" #elif ARCH_X86 # include "x86/intreadwrite.h" #endif diff --git a/libavutil/tomi/intreadwrite.h b/libavutil/tomi/intreadwrite.h deleted file mode 100644 index 7dec4158d3..0000000000 --- a/libavutil/tomi/intreadwrite.h +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright (c) 2010 Mans Rullgard - * - * 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 AVUTIL_TOMI_INTREADWRITE_H -#define AVUTIL_TOMI_INTREADWRITE_H - -#include - -#include "config.h" -#include "libavutil/attributes.h" - -#define AV_RB16 AV_RB16 -static av_always_inline uint16_t AV_RB16(const void *p) -{ - uint16_t v; - __asm__ ("loadacc, (%1+) \n\t" - "rol8 \n\t" - "storeacc, %0 \n\t" - "loadacc, (%1+) \n\t" - "add, %0 \n\t" - : "=r"(v), "+a"(p)); - return v; -} - -#define AV_WB16 AV_WB16 -static av_always_inline void AV_WB16(void *p, uint16_t v) -{ - __asm__ volatile ("loadacc, %1 \n\t" - "lsr8 \n\t" - "storeacc, (%0+) \n\t" - "loadacc, %1 \n\t" - "storeacc, (%0+) \n\t" - : "+&a"(p) : "r"(v)); -} - -#define AV_RL16 AV_RL16 -static av_always_inline uint16_t AV_RL16(const void *p) -{ - uint16_t v; - __asm__ ("loadacc, (%1+) \n\t" - "storeacc, %0 \n\t" - "loadacc, (%1+) \n\t" - "rol8 \n\t" - "add, %0 \n\t" - : "=r"(v), "+a"(p)); - return v; -} - -#define AV_WL16 AV_WL16 -static av_always_inline void AV_WL16(void *p, uint16_t v) -{ - __asm__ volatile ("loadacc, %1 \n\t" - "storeacc, (%0+) \n\t" - "lsr8 \n\t" - "storeacc, (%0+) \n\t" - : "+&a"(p) : "r"(v)); -} - -#define AV_RB32 AV_RB32 -static av_always_inline uint32_t AV_RB32(const void *p) -{ - uint32_t v; - __asm__ ("loadacc, (%1+) \n\t" - "rol8 \n\t" - "rol8 \n\t" - "rol8 \n\t" - "storeacc, %0 \n\t" - "loadacc, (%1+) \n\t" - "rol8 \n\t" - "rol8 \n\t" - "add, %0 \n\t" - "loadacc, (%1+) \n\t" - "rol8 \n\t" - "add, %0 \n\t" - "loadacc, (%1+) \n\t" - "add, %0 \n\t" - : "=r"(v), "+a"(p)); - return v; -} - -#define AV_WB32 AV_WB32 -static av_always_inline void AV_WB32(void *p, uint32_t v) -{ - __asm__ volatile ("loadacc, #4 \n\t" - "add, %0 \n\t" - "loadacc, %1 \n\t" - "storeacc, (-%0) \n\t" - "lsr8 \n\t" - "storeacc, (-%0) \n\t" - "lsr8 \n\t" - "storeacc, (-%0) \n\t" - "lsr8 \n\t" - "storeacc, (-%0) \n\t" - : "+&a"(p) : "r"(v)); -} - -#define AV_RL32 AV_RL32 -static av_always_inline uint32_t AV_RL32(const void *p) -{ - uint32_t v; - __asm__ ("loadacc, (%1+) \n\t" - "storeacc, %0 \n\t" - "loadacc, (%1+) \n\t" - "rol8 \n\t" - "add, %0 \n\t" - "loadacc, (%1+) \n\t" - "rol8 \n\t" - "rol8 \n\t" - "add, %0 \n\t" - "loadacc, (%1+) \n\t" - "rol8 \n\t" - "rol8 \n\t" - "rol8 \n\t" - "add, %0 \n\t" - : "=r"(v), "+a"(p)); - return v; -} - -#define AV_WL32 AV_WL32 -static av_always_inline void AV_WL32(void *p, uint32_t v) -{ - __asm__ volatile ("loadacc, %1 \n\t" - "storeacc, (%0+) \n\t" - "lsr8 \n\t" - "storeacc, (%0+) \n\t" - "lsr8 \n\t" - "storeacc, (%0+) \n\t" - "lsr8 \n\t" - "storeacc, (%0+) \n\t" - : "+&a"(p) : "r"(v)); -} - -#endif /* AVUTIL_TOMI_INTREADWRITE_H */ -- 2.24.1.windows.2