diff options
| author | Nuno Lopes <nlopess@php.net> | 2013-07-03 18:02:28 -0400 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2013-07-03 18:02:28 -0400 |
| commit | e964817b244d091dc38f59f5d7f1735110b698af (patch) | |
| tree | 857d97e4cc2208726ce50f43353f544e1b645991 | |
| parent | 50ac53e1b109795e3abb92735a3a35cebcdd47a7 (diff) | |
| download | php-git-e964817b244d091dc38f59f5d7f1735110b698af.tar.gz | |
fix assembly of safe_address() for x86 and x86_64
| -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 02e84ee1e6..e86b3e7c58 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2386,7 +2386,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), @@ -2406,7 +2406,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__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" + __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq $0,%1" : "=&a"(res), "=&d" (overflow) : "%0"(res), "rm"(size), |