Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From d50686de0406a88ef9112f5252103f799982e84a Mon Sep 17 00:00:00 2001 |
| 2 | From: Andre McCurdy <armccurdy@gmail.com> |
| 3 | Date: Thu, 4 Feb 2016 14:00:00 -0800 |
| 4 | Subject: [PATCH] avoid h asm constraint for MIPS |
| 5 | |
| 6 | The h asm constrain (to extract the high part of a multiplication |
| 7 | result) has not been recognised since gcc 4.4: |
| 8 | |
| 9 | https://gcc.gnu.org/gcc-4.4/changes.html |
| 10 | |
| 11 | Drop the MIPS umul_ppmm() implementations which rely on "=h" and fall |
| 12 | back to the older implementations (which use explicit mfhi and mflo |
| 13 | instructions to move the high and low parts of the multiplication |
| 14 | result into their destinations). |
| 15 | |
| 16 | Upstream-Status: Inappropriate [upstream has a different solution] |
| 17 | |
| 18 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 19 | --- |
| 20 | longlong.h | 10 ---------- |
| 21 | 1 file changed, 10 deletions(-) |
| 22 | |
| 23 | diff --git a/longlong.h b/longlong.h |
| 24 | index b53fbee..0193abb 100644 |
| 25 | --- a/longlong.h |
| 26 | +++ b/longlong.h |
| 27 | @@ -1011,27 +1011,17 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ((UWtype *, UWtype, UWtype, UWtype)); |
| 28 | #endif /* __m88000__ */ |
| 29 | |
| 30 | #if defined (__mips) && W_TYPE_SIZE == 32 |
| 31 | -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 |
| 32 | -#define umul_ppmm(w1, w0, u, v) \ |
| 33 | - __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) |
| 34 | -#else |
| 35 | #define umul_ppmm(w1, w0, u, v) \ |
| 36 | __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \ |
| 37 | : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) |
| 38 | -#endif |
| 39 | #define UMUL_TIME 10 |
| 40 | #define UDIV_TIME 100 |
| 41 | #endif /* __mips */ |
| 42 | |
| 43 | #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 |
| 44 | -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 |
| 45 | -#define umul_ppmm(w1, w0, u, v) \ |
| 46 | - __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) |
| 47 | -#else |
| 48 | #define umul_ppmm(w1, w0, u, v) \ |
| 49 | __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \ |
| 50 | : "=d" (w0), "=d" (w1) : "d" (u), "d" (v)) |
| 51 | -#endif |
| 52 | #define UMUL_TIME 20 |
| 53 | #define UDIV_TIME 140 |
| 54 | #endif /* __mips */ |
| 55 | -- |
| 56 | 1.9.1 |
| 57 | |