1 From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
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
7 Fix bug #64729: compilation failure on x32
10 --- php-5.3.29/Zend/zend_alloc.c~ 2015-02-28 01:32:39.000000000 +0200
11 +++ php-5.3.29/Zend/zend_alloc.c 2015-02-28 01:35:13.896183585 +0200
12 @@ -672,7 +672,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
13 #elif defined(__GNUC__) && defined(__x86_64__)
16 - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size));
17 + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size));
18 return (unsigned int)n;
19 #elif defined(_MSC_VER) && defined(_M_IX86)
21 @@ -698,12 +698,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
22 #elif defined(__GNUC__) && defined(__x86_64__)
25 - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size));
26 + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size));
27 return (unsigned int)n;
28 #elif defined(_MSC_VER) && defined(_M_IX86)
34 static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
36 @@ -2406,12 +2406,22 @@
38 unsigned long overflow = 0;
40 - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq $0,%1"
41 +#ifdef __ILP32__ /* x32 */
47 + __asm__ ("mul" LP_SUFF " %3\n\t"
50 : "=&a"(res), "=&d" (overflow)
57 if (UNEXPECTED(overflow)) {
58 zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
60 --- a/Zend/zend_alloc_canary.c
61 +++ b/Zend/zend_alloc_canary.c
62 @@ -720,7 +720,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
63 #elif defined(__GNUC__) && defined(__x86_64__)
66 - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size));
67 + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size));
68 return (unsigned int)n;
69 #elif defined(_MSC_VER) && defined(_M_IX86)
71 @@ -746,12 +746,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
72 #elif defined(__GNUC__) && defined(__x86_64__)
75 - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size));
76 + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size));
77 return (unsigned int)n;
78 #elif defined(_MSC_VER) && defined(_M_IX86)
84 static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
86 @@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
88 unsigned long overflow = 0;
90 - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1"
91 +#ifdef __ILP32__ /* x32 */
97 + __asm__ ("mul" LP_SUFF " %3\n\t"
100 : "=&a"(res), "=&d" (overflow)
107 if (UNEXPECTED(overflow)) {
108 zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
110 --- php-5.3.29/Zend/zend_multiply.h~ 2014-08-13 22:22:50.000000000 +0300
111 +++ php-5.3.29/Zend/zend_multiply.h 2015-02-28 01:57:48.989051739 +0200
116 -#if defined(__i386__) && defined(__GNUC__)
117 +#if (defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__)
119 #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \