projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 137e3565 | 1 | From: Gustavo Lopes <glopes@nebm.ist.utl.pt> |
| 9d5f5360 ER |
2 | Date: Tue, 30 Apr 2013 17:00:31 +0000 (+0200) |
| 3 | Subject: Fix bug #64729: compilation failure on x32 | |
| 4 | X-Git-Tag: php-5.4.16RC1~30^2~10 | |
| 5 | X-Git-Url: http://72.52.91.13:8000/?p=php-src.git;a=commitdiff_plain;h=514afd67b651bea834bdb84b7685b48e9e56ac21;hp=4a92ae34011ad2246500f27469f378b66d832976 | |
| 137e3565 | 6 | |
| 9d5f5360 | 7 | Fix bug #64729: compilation failure on x32 |
| 137e3565 | 8 | --- |
| 137e3565 JR |
9 | |
| 10 | diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c | |
| 11 | index 605e396..0bbd59a 100644 | |
| 9d5f5360 ER |
12 | --- a/Zend/zend_alloc.c |
| 13 | +++ b/Zend/zend_alloc.c | |
| 14 | @@ -672,7 +672,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size) | |
| 137e3565 JR |
15 | #elif defined(__GNUC__) && defined(__x86_64__) |
| 16 | unsigned long n; | |
| 17 | ||
| 18 | - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
| 19 | + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
| 20 | return (unsigned int)n; | |
| 21 | #elif defined(_MSC_VER) && defined(_M_IX86) | |
| 22 | __asm { | |
| 9d5f5360 | 23 | @@ -698,12 +698,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size) |
| 137e3565 JR |
24 | #elif defined(__GNUC__) && defined(__x86_64__) |
| 25 | unsigned long n; | |
| 26 | ||
| 27 | - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
| 28 | + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
| 29 | return (unsigned int)n; | |
| 30 | #elif defined(_MSC_VER) && defined(_M_IX86) | |
| 31 | __asm { | |
| 32 | bsf eax, _size | |
| 33 | - } | |
| 34 | + } | |
| 35 | #else | |
| 36 | static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0}; | |
| 37 | unsigned int n; | |
| 38 | @@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) | |
| 39 | size_t res = nmemb; | |
| 40 | unsigned long overflow = 0; | |
| 41 | ||
| 42 | - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" | |
| 43 | +#ifdef __ILP32__ /* x32 */ | |
| 44 | +# define LP_SUFF "l" | |
| 45 | +#else /* amd64 */ | |
| 46 | +# define LP_SUFF "q" | |
| 47 | +#endif | |
| 48 | + | |
| 49 | + __asm__ ("mul" LP_SUFF " %3\n\t" | |
| 50 | + "add %4,%0\n\t" | |
| 51 | + "adc %1,%1" | |
| 52 | : "=&a"(res), "=&d" (overflow) | |
| 53 | : "%0"(res), | |
| 54 | "rm"(size), | |
| 55 | "rm"(offset)); | |
| 56 | ||
| 57 | +#undef LP_SUFF | |
| 58 | + | |
| 59 | if (UNEXPECTED(overflow)) { | |
| 60 | zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); | |
| 61 | return 0; | |
| 9d5f5360 ER |
62 | diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h |
| 63 | index c3c9657..092d3cd 100644 | |
| 64 | --- a/Zend/zend_multiply.h | |
| 65 | +++ b/Zend/zend_multiply.h | |
| 66 | @@ -35,8 +35,8 @@ | |
| 67 | ||
| 68 | #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \ | |
| 69 | long __tmpvar; \ | |
| 70 | - __asm__ ("imulq %3,%0\n" \ | |
| 71 | - "adcq $0,%1" \ | |
| 72 | + __asm__ ("imul %3,%0\n" \ | |
| 73 | + "adc $0,%1" \ | |
| 74 | : "=r"(__tmpvar),"=r"(usedval) \ | |
| 75 | : "0"(a), "r"(b), "1"(0)); \ | |
| 76 | if (usedval) (dval) = (double) (a) * (double) (b); \ |