Some function had exceed 30 inline assembly register oprands limiation
when using LOONGSON2 version of MMI macros. We can avoid that by take
$at, which is register reserved for assembler, as temporary register.
As none of instructions used in these macros is pseudo, it is safe to
utilize $at here.
Signed-off-by: Jiaxun Yang <jiaxun.y...@flygoat.com>
---
libavutil/mips/mmiutils.h | 115 +++++++++++++++++++++++---------------
1 file changed, 69 insertions(+), 46 deletions(-)
diff --git a/libavutil/mips/mmiutils.h b/libavutil/mips/mmiutils.h
index f5b600e50c..c1a8046798 100644
--- a/libavutil/mips/mmiutils.h
+++ b/libavutil/mips/mmiutils.h
@@ -29,78 +29,107 @@
#include "libavutil/mem_internal.h"
#include "libavutil/mips/asmdefs.h"
-#if HAVE_LOONGSON2
+/*
+ * These were used to define temporary registers for MMI marcos
+ * however now we're using $at. They're theoretically unnecessary
+ * but just leave them here to avoid mess.
+ */
+#define DECLARE_VAR_LOW32
+#define RESTRICT_ASM_LOW32
+#define DECLARE_VAR_ALL64
+#define RESTRICT_ASM_ALL64
+#define DECLARE_VAR_ADDRT
+#define RESTRICT_ASM_ADDRT
-#define DECLARE_VAR_LOW32 int32_t low32
-#define RESTRICT_ASM_LOW32 [low32]"=&r"(low32),
-#define DECLARE_VAR_ALL64 int64_t all64
-#define RESTRICT_ASM_ALL64 [all64]"=&r"(all64),
-#define DECLARE_VAR_ADDRT mips_reg addrt
-#define RESTRICT_ASM_ADDRT [addrt]"=&r"(addrt),
+#if HAVE_LOONGSON2
#define MMI_LWX(reg, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- "lw "#reg", "#bias"(%[addrt]) \n\t"
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ "lw "#reg", "#bias"($at) \n\t" \
+ ".set at \n\t"
#define MMI_SWX(reg, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- "sw "#reg", "#bias"(%[addrt]) \n\t"
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ "sw "#reg", "#bias"($at) \n\t" \
+ ".set at \n\t"
#define MMI_LDX(reg, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- "ld "#reg", "#bias"(%[addrt]) \n\t"
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ "ld "#reg", "#bias"($at) \n\t" \
+ ".set at \n\t"
#define MMI_SDX(reg, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- "sd "#reg", "#bias"(%[addrt]) \n\t"
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ "sd "#reg", "#bias"($at) \n\t" \
+ ".set at \n\t"
#define MMI_LWC1(fp, addr, bias) \
"lwc1 "#fp", "#bias"("#addr") \n\t"
#define MMI_LWLRC1(fp, addr, bias, off) \
- "lwl %[low32], "#bias"+"#off"("#addr") \n\t" \
- "lwr %[low32], "#bias"("#addr") \n\t" \
- "mtc1 %[low32], "#fp" \n\t"
+ ".set noat \n\t" \
+ "lwl $at, "#bias"+"#off"("#addr") \n\t" \
+ "lwr $at, "#bias"("#addr") \n\t" \
+ "mtc1 $at, "#fp" \n\t" \
+ ".set at \n\t"
#define MMI_LWXC1(fp, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- MMI_LWC1(fp, %[addrt], bias)
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ MMI_LWC1(fp, $at, bias) \
+ ".set at \n\t"
#define MMI_SWC1(fp, addr, bias) \
"swc1 "#fp", "#bias"("#addr") \n\t"
#define MMI_SWLRC1(fp, addr, bias, off)
\
- "mfc1 %[low32], "#fp" \n\t" \
- "swl %[low32], "#bias"+"#off"("#addr") \n\t" \
- "swr %[low32], "#bias"("#addr") \n\t"
+ ".set noat \n\t" \
+ "mfc1 $at, "#fp" \n\t" \
+ "swl $at, "#bias"+"#off"("#addr") \n\t" \
+ "swr $at, "#bias"("#addr") \n\t" \
+ ".set at \n\t"
#define MMI_SWXC1(fp, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- MMI_SWC1(fp, %[addrt], bias)
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ MMI_SWC1(fp, $at, bias) \
+ ".set at \n\t"
#define MMI_LDC1(fp, addr, bias) \
"ldc1 "#fp", "#bias"("#addr") \n\t"
#define MMI_LDLRC1(fp, addr, bias, off) \
- "ldl %[all64], "#bias"+"#off"("#addr") \n\t" \
- "ldr %[all64], "#bias"("#addr") \n\t" \
- "dmtc1 %[all64], "#fp" \n\t"
+ ".set noat \n\t" \
+ "ldl $at, "#bias"+"#off"("#addr") \n\t" \
+ "ldr $at, "#bias"("#addr") \n\t" \
+ "dmtc1 $at, "#fp" \n\t" \
+ ".set at \n\t"
#define MMI_LDXC1(fp, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- MMI_LDC1(fp, %[addrt], bias)
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ MMI_LDC1(fp, $at, bias) \
+ ".set at \n\t"
#define MMI_SDC1(fp, addr, bias) \
"sdc1 "#fp", "#bias"("#addr") \n\t"
#define MMI_SDLRC1(fp, addr, bias, off)
\
- "dmfc1 %[all64], "#fp" \n\t" \
- "sdl %[all64], "#bias"+"#off"("#addr") \n\t" \
- "sdr %[all64], "#bias"("#addr") \n\t"
+ ".set noat \n\t" \
+ "dmfc1 $at, "#fp" \n\t" \
+ "sdl $at, "#bias"+"#off"("#addr") \n\t" \
+ "sdr $at, "#bias"("#addr") \n\t" \
+ ".set at \n\t"
#define MMI_SDXC1(fp, addr, stride, bias) \
- PTR_ADDU "%[addrt], "#addr", "#stride" \n\t" \
- MMI_SDC1(fp, %[addrt], bias)
+ ".set noat \n\t" \
+ PTR_ADDU "$at, "#addr", "#stride" \n\t" \
+ MMI_SDC1(fp, $at, bias) \
+ ".set at \n\t"
#define MMI_LQ(reg1, reg2, addr, bias) \
"ld "#reg1", "#bias"("#addr") \n\t" \
@@ -120,11 +149,6 @@
#elif HAVE_LOONGSON3 /* !HAVE_LOONGSON2 */
-#define DECLARE_VAR_ALL64
-#define RESTRICT_ASM_ALL64
-#define DECLARE_VAR_ADDRT
-#define RESTRICT_ASM_ADDRT
-
#define MMI_LWX(reg, addr, stride, bias) \
"gslwx "#reg", "#bias"("#addr", "#stride") \n\t"
@@ -142,13 +166,12 @@
#if _MIPS_SIM == _ABIO32 /* workaround for 3A2000 gslwlc1 bug */
-#define DECLARE_VAR_LOW32 int32_t low32
-#define RESTRICT_ASM_LOW32 [low32]"=&r"(low32),
-
#define MMI_LWLRC1(fp, addr, bias, off) \
- "lwl %[low32], "#bias"+"#off"("#addr") \n\t" \
- "lwr %[low32], "#bias"("#addr") \n\t" \
- "mtc1 %[low32], "#fp" \n\t"
+ ".set noat \n\t" \
+ "lwl $at, "#bias"+"#off"("#addr") \n\t" \
+ "lwr $at, "#bias"("#addr") \n\t" \
+ "mtc1 $at, "#fp" \n\t" \
+ ".set at \n\t"
#else /* _MIPS_SIM != _ABIO32 */
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
