diff options
| author | Nuno Lopes <nlopess@php.net> | 2013-07-03 17:53:46 -0400 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2013-07-03 17:55:18 -0400 |
| commit | 40cbceaf71f3431b43c245704d82f06c8bb4c2de (patch) | |
| tree | 734b49afaacf9708f6122c7c8d02fb720ba04880 /Zend/zend_alloc.c | |
| parent | 332e46b3aa00c1d5a8cfb4e9a42f2d1dfbe3603d (diff) | |
| download | php-git-40cbceaf71f3431b43c245704d82f06c8bb4c2de.tar.gz | |
fix assembly of safe_address() for x86 and x86_64
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index c6aee57a73..383a1dfcab 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2465,7 +2465,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) size_t res = nmemb; unsigned long overflow = 0; - __asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1" + __asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1" : "=&a"(res), "=&d" (overflow) : "%0"(res), "rm"(size), @@ -2493,7 +2493,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) __asm__ ("mul" LP_SUFF " %3\n\t" "add %4,%0\n\t" - "adc %1,%1" + "adc $0,%1" : "=&a"(res), "=&d" (overflow) : "%0"(res), "rm"(size), |