diff options
| author | Sam Bingner <sam@bingner.com> | 2018-10-12 16:21:47 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-10-12 16:21:47 -1000 |
| commit | 295030d5719c3af352cfc5394b8ce13e3a1e0fb9 (patch) | |
| tree | 608f1f9cf9a8ea9ae8e26f1f07b50d14426a675a /data/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff | |
| parent | 4a80cac9cb4be1d154f5346423667310219bd27a (diff) | |
Add and update a number of packages
Diffstat (limited to 'data/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff')
| -rw-r--r-- | data/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/data/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff b/data/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff new file mode 100644 index 000000000..46415107d --- /dev/null +++ b/data/libmad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff @@ -0,0 +1,34 @@ +From: Dave Martin +Subject: "rsc" doesnt exist anymore in thumb2 + +diff --git a/fixed.h b/fixed.h +index 4b58abf..ba4bc26 100644 +--- a/fixed.h ++++ b/fixed.h +@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y) + : "+r" (lo), "+r" (hi) \ + : "%r" (x), "r" (y)) + ++#ifdef __thumb__ ++/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero ++ operand. If needed this code can also support Thumb-1 ++ (simply append "s" to the end of the second two instructions). */ ++# define MAD_F_MLN(hi, lo) \ ++ asm ("rsbs %0, %0, #0\n\t" \ ++ "sbc %1, %1, %1\n\t" \ ++ "sub %1, %1, %2" \ ++ : "+&r" (lo), "=&r" (hi) \ ++ : "r" (hi) \ ++ : "cc") ++#else /* ! __thumb__ */ + # define MAD_F_MLN(hi, lo) \ + asm ("rsbs %0, %2, #0\n\t" \ + "rsc %1, %3, #0" \ +- : "=r" (lo), "=r" (hi) \ ++ : "=&r" (lo), "=r" (hi) \ + : "0" (lo), "1" (hi) \ + : "cc") ++#endif /* __thumb__ */ + + # define mad_f_scale64(hi, lo) \ + ({ mad_fixed_t __result; \ |