diff options
| author | Gustavo Lopes <glopes@nebm.ist.utl.pt> | 2013-04-30 19:36:08 +0200 |
|---|---|---|
| committer | Gustavo Lopes <glopes@nebm.ist.utl.pt> | 2013-04-30 19:36:08 +0200 |
| commit | 865cc3a8005ed82282f6c366c5d681160e52e221 (patch) | |
| tree | 640129720913e5c041fdd14a381135869073160d | |
| parent | 062519ed4186d5f19a131a3a4c0e430a83dc0766 (diff) | |
| parent | 514afd67b651bea834bdb84b7685b48e9e56ac21 (diff) | |
| download | php-git-865cc3a8005ed82282f6c366c5d681160e52e221.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64729: compilation failure on x32
Conflicts:
Zend/zend_alloc.c
| -rw-r--r-- | Zend/zend_alloc.c | 17 | ||||
| -rw-r--r-- | Zend/zend_multiply.h | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 1c76bd403d..c6aee57a73 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -672,7 +672,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size) #elif defined(__GNUC__) && defined(__x86_64__) unsigned long n; - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc"); + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc"); return (unsigned int)n; #elif defined(_MSC_VER) && defined(_M_IX86) __asm { @@ -700,12 +700,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size) #elif defined(__GNUC__) && defined(__x86_64__) unsigned long n; - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc"); + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size) : "cc"); return (unsigned int)n; #elif defined(_MSC_VER) && defined(_M_IX86) __asm { bsf eax, _size - } + } #elif defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__)) return __builtin_ctzl(_size); #else @@ -2485,12 +2485,21 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) size_t res = nmemb; unsigned long overflow = 0; - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" +#ifdef __ILP32__ /* x32 */ +# define LP_SUFF "l" +#else /* amd64 */ +# define LP_SUFF "q" +#endif + + __asm__ ("mul" LP_SUFF " %3\n\t" + "add %4,%0\n\t" + "adc %1,%1" : "=&a"(res), "=&d" (overflow) : "%0"(res), "rm"(size), "rm"(offset)); +#undef LP_SUFF if (UNEXPECTED(overflow)) { zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); return 0; diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h index e52956f417..0d8977fdea 100644 --- a/Zend/zend_multiply.h +++ b/Zend/zend_multiply.h @@ -35,8 +35,8 @@ #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \ long __tmpvar; \ - __asm__ ("imulq %3,%0\n" \ - "adcq $0,%1" \ + __asm__ ("imul %3,%0\n" \ + "adc $0,%1" \ : "=r"(__tmpvar),"=r"(usedval) \ : "0"(a), "r"(b), "1"(0)); \ if (usedval) (dval) = (double) (a) * (double) (b); \ |