com php-src: Fix assembly of safe_address() for aarch 64: Zend/zend_alloc.c
| From: | Ard Biesheuvel | Date: | Thu, 04 Jul 2013 08:25:38 +0000 |
| Subject: | com php-src: Fix assembly of safe_address() for aarch 64: Zend/zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72585@lists.php.net to get a copy of this message | ||
Commit: 47e21a2c407e7b11b3ffc76b308d7f5c58ceca7e
Author: Ard Biesheuvel <ard.biesheuvel@linaro.org> Thu, 4 Jul 2013 10:25:38 +0200
Parents: 40cbceaf71f3431b43c245704d82f06c8bb4c2de
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=47e21a2c407e7b11b3ffc76b308d7f5c58ceca7e
Log:
Fix assembly of safe_address() for aarch64
Changed paths:
M Zend/zend_alloc.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 383a1df..bf9d000 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2535,7 +2535,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
size_t res;
unsigned long overflow;
- __asm__ ("mul %0,%2,%3\n\tumulh %1,%2,%3\n\tadds %0,%0,%4\n\tadc %1,%1,%1"
+ __asm__ ("mul %0,%2,%3\n\tumulh %1,%2,%3\n\tadds %0,%0,%4\n\tadc %1,%1,xzr"
: "=&r"(res), "=&r"(overflow)
: "r"(nmemb),
"r"(size),