com php-src: fix assembly of safe_address() for x8 6 and x86_64: Zend/zend_alloc.c

From: Date: Wed, 10 Jul 2013 17:39:52 +0000
Subject: com php-src: fix assembly of safe_address() for x8 6 and x86_64: Zend/zend_alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-72612@lists.php.net to get a copy of this message
Commit: 55c279ed3fd6de8ce4d9d16d98ae7bce1a8b73fa Author: Nuno Lopes <nlopess@php.net> Wed, 3 Jul 2013 18:02:28 -0400 Committer: Johannes Schlüter <johannes@php.net> Wed, 10 Jul 2013 19:39:52 +0200 Parents: 825bd97c6840bb8464a330142751600c093e8b8a Branches: PHP-5.3..27 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=55c279ed3fd6de8ce4d9d16d98ae7bce1a8b73fa Log: fix assembly of safe_address() for x86 and x86_64 Changed paths: M Zend/zend_alloc.c Diff: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 02e84ee..e86b3e7 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),

« previous php.cvs (#72612) next »