Fix MIPS DSPr2 build when using soft float ABI
(for instance, when passing -msoft-float to the compiler)
The instructions used by jsimd_quantize_float_dspr2() and
jsimd_convsamp_float_dspr2() don't work with the soft float ABI, so
disable those functions when soft float is enabled.
Based on:
https://github.com/libjpeg-turbo/libjpeg-turbo/pull/272/commits/129a739bfabe1568d078eb2719691a76db128185
Closes #272
diff --git a/ChangeLog.md b/ChangeLog.md
index d3bb53f..3d99801 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -9,6 +9,11 @@
projects that used `AC_CHECK_HEADERS()` to check for the existence of locale.h,
stddef.h, or stdlib.h.
+2. The `jsimd_quantize_float_dspr2()` and `jsimd_convsamp_float_dspr2()`
+functions in the MIPS DSPr2 SIMD extensions are now disabled at compile time
+if the soft float ABI is enabled. Those functions use instructions that are
+incompatible with the soft float ABI.
+
2.0.0
=====
diff --git a/simd/mips/jsimd.c b/simd/mips/jsimd.c
index af886f6..454cc99 100644
--- a/simd/mips/jsimd.c
+++ b/simd/mips/jsimd.c
@@ -692,8 +692,10 @@
if (sizeof(ISLOW_MULT_TYPE) != 2)
return 0;
+#ifndef __mips_soft_float
if (simd_support & JSIMD_DSPR2)
return 1;
+#endif
return 0;
}
@@ -709,7 +711,9 @@
jsimd_convsamp_float(JSAMPARRAY sample_data, JDIMENSION start_col,
FAST_FLOAT *workspace)
{
+#ifndef __mips_soft_float
jsimd_convsamp_float_dspr2(sample_data, start_col, workspace);
+#endif
}
GLOBAL(int)
@@ -805,8 +809,10 @@
if (sizeof(ISLOW_MULT_TYPE) != 2)
return 0;
+#ifndef __mips_soft_float
if (simd_support & JSIMD_DSPR2)
return 1;
+#endif
return 0;
}
@@ -821,7 +827,9 @@
jsimd_quantize_float(JCOEFPTR coef_block, FAST_FLOAT *divisors,
FAST_FLOAT *workspace)
{
+#ifndef __mips_soft_float
jsimd_quantize_float_dspr2(coef_block, divisors, workspace);
+#endif
}
GLOBAL(int)
diff --git a/simd/mips/jsimd_dspr2.S b/simd/mips/jsimd_dspr2.S
index 2ec543e..a28c116 100644
--- a/simd/mips/jsimd_dspr2.S
+++ b/simd/mips/jsimd_dspr2.S
@@ -2810,6 +2810,8 @@
END(jsimd_quantize_dspr2)
+#ifndef __mips_soft_float
+
/*****************************************************************************/
LEAF_DSPR2(jsimd_quantize_float_dspr2)
/*
@@ -2890,6 +2892,8 @@
END(jsimd_quantize_float_dspr2)
+#endif
+
/*****************************************************************************/
LEAF_DSPR2(jsimd_idct_2x2_dspr2)
@@ -4110,6 +4114,8 @@
END(jsimd_convsamp_dspr2)
+#ifndef __mips_soft_float
+
/*****************************************************************************/
LEAF_DSPR2(jsimd_convsamp_float_dspr2)
/*
@@ -4468,4 +4474,6 @@
END(jsimd_convsamp_float_dspr2)
+#endif
+
/*****************************************************************************/
